update for all in one pregmatch

eltharin · eltharin · commit f5077aab4c13 · 2025-11-06T17:28:33.000+01:00
diff --git a/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php b/src/Symfony/Component/Routing/Loader/AttributeClassLoader.php
@@ -219,19 +219,14 @@ protected function addRoute(RouteCollection $collection, object $attr, array $gl
                 continue;
             }
             foreach ($paths as $locale => $path) {
-                if (preg_match(\sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {
+                if (preg_match(\sprintf('/\{(?|([^\:]++):%s(?:\.[^\}<]++)?|(%1$s))(?:<.*?>)?\}/', preg_quote($param->name)), $path, $matches)) {
                     if (\is_scalar($defaultValue = $param->getDefaultValue()) || null === $defaultValue) {
-                        $defaults[$param->name] = $defaultValue;
+                        $defaults[$matches[1]] = $defaultValue;
                     } elseif ($defaultValue instanceof \BackedEnum) {
-                        $defaults[$param->name] = $defaultValue->value;
+                        $defaults[$matches[1]] = $defaultValue->value;
                     }
                     break;
                 }
-
-                if (preg_match(\sprintf('/\{(?<argName>[^\:]+):%s(?:(\.[^\}]+)?)\}/', preg_quote($param->name)), $path, $matches)) {
-                    $defaults[$matches['argName']] = $param->getDefaultValue();
-                    break;
-                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -219,19 +219,14 @@ protected function addRoute(RouteCollection $collection, object $attr, array $gl`
`219`	`219`	`continue;`
`220`	`220`	`}`
`221`	`221`	`foreach ($paths as $locale => $path) {`
`222`		`- if (preg_match(\sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {`
	`222`	`+ if (preg_match(\sprintf('/\{(?\|([^\:]++):%s(?:\.[^\}<]++)?\|(%1$s))(?:<.*?>)?\}/', preg_quote($param->name)), $path, $matches)) {`
`223`	`223`	`if (\is_scalar($defaultValue = $param->getDefaultValue()) \|\| null === $defaultValue) {`
`224`		`- $defaults[$param->name] = $defaultValue;`
	`224`	`+ $defaults[$matches[1]] = $defaultValue;`
`225`	`225`	`} elseif ($defaultValue instanceof \BackedEnum) {`
`226`		`- $defaults[$param->name] = $defaultValue->value;`
	`226`	`+ $defaults[$matches[1]] = $defaultValue->value;`
`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`		`- }`
`235`	`230`	`}`
`236`	`231`	`}`
`237`	`232`