Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 691b2e1b2102 · 2024-11-13T17:12:35.000+01:00
* 6.4:
  fix merge
  fix merge
diff --git a/src/Symfony/Component/Messenger/Bridge/Redis/Tests/Transport/ConnectionTest.php b/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())
         );
     }
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/locale_and_host/priorized-host.yml b/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
diff --git a/src/Symfony/Component/Routing/Tests/Loader/YamlFileLoaderTest.php b/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,

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public function testFromDsnWithQueryOptions()`
`92`	`92`	`'host' => 'localhost',`
`93`	`93`	`'port' => 6379,`
`94`	`94`	`'serializer' => 2,`
`95`		`- ], $this->createRedisMock(),`
	`95`	`+ ], $this->createRedisMock()),`
`96`	`96`	`Connection::fromDsn('redis://localhost/queue/group1/consumer1?serializer=2', [], $this->createRedisMock())`
`97`	`97`	`);`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public function testPriorityWithHost()`
`493`	`493`	`{`
`494`	`494`	`new LoaderResolver([`
`495`	`495`	`$loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/locale_and_host')),`
`496`		`- new class(new AnnotationReader(), null) extends AnnotationClassLoader {`
	`496`	`+ new class() extends AttributeClassLoader {`
`497`	`497`	`protected function configureRoute(`
`498`	`498`	`Route $route,`
`499`	`499`	`\ReflectionClass $class,`