Merge branch '6.4' into 7.1

* 6.4:
  fix merge
  fix merge

Author: nicolas-grekas

src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php

@@ -92,7 +92,7 @@ public function testFromDsnWithQueryOptions()
                 'host' => 'localhost',
                 'port' => 6379,
                 'serializer' => 2,
-            ], $this->createRedisMock(),
+            ], $this->createRedisMock()),
             Connection::fromDsn('redis://localhost/queue/group1/consumer1?serializer=2', [], $this->createRedisMock())
         );
     }

src/Symfony/Component/Routing/Tests/Fixtures/locale_and_host/priorized-host.yml

@@ -1,6 +1,6 @@
 controllers:
   resource: Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\RouteWithPriorityController
-  type: annotation
+  type: attribute
   host:
     cs: www.domain.cs
     en: www.domain.com

src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php

@@ -493,7 +493,7 @@ public function testPriorityWithHost()
     {
         new LoaderResolver([
             $loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/locale_and_host')),
-            new class(new AnnotationReader(), null) extends AnnotationClassLoader {
+            new class() extends AttributeClassLoader {
                 protected function configureRoute(
                     Route $route,
                     \ReflectionClass $class,