Fix merge

Author: nicolas-grekas

Matcher/Dumper/PhpMatcherDumper.php

@@ -327,7 +327,7 @@ private function compileRoute(Route $route, $name, $supportsRedirections, $paren
             $code .= <<<EOF
             \$requiredSchemes = $schemes;
             if (!isset(\$requiredSchemes[\$context->getScheme()])) {
-                if (!in_array(\$this->context->getMethod(), array('HEAD', 'GET'))) {
+                if ('GET' !== \$canonicalMethod) {
                     \$allow[] = 'GET';
                     goto $gotoname;
                 }

Tests/Fixtures/dumper/url_matcher2.php

@@ -347,7 +347,7 @@ public function match($rawPathinfo)
             $ret = array('_route' => 'secure');
             $requiredSchemes = array (  'https' => 0,);
             if (!isset($requiredSchemes[$context->getScheme()])) {
-                if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
+                if ('GET' !== $canonicalMethod) {
                     $allow[] = 'GET';
                     goto not_secure;
                 }
@@ -364,7 +364,7 @@ public function match($rawPathinfo)
             $ret = array('_route' => 'nonsecure');
             $requiredSchemes = array (  'http' => 0,);
             if (!isset($requiredSchemes[$context->getScheme()])) {
-                if (!in_array($this->context->getMethod(), array('HEAD', 'GET'))) {
+                if ('GET' !== $canonicalMethod) {
                     $allow[] = 'GET';
                     goto not_nonsecure;
                 }