[Routing] Fix throwing NoConfigurationException instead of 405

symfony · nicolas-grekas · Apr 4, 2018 · Apr 4, 2018 · Apr 4, 2018 · 73269cfd0ebc61dfa49b1c8654bfa270f29766bb
commit 73269cfd0ebc61dfa49b1c8654bfa270f29766bb
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Matcher/UrlMatcher.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher0.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher3.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher5.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher6.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher7.php b/src/Symfony/Component/Routing/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/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/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 change
@@ Expand Up / @@ -309,7 +309,7 @@ public function match($rawPathinfo) @@
             }
-            if ('/' === $pathinfo) {
+            if ('/' === $pathinfo && !$allow) {
                 throw new Symfony\Component\Routing\Exception\NoConfigurationException();
             }
@@ Expand Down @@