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

Author: xabbuh

Tests/EventListener/LocaleListenerTest.php

@@ -205,7 +205,7 @@ public function testRequestNoLocaleFromAcceptLanguageHeader()
         $this->assertEquals('fr_FR', $request->getLocale());
     }
 
-    public function testRequestAttributeLocaleNotOverridenFromAcceptLanguageHeader()
+    public function testRequestAttributeLocaleNotOverriddenFromAcceptLanguageHeader()
     {
         $request = Request::create('/');
         $request->attributes->set('_locale', 'it');

Tests/EventListener/SessionListenerTest.php

@@ -562,7 +562,7 @@ public function testUninitializedSessionWithoutInitializedSession()
         $this->assertSame('60', $response->headers->getCacheControlDirective('s-maxage'));
     }
 
-    public function testResponseHeadersMaxAgeAndExpiresNotBeOverridenIfSessionStarted()
+    public function testResponseHeadersMaxAgeAndExpiresNotBeOverriddenIfSessionStarted()
     {
         $session = $this->createMock(Session::class);
         $session->expects($this->once())->method('getUsageIndex')->willReturn(1);