Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit a27bb8e0cc3c · 2024-11-13T17:12:35.000+01:00
* 6.4:
  fix merge
  fix merge
diff --git a/Tests/Fixtures/locale_and_host/priorized-host.yml b/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/Tests/Loader/YamlFileLoaderTest.php b/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
`@@ -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,`