Merge branch '6.4' into 7.0

* 6.4:
  fix merge
  [AssetMapper] Split test dirs in tests
  Fix typo
  Change incorrect check for the `stateless` request attribute
  use copy() instead of rename() on Windows
  test: kebab-case to snake_case
  [PropertyInfo] Handle collection in PhpStan same as PhpDoc
  [Messenger] Passing to `WorkerMessageRetriedEvent` envelope with actual stamps after sent

Tests/DotenvTest.php

@@ -430,16 +430,16 @@ public function testHttpVarIsPartiallyOverridden()
  $this->assertSame('http_value', $_SERVER['HTTP_TEST_ENV_VAR']);
  }
 
- public function testEnvVarIsOverriden()
+ public function testEnvVarIsOverridden()
  {
- putenv('TEST_ENV_VAR_OVERRIDEN=original_value');
+ putenv('TEST_ENV_VAR_OVERRIDDEN=original_value');
 
  $dotenv = (new Dotenv())->usePutenv();
- $dotenv->populate(['TEST_ENV_VAR_OVERRIDEN' => 'new_value'], true);
+ $dotenv->populate(['TEST_ENV_VAR_OVERRIDDEN' => 'new_value'], true);
 
- $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDEN'));
- $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDEN']);
- $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDEN']);
+ $this->assertSame('new_value', getenv('TEST_ENV_VAR_OVERRIDDEN'));
+ $this->assertSame('new_value', $_ENV['TEST_ENV_VAR_OVERRIDDEN']);
+ $this->assertSame('new_value', $_SERVER['TEST_ENV_VAR_OVERRIDDEN']);
  }
 
  public function testMemorizingLoadedVarsNamesInSpecialVar()