Merge branch '4.0'

nicolas-grekas · nicolas-grekas · commit add5d84e8c78 · 2018-02-26T18:43:03.000+01:00
* 4.0:
  fix merge
diff --git a/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php b/src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
@@ -641,14 +641,17 @@ private function compileRoute(Route $route, string $name, bool $checkHost): stri
             $code .= sprintf("            \$ret = array('_route' => '%s');\n", $name);
         }
 
+        if ($methods) {
+            $methodVariable = isset($methods['GET']) ? '$canonicalMethod' : '$requestMethod';
+            $methods = self::export($methods);
+        }
+
         if ($schemes = $route->getSchemes()) {
             if (!$this->supportsRedirections) {
                 throw new \LogicException('The "schemes" requirement is only supported for URL matchers that implement RedirectableUrlMatcherInterface.');
             }
             $schemes = self::export(array_flip($schemes));
             if ($methods) {
-                $methodVariable = isset($methods['GET']) ? '$canonicalMethod' : '$requestMethod';
-                $methods = self::export($methods);
                 $code .= <<<EOF
             \$requiredSchemes = $schemes;
             \$hasRequiredScheme = isset(\$requiredSchemes[\$context->getScheme()]);
@@ -683,9 +686,6 @@ private function compileRoute(Route $route, string $name, bool $checkHost): stri
 EOF;
             }
         } elseif ($methods) {
-            $methodVariable = isset($methods['GET']) ? '$canonicalMethod' : '$requestMethod';
-            $methods = self::export($methods);
-
             $code .= <<<EOF
             if (!isset((\$a = {$methods})[{$methodVariable}])) {
                 \$allow += \$a;
