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

symfony · Jul 11, 2017 · 4af7c54 · 4af7c54
1 parent 2fa7cc5
commit 4af7c54
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ CHANGELOG
 -----
 
  * Added support for prioritized routing loaders.
+ * Add matched and default parameters to redirect responses
 
 3.3.0
 -----

diff --git a/Matcher/Dumper/PhpMatcherDumper.php b/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/Matcher/RedirectableUrlMatcher.php b/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/Matcher/UrlMatcher.php b/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/Tests/Matcher/RedirectableUrlMatcherTest.php b/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'));
     }
 }