Router: allow HEAD method to be defined first

DavidBadura · DavidBadura · commit 52e2821597fd · 2017-07-21T19:43:13.000+02:00
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -307,7 +307,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
                 if (in_array('GET', $methods)) {
                     // Since we treat HEAD requests like GET requests we don't need to match it.
                     $methodVariable = 'canonicalMethod';
-                    $methods = array_filter($methods, function ($method) { return 'HEAD' !== $method; });
+                    $methods = array_values(array_filter($methods, function ($method) { return 'HEAD' !== $method; }));
                 }
 
                 if (1 === count($methods)) {
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher4.php
@@ -57,6 +57,17 @@ public function match($pathinfo)
         }
         not_head_and_get:
 
+        // get_and_head
+        if ('/get_and_head' === $pathinfo) {
+            if ('GET' !== $canonicalMethod) {
+                $allow[] = 'GET';
+                goto not_get_and_head;
+            }
+
+            return array('_route' => 'get_and_head');
+        }
+        not_get_and_head:
+
         // post_and_head
         if ('/post_and_get' === $pathinfo) {
             if (!in_array($requestMethod, array('POST', 'HEAD'))) {
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php b/src/Symfony/Component/Routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php
@@ -297,6 +297,15 @@ public function getRouteCollections()
             array(),
             '',
             array(),
+            array('HEAD', 'GET')
+        ));
+        $headMatchCasesCollection->add('get_and_head', new Route(
+            '/get_and_head',
+            array(),
+            array(),
+            array(),
+            '',
+            array(),
             array('GET', 'HEAD')
         ));
         $headMatchCasesCollection->add('post_and_head', new Route(

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren`
`307`	`307`	`if (in_array('GET', $methods)) {`
`308`	`308`	`// Since we treat HEAD requests like GET requests we don't need to match it.`
`309`	`309`	`$methodVariable = 'canonicalMethod';`
`310`		`- $methods = array_filter($methods, function ($method) { return 'HEAD' !== $method; });`
	`310`	`+ $methods = array_values(array_filter($methods, function ($method) { return 'HEAD' !== $method; }));`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`if (1 === count($methods)) {`