[Routing] Fix throwing NoConfigurationException instead of 405

nicolas-grekas · nicolas-grekas · commit 50f333b707be · 2018-04-04T15:22:16.000+02:00
diff --git a/Matcher/Dumper/PhpMatcherDumper.php b/Matcher/Dumper/PhpMatcherDumper.php
@@ -154,7 +154,7 @@ private function compileRoutes(RouteCollection $routes, $supportsRedirections)
         }
 
         // used to display the Welcome Page in apps that don't define a homepage
-        $code .= "        if ('/' === \$pathinfo) {\n";
+        $code .= "        if ('/' === \$pathinfo && !\$allow) {\n";
         $code .= "            throw new Symfony\Component\Routing\Exception\NoConfigurationException();\n";
         $code .= "        }\n";
 
@@ -362,7 +362,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
 EOF;
             }
         } elseif ($methods) {
-                $code .= <<<EOF
+            $code .= <<<EOF
             if (!in_array($methodVariable, array('$methods'))) {
                 \$allow = array_merge(\$allow, array('$methods'));
                 goto $gotoname;
diff --git a/Matcher/UrlMatcher.php b/Matcher/UrlMatcher.php
@@ -76,7 +76,7 @@ public function match($pathinfo)
             return $ret;
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$this->allow) {
             throw new NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher0.php b/Tests/Fixtures/dumper/url_matcher0.php
@@ -28,7 +28,7 @@ public function match($rawPathinfo)
             $canonicalMethod = 'GET';
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher1.php b/Tests/Fixtures/dumper/url_matcher1.php
@@ -309,7 +309,7 @@ public function match($rawPathinfo)
 
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher2.php b/Tests/Fixtures/dumper/url_matcher2.php
@@ -371,7 +371,7 @@ public function match($rawPathinfo)
         }
         not_nonsecure:
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher3.php b/Tests/Fixtures/dumper/url_matcher3.php
@@ -46,7 +46,7 @@ public function match($rawPathinfo)
             return array('_route' => 'with-condition');
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher4.php b/Tests/Fixtures/dumper/url_matcher4.php
@@ -103,7 +103,7 @@ public function match($rawPathinfo)
 
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher5.php b/Tests/Fixtures/dumper/url_matcher5.php
@@ -200,7 +200,7 @@ public function match($rawPathinfo)
 
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher6.php b/Tests/Fixtures/dumper/url_matcher6.php
@@ -204,7 +204,7 @@ public function match($rawPathinfo)
 
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Fixtures/dumper/url_matcher7.php b/Tests/Fixtures/dumper/url_matcher7.php
@@ -240,7 +240,7 @@ public function match($rawPathinfo)
 
         }
 
-        if ('/' === $pathinfo) {
+        if ('/' === $pathinfo && !$allow) {
             throw new Symfony\Component\Routing\Exception\NoConfigurationException();
         }
 
diff --git a/Tests/Matcher/UrlMatcherTest.php b/Tests/Matcher/UrlMatcherTest.php
@@ -45,6 +45,21 @@ public function testMethodNotAllowed()
         }
     }
 
+    public function testMethodNotAllowedOnRoot()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', array(), array(), array(), '', array(), array('GET')));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
+
+        try {
+            $matcher->match('/');
+            $this->fail();
+        } catch (MethodNotAllowedException $e) {
+            $this->assertEquals(array('GET'), $e->getAllowedMethods());
+        }
+    }
+
     public function testHeadAllowedWhenRequirementContainsGet()
     {
         $coll = new RouteCollection();

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public function match($pathinfo)`
`76`	`76`	`return $ret;`
`77`	`77`	`}`
`78`	`78`
`79`		`- if ('/' === $pathinfo) {`
	`79`	`+ if ('/' === $pathinfo && !$this->allow) {`
`80`	`80`	`throw new NoConfigurationException();`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function match($rawPathinfo)`
`28`	`28`	`$canonicalMethod = 'GET';`
`29`	`29`	`}`
`30`	`30`
`31`		`- if ('/' === $pathinfo) {`
	`31`	`+ if ('/' === $pathinfo && !$allow) {`
`32`	`32`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,7 @@ public function match($rawPathinfo)`
`309`	`309`
`310`	`310`	`}`
`311`	`311`
`312`		`- if ('/' === $pathinfo) {`
	`312`	`+ if ('/' === $pathinfo && !$allow) {`
`313`	`313`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`314`	`314`	`}`
`315`	`315`
Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ public function match($rawPathinfo)`
`371`	`371`	`}`
`372`	`372`	`not_nonsecure:`
`373`	`373`
`374`		`- if ('/' === $pathinfo) {`
	`374`	`+ if ('/' === $pathinfo && !$allow) {`
`375`	`375`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`376`	`376`	`}`
`377`	`377`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function match($rawPathinfo)`
`46`	`46`	`return array('_route' => 'with-condition');`
`47`	`47`	`}`
`48`	`48`
`49`		`- if ('/' === $pathinfo) {`
	`49`	`+ if ('/' === $pathinfo && !$allow) {`
`50`	`50`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`51`	`51`	`}`
`52`	`52`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public function match($rawPathinfo)`
`103`	`103`
`104`	`104`	`}`
`105`	`105`
`106`		`- if ('/' === $pathinfo) {`
	`106`	`+ if ('/' === $pathinfo && !$allow) {`
`107`	`107`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public function match($rawPathinfo)`
`200`	`200`
`201`	`201`	`}`
`202`	`202`
`203`		`- if ('/' === $pathinfo) {`
	`203`	`+ if ('/' === $pathinfo && !$allow) {`
`204`	`204`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`205`	`205`	`}`
`206`	`206`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ public function match($rawPathinfo)`
`204`	`204`
`205`	`205`	`}`
`206`	`206`
`207`		`- if ('/' === $pathinfo) {`
	`207`	`+ if ('/' === $pathinfo && !$allow) {`
`208`	`208`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`209`	`209`	`}`
`210`	`210`
Original file line number	Diff line number	Diff line change
`@@ -240,7 +240,7 @@ public function match($rawPathinfo)`
`240`	`240`
`241`	`241`	`}`
`242`	`242`
`243`		`- if ('/' === $pathinfo) {`
	`243`	`+ if ('/' === $pathinfo && !$allow) {`
`244`	`244`	`throw new Symfony\Component\Routing\Exception\NoConfigurationException();`
`245`	`245`	`}`
`246`	`246`