bug symfony#38372 [Routing] fix using !important and defaults/reqs in inline route definitions (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 9c8a3009cf72 · 2020-10-02T10:22:10.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Routing] fix using !important and defaults/reqs in inline route definitions | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix symfony#33224 | License | MIT | Doc PR | - Commits ------- 826db22 [Routing] fix using !important and defaults/reqs in inline route definitions
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -137,7 +137,7 @@ public function getPath()
     public function setPath($pattern)
     {
         if (false !== strpbrk($pattern, '?<')) {
-            $pattern = preg_replace_callback('#\{(\w++)(<.*?>)?(\?[^\}]*+)?\}#', function ($m) {
+            $pattern = preg_replace_callback('#\{(!?\w++)(<.*?>)?(\?[^\}]*+)?\}#', function ($m) {
                 if (isset($m[3][0])) {
                     $this->setDefault($m[1], '?' !== $m[3] ? substr($m[3], 1) : null);
                 }
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -208,6 +208,7 @@ public function testInlineDefaultAndRequirement()
         $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', null), new Route('/foo/{bar?}'));
         $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz'), new Route('/foo/{bar?baz}'));
         $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz<buz>'), new Route('/foo/{bar?baz<buz>}'));
+        $this->assertEquals((new Route('/foo/{!bar}'))->setDefault('!bar', 'baz<buz>'), new Route('/foo/{!bar?baz<buz>}'));
         $this->assertEquals((new Route('/foo/{bar}'))->setDefault('bar', 'baz'), new Route('/foo/{bar?}', ['bar' => 'baz']));
 
         $this->assertEquals((new Route('/foo/{bar}'))->setRequirement('bar', '.*'), new Route('/foo/{bar<.*>}'));

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ public function getPath()`
`137`	`137`	`public function setPath($pattern)`
`138`	`138`	`{`
`139`	`139`	`if (false !== strpbrk($pattern, '?<')) {`
`140`		`- $pattern = preg_replace_callback('#\{(\w++)(<.?>)?(\?[^\}]+)?\}#', function ($m) {`
	`140`	`+ $pattern = preg_replace_callback('#\{(!?\w++)(<.?>)?(\?[^\}]+)?\}#', function ($m) {`
`141`	`141`	`if (isset($m[3][0])) {`
`142`	`142`	`$this->setDefault($m[1], '?' !== $m[3] ? substr($m[3], 1) : null);`
`143`	`143`	`}`