symfony
diff --git a/‎Matcher/Dumper/PhpMatcherDumper.php
Lines changed: 28 additions & 3 deletions b/‎Matcher/Dumper/PhpMatcherDumper.php
Lines changed: 28 additions & 3 deletions
@@ -60,24 +60,49 @@ protected function addMatcher()
                 $conditions[] = sprintf("isset(\$this->context['method']) && preg_match('#^(%s)$#xi', \$this->context['method'])", $req);
             }
 
+            $hasTrailingSlash = false;
             if (!count($compiledRoute->getVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#', $compiledRoute->getRegex(), $m)) {
-                $conditions[] = sprintf("\$url === '%s'", str_replace('\\', '', $m['url']));
+                if (substr($m['url'], -1) === '/' && $m['url'] !== '/') {
+                    $conditions[] = sprintf("rtrim(\$url, '/') === '%s'", rtrim(str_replace('\\', '', $m['url']), '/'));
+                    $hasTrailingSlash = true;
+                } else {
+                    $conditions[] = sprintf("\$url === '%s'", str_replace('\\', '', $m['url']));
+                }
 
                 $matches = 'array()';
             } else {
                 if ($compiledRoute->getStaticPrefix()) {
                     $conditions[] = sprintf("0 === strpos(\$url, '%s')", $compiledRoute->getStaticPrefix());
                 }
 
-                $conditions[] = sprintf("preg_match('%s', \$url, \$matches)", $compiledRoute->getRegex());
+                $regex = $compiledRoute->getRegex();
+                if ($pos = strpos($regex, '/$')) {
+                    $regex = substr($regex, 0, $pos) . '/?$' . substr($regex, $pos+2);
+                    $conditions[] = sprintf("preg_match('%s', \$url, \$matches)", $regex);
+                    $hasTrailingSlash = true;
+                } else {
+                    $conditions[] = sprintf("preg_match('%s', \$url, \$matches)", $regex);
+                }
 
                 $matches = '$matches';
             }
 
             $conditions = implode(' && ', $conditions);
 
-            $code[] = sprintf(<<<EOF
+            $code[] = <<<EOF
         if ($conditions) {
+EOF;
+
+            if ($hasTrailingSlash) {
+                $code[] = sprintf(<<<EOF
+            if (substr(\$url, -1) !== '/') {
+                return array('_controller' => 'Symfony\\Bundle\\FrameworkBundle\\Controller\\RedirectController::urlRedirectAction', 'url' => \$this->context['base_url'].\$url.'/', 'permanent' => true, '_route' => '%s');
+            }
+EOF
+            , $name);
+            }
+
+            $code[] = sprintf(<<<EOF
             return array_merge(\$this->mergeDefaults($matches, %s), array('_route' => '%s'));
         }