[Routing] made an empty path info to redirect to / (as for any other …

…route that ends with a /)
symfony · Feb 26, 2011 · e16c666 · e16c666
1 parent f46c6f7
commit e16c666
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 16 deletions.
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
@@ -70,7 +70,7 @@ public function dump(array $options = array())
             $regexes[] = sprintf("%sRewriteCond %%{PATH_INFO} %s\nRewriteRule .* %s [QSA,L,%s]", $conditions, $regex, $options['script_name'], $variables);
 
             // add redirect for missing trailing slash
-            if ('/$' === substr($regex, -2) && '^/$' !== $regex) {
+            if ('/$' === substr($regex, -2)) {
                 $regexes[count($regexes)-1] .= sprintf("\nRewriteCond %%{PATH_INFO} %s\nRewriteRule .* /$0/ [QSA,L,R=301]", substr($regex, 0, -2).'$');
             }
         }

diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -62,7 +62,7 @@ protected function addMatcher()
 
             $hasTrailingSlash = false;
             if (!count($compiledRoute->getVariables()) && false !== preg_match('#^(.)\^(?P<url>.*?)\$\1#', $compiledRoute->getRegex(), $m)) {
-                if (substr($m['url'], -1) === '/' && $m['url'] !== '/') {
+                if (substr($m['url'], -1) === '/') {
                     $conditions[] = sprintf("rtrim(\$url, '/') === '%s'", rtrim(str_replace('\\', '', $m['url']), '/'));
                     $hasTrailingSlash = true;
                 } else {

diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -101,11 +101,6 @@ protected function mergeDefaults($params, $defaults)
 
     protected function normalizeUrl($url)
     {
-        // ensure that the URL starts with a /
-        if ('/' !== substr($url, 0, 1)) {
-            throw new \InvalidArgumentException(sprintf('URL "%s" is not valid (it does not start with a /).', $url));
-        }
-
         // remove the query string
         if (false !== $pos = strpos($url, '?')) {
             $url = substr($url, 0, $pos);

diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
@@ -28,15 +28,6 @@ public function testNormalizeUrl()
         $this->assertEquals('/foo/bar', $matcher->normalizeUrl('/foo//bar'), '->normalizeUrl() removes duplicated /');
     }
 
-    /**
-     * @expectedException \InvalidArgumentException
-     */
-    public function testNormalizeUrlThrowsAnExceptionIfTheUrlIsInvalid()
-    {
-        $matcher = new UrlMatcherForTests(new RouteCollection(), array(), array());
-        $matcher->normalizeUrl('');
-    }
-
     public function testMatch()
     {
       // test the patterns are matched are parameters are returned