[Routing] removing the routing hack where we add a / at the beginning…

… if it does not exist
symfony · Feb 21, 2011 · 9619c7d · 9619c7d
1 parent 52f4d81
commit 9619c7d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/Matcher/UrlMatcher.php
@@ -102,7 +102,7 @@ protected function normalizeUrl($url)
     {
         // ensure that the URL starts with a /
         if ('/' !== substr($url, 0, 1)) {
-            $url = '/'.$url;
+            throw new \InvalidArgumentException(sprintf('URL "%s" is not valid (it does not start with a /).', $url));
         }
 
         // remove the query string

diff --git a/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php b/tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
@@ -24,12 +24,19 @@ public function testNormalizeUrl()
 
         $matcher = new UrlMatcherForTests($collection, array(), array());
 
-        $this->assertEquals('/', $matcher->normalizeUrl(''), '->normalizeUrl() adds a / at the beginning of the URL if needed');
-        $this->assertEquals('/foo', $matcher->normalizeUrl('foo'), '->normalizeUrl() adds a / at the beginning of the URL if needed');
         $this->assertEquals('/foo', $matcher->normalizeUrl('/foo?foo=bar'), '->normalizeUrl() removes the query string');
         $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