symfony
diff --git a/‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Loader/AnnotationClassLoader.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
+8Lines changed: 8 additions & 0 deletions b/‎src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Fixtures/AnnotationFixtures/DefaultValueController.php
+8Lines changed: 8 additions & 0 deletions
diff --git a/‎src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+3-1Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Tests/Loader/AnnotationClassLoaderTest.php
+3-1Lines changed: 3 additions & 1 deletion
@@ -196,7 +196,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl
                 continue;
             }
             foreach ($paths as $locale => $path) {
-                if (false !== strpos($path, sprintf('{%s}', $param->name))) {
+                if (preg_match(sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {
                     $defaults[$param->name] = $param->getDefaultValue();
                     break;
                 }
 
@@ -12,4 +12,12 @@ class DefaultValueController
     public function action($default = 'value')
     {
     }
+
+    /**
+     * @Route("/hello/{name<\w+>}", name="hello_without_default")
+     * @Route("/hello/{name<\w+>?Symfony}", name="hello_with_default")
+     */
+    public function hello(string $name = 'World')
+    {
+    }
 }
@@ -136,9 +136,11 @@ public function testLocalizedPathRoutesWithExplicitPathPropety()
     public function testDefaultValuesForMethods()
     {
         $routes = $this->loader->load(DefaultValueController::class);
-        $this->assertCount(1, $routes);
+        $this->assertCount(3, $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'));
     }
 
     public function testMethodActionControllers()
Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ protected function addRoute(RouteCollection $collection, $annot, $globals, \Refl`
`196`	`196`	`continue;`
`197`	`197`	`}`
`198`	`198`	`foreach ($paths as $locale => $path) {`
`199`		`- if (false !== strpos($path, sprintf('{%s}', $param->name))) {`
	`199`	`+ if (preg_match(sprintf('/\{%s(?:<.*?>)?\}/', preg_quote($param->name)), $path)) {`
`200`	`200`	`$defaults[$param->name] = $param->getDefaultValue();`
`201`	`201`	`break;`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,12 @@ class DefaultValueController`
`12`	`12`	`public function action($default = 'value')`
`13`	`13`	`{`
`14`	`14`	`}`
	`15`	`+`
	`16`	`+ /**`
	`17`	`+ * @Route("/hello/{name<\w+>}", name="hello_without_default")`
	`18`	`+ * @Route("/hello/{name<\w+>?Symfony}", name="hello_with_default")`
	`19`	`+ */`
	`20`	`+ public function hello(string $name = 'World')`
	`21`	`+ {`
	`22`	`+ }`
`15`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -136,9 +136,11 @@ public function testLocalizedPathRoutesWithExplicitPathPropety()`
`136`	`136`	`public function testDefaultValuesForMethods()`
`137`	`137`	`{`
`138`	`138`	`$routes = $this->loader->load(DefaultValueController::class);`
`139`		`- $this->assertCount(1, $routes);`
	`139`	`+ $this->assertCount(3, $routes);`
`140`	`140`	`$this->assertEquals('/{default}/path', $routes->get('action')->getPath());`
`141`	`141`	`$this->assertEquals('value', $routes->get('action')->getDefault('default'));`
	`142`	`+ $this->assertEquals('Symfony', $routes->get('hello_with_default')->getDefault('name'));`
	`143`	`+ $this->assertEquals('World', $routes->get('hello_without_default')->getDefault('name'));`
`142`	`144`	`}`
`143`	`145`
`144`	`146`	`public function testMethodActionControllers()`