correct bug for default value not taken if usigng name:entity.attribute

eltharin · eltharin · commit 4da1d659922f · 2025-11-06T12:01:53.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
@@ -227,6 +227,11 @@ protected function addRoute(RouteCollection $collection, object $attr, array $gl
                     }
                     break;
                 }
+
+                if (preg_match(\sprintf('/\{(?<argName>[^\:]+):%s(?:(\.[^\}]+)?)\}/', preg_quote($param->name)), $path, $matches)) {
+                    $defaults[$matches['argName']] = $param->getDefaultValue();
+                    break;
+                }
             }
         }
 
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php b/src/Symfony/Component/Routing/Tests/Fixtures/AttributeFixtures/DefaultValueController.php
@@ -3,6 +3,7 @@
 namespace Symfony\Component\Routing\Tests\Fixtures\AttributeFixtures;
 
 use Symfony\Component\Routing\Attribute\Route;
+use Symfony\Component\Routing\Tests\Fixtures\AttributedClasses\BarClass;
 use Symfony\Component\Routing\Tests\Fixtures\Enum\TestIntBackedEnum;
 use Symfony\Component\Routing\Tests\Fixtures\Enum\TestStringBackedEnum;
 
@@ -30,4 +31,14 @@ public function stringEnumAction(TestStringBackedEnum $default = TestStringBacke
     public function intEnumAction(TestIntBackedEnum $default = TestIntBackedEnum::Diamonds)
     {
     }
+
+    #[Route(path: '/defaultMappedParam/{libelle:bar}', name: 'defaultMappedParam_default')]
+    public function defaultMappedParam(?BarClass $bar = null)
+    {
+    }
+
+    #[Route(path: '/defaultAdvancedMappedParam/{barLibelle:bar.libelle}', name: 'defaultAdvancedMappedParam_default')]
+    public function defaultAdvancedMappedParam(?BarClass $bar = null)
+    {
+    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/Loader/AttributeClassLoaderTest.php b/src/Symfony/Component/Routing/Tests/Loader/AttributeClassLoaderTest.php
@@ -171,12 +171,16 @@ public function testLocalizedPathRoutesWithExplicitPathPropety()
     public function testDefaultValuesForMethods()
     {
         $routes = $this->loader->load(DefaultValueController::class);
-        $this->assertCount(5, $routes);
+        $this->assertCount(7, $routes);
         $this->assertEquals('/{default}/path', $routes->get('action')->getPath());
         $this->assertEquals('value', $routes->get('action')->getDefault('default'));
         $this->assertEquals('Symfony', $routes->get('hello_with_default')->getDefault('name'));
         $this->assertEquals('World', $routes->get('hello_without_default')->getDefault('name'));
         $this->assertEquals('diamonds', $routes->get('string_enum_action')->getDefault('default'));
+        $this->assertArrayHasKey('libelle', $routes->get('defaultMappedParam_default')->getDefaults());
+        $this->assertNull($routes->get('defaultMappedParam_default')->getDefault('libelle'));
+        $this->assertArrayHasKey('barLibelle', $routes->get('defaultAdvancedMappedParam_default')->getDefaults());
+        $this->assertNull($routes->get('defaultAdvancedMappedParam_default')->getDefault('barLibelle'));
         $this->assertEquals(20, $routes->get('int_enum_action')->getDefault('default'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -227,6 +227,11 @@ protected function addRoute(RouteCollection $collection, object $attr, array $gl`
`227`	`227`	`}`
`228`	`228`	`break;`
`229`	`229`	`}`
	`230`	`+`
	`231`	`+ if (preg_match(\sprintf('/\{(?<argName>[^\:]+):%s(?:(\.[^\}]+)?)\}/', preg_quote($param->name)), $path, $matches)) {`
	`232`	`+ $defaults[$matches['argName']] = $param->getDefaultValue();`
	`233`	`+ break;`
	`234`	`+ }`
`230`	`235`	`}`
`231`	`236`	`}`
`232`	`237`