[Routing] also add matched params for redirect due to trailing slash

Tobion · nicolas-grekas · commit e39b404dcaf4 · 2017-07-10T18:00:56.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Routing/RedirectableUrlMatcherTest.php
@@ -33,7 +33,7 @@ public function testRedirectWhenNoSlash()
                 'scheme' => null,
                 'httpPort' => $context->getHttpPort(),
                 'httpsPort' => $context->getHttpsPort(),
-                '_route' => null,
+                '_route' => 'foo',
             ),
             $matcher->match('/foo')
         );
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -333,7 +333,8 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             }
         }
 
-        $retOffset = strlen($code);
+        // the offset where the return value is appended below, with indendation
+        $retOffset = 12 + strlen($code);
 
         // optimize parameters array
         if ($matches || $hostMatches) {
@@ -385,7 +386,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
         if ($hasTrailingSlash || $schemes) {
             $code .= "            return \$ret;\n";
         } else {
-            $code = substr_replace($code, 'return', $retOffset + 12, 6);
+            $code = substr_replace($code, 'return', $retOffset, 6);
         }
         $code .= "        }\n";
 
diff --git a/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php b/src/Symfony/Component/Routing/Matcher/RedirectableUrlMatcher.php
@@ -32,9 +32,9 @@ public function match($pathinfo)
             }
 
             try {
-                parent::match($pathinfo.'/');
+                $parameters = parent::match($pathinfo.'/');
 
-                return $this->redirect($pathinfo.'/', null);
+                return array_replace($parameters, $this->redirect($pathinfo.'/', isset($parameters['_route']) ? $parameters['_route'] : null));
             } catch (ResourceNotFoundException $e2) {
                 throw $e;
             }
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -163,17 +163,11 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
             $status = $this->handleRouteRequirements($pathinfo, $name, $route);
 
-            if (self::ROUTE_MATCH === $status[0]) {
-                $attributes = array_replace($matches, $hostMatches, (array) $status[1]);
-
-                return $this->mergeDefaults($attributes, $route->getDefaults());
-            }
-
             if (self::REQUIREMENT_MISMATCH === $status[0]) {
                 continue;
             }
 
-            return $this->getAttributes($route, $name, array_replace($matches, $hostMatches));
+            return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array()));
         }
     }
 
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/RedirectableUrlMatcherTest.php
@@ -24,7 +24,7 @@ public function testRedirectWhenNoSlash()
         $coll->add('foo', new Route('/foo/'));
 
         $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext()));
-        $matcher->expects($this->once())->method('redirect');
+        $matcher->expects($this->once())->method('redirect')->will($this->returnValue(array()));
         $matcher->match('/foo');
     }
 
@@ -69,7 +69,7 @@ public function testNoSchemaRedirectIfOnOfMultipleSchemesMatches()
         $matcher->match('/foo');
     }
 
-    public function testRedirectWithParams()
+    public function testSchemeRedirectWithParams()
     {
         $coll = new RouteCollection();
         $coll->add('foo', new Route('/foo/{bar}', array(), array(), array(), '', array('https')));
@@ -79,8 +79,23 @@ public function testRedirectWithParams()
             ->expects($this->once())
             ->method('redirect')
             ->with('/foo/baz', 'foo', 'https')
-            ->will($this->returnValue(array('_route' => 'foo')))
+            ->will($this->returnValue(array('redirect' => 'value')))
+        ;
+        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
+    }
+
+    public function testSlashRedirectWithParams()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/foo/{bar}/'));
+
+        $matcher = $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($coll, new RequestContext()));
+        $matcher
+            ->expects($this->once())
+            ->method('redirect')
+            ->with('/foo/baz/', 'foo', null)
+            ->will($this->returnValue(array('redirect' => 'value')))
         ;
-        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz'), $matcher->match('/foo/baz'));
+        $this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,8 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`333`	`333`	`}`
`334`	`334`	`}`
`335`	`335`
`336`		`- $retOffset = strlen($code);`
	`336`	`+ // the offset where the return value is appended below, with indendation`
	`337`	`+ $retOffset = 12 + strlen($code);`
`337`	`338`
`338`	`339`	`// optimize parameters array`
`339`	`340`	`if ($matches \|\| $hostMatches) {`
`@@ -385,7 +386,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`385`	`386`	`if ($hasTrailingSlash \|\| $schemes) {`
`386`	`387`	`$code .= " return \$ret;\n";`
`387`	`388`	`} else {`
`388`		`- $code = substr_replace($code, 'return', $retOffset + 12, 6);`
	`389`	`+ $code = substr_replace($code, 'return', $retOffset, 6);`
`389`	`390`	`}`
`390`	`391`	`$code .= " }\n";`
`391`	`392`
Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ public function match($pathinfo)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`try {`
`35`		`- parent::match($pathinfo.'/');`
	`35`	`+ $parameters = parent::match($pathinfo.'/');`
`36`	`36`
`37`		`- return $this->redirect($pathinfo.'/', null);`
	`37`	`+ return array_replace($parameters, $this->redirect($pathinfo.'/', isset($parameters['_route']) ? $parameters['_route'] : null));`
`38`	`38`	`} catch (ResourceNotFoundException $e2) {`
`39`	`39`	`throw $e;`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,17 +163,11 @@ protected function matchCollection($pathinfo, RouteCollection $routes)`
`163`	`163`
`164`	`164`	`$status = $this->handleRouteRequirements($pathinfo, $name, $route);`
`165`	`165`
`166`		`- if (self::ROUTE_MATCH === $status[0]) {`
`167`		`- $attributes = array_replace($matches, $hostMatches, (array) $status[1]);`
`168`		`-`
`169`		`- return $this->mergeDefaults($attributes, $route->getDefaults());`
`170`		`- }`
`171`		`-`
`172`	`166`	`if (self::REQUIREMENT_MISMATCH === $status[0]) {`
`173`	`167`	`continue;`
`174`	`168`	`}`
`175`	`169`
`176`		`- return $this->getAttributes($route, $name, array_replace($matches, $hostMatches));`
	`170`	`+ return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array()));`
`177`	`171`	`}`
`178`	`172`	`}`
`179`	`173`