symfony
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Lines changed: 25 additions & 23 deletions b/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Lines changed: 25 additions & 23 deletions
diff --git a/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Lines changed: 3 additions & 1 deletion b/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Lines changed: 3 additions & 1 deletion
@@ -286,10 +286,32 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             }
         }
 
+        // optimize parameters array
+        if ($matches || $hostMatches) {
+            $vars = array();
+            if ($hostMatches) {
+                $vars[] = '$hostMatches';
+            }
+            if ($matches) {
+                $vars[] = '$matches';
+            }
+            $vars[] = "array('_route' => '$name')";
+
+            $code .= sprintf(
+                "            \$ret = \$this->mergeDefaults(array_replace(%s), %s);\n",
+                implode(', ', $vars),
+                str_replace("\n", '', var_export($route->getDefaults(), true))
+            );
+        } elseif ($route->getDefaults()) {
+            $code .= sprintf("            \$ret = %s;\n", str_replace("\n", '', var_export(array_replace($route->getDefaults(), array('_route' => $name)), true)));
+        } else {
+            $code .= sprintf("            \$ret = array('_route' => '%s');\n", $name);
+        }
+
         if ($hasTrailingSlash) {
             $code .= <<<EOF
             if (substr(\$pathinfo, -1) !== '/') {
-                return \$this->redirect(\$pathinfo.'/', '$name');
+                return array_replace(\$ret, \$this->redirect(\$pathinfo.'/', '$name'));
             }
 
 
@@ -304,34 +326,14 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             $code .= <<<EOF
             \$requiredSchemes = $schemes;
             if (!isset(\$requiredSchemes[\$this->context->getScheme()])) {
-                return \$this->redirect(\$pathinfo, '$name', key(\$requiredSchemes));
+                return array_replace(\$ret, \$this->redirect(\$pathinfo, '$name', key(\$requiredSchemes)));
             }
 
 
 EOF;
         }
 
-        // optimize parameters array
-        if ($matches || $hostMatches) {
-            $vars = array();
-            if ($hostMatches) {
-                $vars[] = '$hostMatches';
-            }
-            if ($matches) {
-                $vars[] = '$matches';
-            }
-            $vars[] = "array('_route' => '$name')";
-
-            $code .= sprintf(
-                "            return \$this->mergeDefaults(array_replace(%s), %s);\n",
-                implode(', ', $vars),
-                str_replace("\n", '', var_export($route->getDefaults(), true))
-            );
-        } elseif ($route->getDefaults()) {
-            $code .= sprintf("            return %s;\n", str_replace("\n", '', var_export(array_replace($route->getDefaults(), array('_route' => $name)), true)));
-        } else {
-            $code .= sprintf("            return array('_route' => '%s');\n", $name);
-        }
+        $code .= "            return \$ret;\n";
         $code .= "        }\n";
 
         if ($methods) {
 
@@ -164,7 +164,9 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             $status = $this->handleRouteRequirements($pathinfo, $name, $route);
 
             if (self::ROUTE_MATCH === $status[0]) {
-                return $status[1];
+                $attributes = array_replace($matches, $hostMatches, (array) $status[1]);
+
+                return $this->mergeDefaults($attributes, $route->getDefaults());
             }
 
             if (self::REQUIREMENT_MISMATCH === $status[0]) {
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ protected function matchCollection($pathinfo, RouteCollection $routes)`
`164`	`164`	`$status = $this->handleRouteRequirements($pathinfo, $name, $route);`
`165`	`165`
`166`	`166`	`if (self::ROUTE_MATCH === $status[0]) {`
`167`		`- return $status[1];`
	`167`	`+ $attributes = array_replace($matches, $hostMatches, (array) $status[1]);`
	`168`	`+`
	`169`	`+ return $this->mergeDefaults($attributes, $route->getDefaults());`
`168`	`170`	`}`
`169`	`171`
`170`	`172`	`if (self::REQUIREMENT_MISMATCH === $status[0]) {`