Merge branch '6.4' into 7.1

* 6.4: fix merge fix merge
symfony · Nov 13, 2024 · a27bb8e · a27bb8e
2 parents 3bc4086 + 91e02e6
commit a27bb8e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
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,