fix merge

xabbuh · xabbuh · commit e4f2ae688fd1 · 2024-11-13T16:31:34.000+01:00
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
@@ -486,7 +486,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
`@@ -486,7 +486,7 @@ public function testPriorityWithHost()`
`486`	`486`	`{`
`487`	`487`	`new LoaderResolver([`
`488`	`488`	`$loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/locale_and_host')),`
`489`		`- new class(new AnnotationReader(), null) extends AnnotationClassLoader {`
	`489`	`+ new class() extends AttributeClassLoader {`
`490`	`490`	`protected function configureRoute(`
`491`	`491`	`Route $route,`
`492`	`492`	`\ReflectionClass $class,`