Merge branch '6.3' into 6.4

* 6.3:
  [Routing] Fixed priority getting lost when defining prefix array
  [Messenger] PhpSerializer: TypeError should throw MessageDecodingFailedException

Author: nicolas-grekas

Loader/Configurator/Traits/PrefixTrait.php

@@ -29,20 +29,21 @@ final protected function addPrefix(RouteCollection $routes, string|array $prefix
             }
             foreach ($routes->all() as $name => $route) {
                 if (null === $locale = $route->getDefault('_locale')) {
+                    $priority = $routes->getPriority($name) ?? 0;
                     $routes->remove($name);
                     foreach ($prefix as $locale => $localePrefix) {
                         $localizedRoute = clone $route;
                         $localizedRoute->setDefault('_locale', $locale);
                         $localizedRoute->setRequirement('_locale', preg_quote($locale));
                         $localizedRoute->setDefault('_canonical_route', $name);
                         $localizedRoute->setPath($localePrefix.(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
-                        $routes->add($name.'.'.$locale, $localizedRoute);
+                        $routes->add($name.'.'.$locale, $localizedRoute, $priority);
                     }
                 } elseif (!isset($prefix[$locale])) {
                     throw new \InvalidArgumentException(sprintf('Route "%s" with locale "%s" is missing a corresponding prefix in its parent collection.', $name, $locale));
                 } else {
                     $route->setPath($prefix[$locale].(!$trailingSlashOnRoot && '/' === $route->getPath() ? '' : $route->getPath()));
-                    $routes->add($name, $route);
+                    $routes->add($name, $route, $routes->getPriority($name) ?? 0);
                 }
             }
 

RouteCollection.php

@@ -407,4 +407,9 @@ public function getAlias(string $name): ?Alias
     {
         return $this->aliases[$name] ?? null;
     }
+
+    public function getPriority(string $name): ?int
+    {
+        return $this->priorities[$name] ?? null;
+    }
 }

Tests/Fixtures/AttributeFixtures/RouteWithPriorityController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures;
+
+use Symfony\Component\Routing\Annotation\Route;
+
+class RouteWithPriorityController
+{
+    #[Route('/important', name: 'important', priority: 2)]
+    public function important()
+    {
+    }
+
+    #[Route('/also-important', name: 'also_important', priority: 1, defaults: ['_locale' => 'cs'])]
+    public function alsoImportant()
+    {
+    }
+}

Tests/Fixtures/localized/localized-prefix.yml

@@ -0,0 +1,6 @@
+important_controllers:
+  resource: Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures\RouteWithPriorityController
+  type: annotation
+  prefix:
+    cs: /cs
+    en: /en

Tests/Loader/YamlFileLoaderTest.php

@@ -463,6 +463,25 @@ public function testImportingAliases()
         $this->assertEquals($expectedRoutes('yaml'), $routes);
     }
 
+    public function testPriorityWithPrefix()
+    {
+        new LoaderResolver([
+            $loader = new YamlFileLoader(new FileLocator(\dirname(__DIR__).'/Fixtures/localized')),
+            new class() extends AnnotationClassLoader {
+                protected function configureRoute(Route $route, \ReflectionClass $class, \ReflectionMethod $method, object $annot): void
+                {
+                    $route->setDefault('_controller', $class->getName().'::'.$method->getName());
+                }
+            },
+        ]);
+
+        $routes = $loader->load('localized-prefix.yml');
+
+        $this->assertSame(2, $routes->getPriority('important.cs'));
+        $this->assertSame(2, $routes->getPriority('important.en'));
+        $this->assertSame(1, $routes->getPriority('also_important'));
+    }
+
     /**
      * @dataProvider providePsr4ConfigFiles
      */