Fix merge

nicolas-grekas · nicolas-grekas · commit 3b2957ad5490 · 2024-01-30T14:55:02.000+01:00
diff --git a/Tests/Fixtures/localized/localized-prefix.yml b/Tests/Fixtures/localized/localized-prefix.yml
@@ -1,6 +1,6 @@
 important_controllers:
   resource: Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\RouteWithPriorityController
-  type: annotation
+  type: attribute
   prefix:
     cs: /cs
     en: /en
diff --git a/Tests/Loader/YamlFileLoaderTest.php b/Tests/Loader/YamlFileLoaderTest.php
@@ -467,7 +467,7 @@ public function testPriorityWithPrefix()
     {
         new LoaderResolver([
             $loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/localized')),
-            new class() extends AnnotationClassLoader {
+            new class() extends AttributeClassLoader {
                 protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
                 {
                     $route->setDefault('_controller', $class->getName().'::'.$method->getName());

Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ public function testPriorityWithPrefix()`
`467`	`467`	`{`
`468`	`468`	`new LoaderResolver([`
`469`	`469`	`$loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/localized')),`
`470`		`- new class() extends AnnotationClassLoader {`
	`470`	`+ new class() extends AttributeClassLoader {`
`471`	`471`	`protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void`
`472`	`472`	`{`
`473`	`473`	`$route->setDefault('_controller', $class->getName().'::'.$method->getName());`