symfony
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/ApacheMatcherDumper.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+1-1Lines changed: 1 addition & 1 deletion b/‎src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/UrlMatcher.php
-5Lines changed: 0 additions & 5 deletions b/‎src/Symfony/Component/Routing/Matcher/UrlMatcher.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/Routing/Matcher/UrlMatcher.php
-5Lines changed: 0 additions & 5 deletions
diff --git a/‎tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
-9Lines changed: 0 additions & 9 deletions b/‎tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Component/Routing/Matcher/UrlMatcherTest.php
-9Lines changed: 0 additions & 9 deletions
@@ -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).'$');
             }
         }
 
@@ -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 {
 
@@ -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);
 
@@ -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
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function dump(array $options = array())`
`70`	`70`	`$regexes[] = sprintf("%sRewriteCond %%{PATH_INFO} %s\nRewriteRule .* %s [QSA,L,%s]", $conditions, $regex, $options['script_name'], $variables);`
`71`	`71`
`72`	`72`	`// add redirect for missing trailing slash`
`73`		`- if ('/$' === substr($regex, -2) && '^/$' !== $regex) {`
	`73`	`+ if ('/$' === substr($regex, -2)) {`
`74`	`74`	`$regexes[count($regexes)-1] .= sprintf("\nRewriteCond %%{PATH_INFO} %s\nRewriteRule .* /$0/ [QSA,L,R=301]", substr($regex, 0, -2).'$');`
`75`	`75`	`}`
`76`	`76`	`}`