Merge branch '4.1' into 4.2

* 4.1:
  [Workflow] Fixed BC break for Workflow metadata
  [Routing] ignore trailing slash for non-GET requests

Author: nicolas-grekas

Matcher/Dumper/PhpMatcherTrait.php

@@ -90,7 +90,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
 
             if ('/' === $pathinfo || $hasTrailingSlash === ('/' === $pathinfo[-1])) {
                 // no-op
-            } elseif ($this instanceof RedirectableUrlMatcherInterface) {
+            } elseif ($this instanceof RedirectableUrlMatcherInterface && (!$requiredMethods || isset($requiredMethods['GET'])) && 'GET' === $canonicalMethod) {
                 return $allow = $allowSchemes = array();
             } else {
                 continue;
@@ -139,7 +139,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                             }
                         }
                         if ($hasTrailingSlash !== ('/' === $pathinfo[-1])) {
-                            if ($this instanceof RedirectableUrlMatcherInterface && (!$requiredMethods || isset($requiredMethods['GET']))) {
+                            if ($this instanceof RedirectableUrlMatcherInterface && (!$requiredMethods || isset($requiredMethods['GET'])) && 'GET' === $canonicalMethod) {
                                 return $allow = $allowSchemes = array();
                             }
                             continue;

Matcher/UrlMatcher.php

@@ -130,6 +130,10 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac
      */
     protected function matchCollection($pathinfo, RouteCollection $routes)
     {
+        // HEAD and GET are equivalent as per RFC
+        if ('HEAD' === $method = $this->context->getMethod()) {
+            $method = 'GET';
+        }
         $supportsTrailingSlash = '/' !== $pathinfo && '' !== $pathinfo && $this instanceof RedirectableUrlMatcherInterface;
 
         foreach ($routes as $name => $route) {
@@ -140,7 +144,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             // check the static prefix of the URL first. Only use the more expensive preg_match when it matches
             if ('' === $staticPrefix || 0 === strpos($pathinfo, $staticPrefix)) {
                 // no-op
-            } elseif (!$supportsTrailingSlash || ($requiredMethods && !\in_array('GET', $requiredMethods))) {
+            } elseif (!$supportsTrailingSlash || ($requiredMethods && !\in_array('GET', $requiredMethods)) || 'GET' !== $method) {
                 continue;
             } elseif ('/' === $staticPrefix[-1] && substr($staticPrefix, 0, -1) === $pathinfo) {
                 return $this->allow = $this->allowSchemes = array();
@@ -170,7 +174,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
                     }
                 }
                 if ($hasTrailingSlash !== ('/' === $pathinfo[-1])) {
-                    if (!$requiredMethods || \in_array('GET', $requiredMethods)) {
+                    if ((!$requiredMethods || \in_array('GET', $requiredMethods)) && 'GET' === $method) {
                         return $this->allow = $this->allowSchemes = array();
                     }
                     continue;
@@ -190,11 +194,6 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
             $hasRequiredScheme = !$route->getSchemes() || $route->hasScheme($this->context->getScheme());
             if ($requiredMethods) {
-                // HEAD and GET are equivalent as per RFC
-                if ('HEAD' === $method = $this->context->getMethod()) {
-                    $method = 'GET';
-                }
-
                 if (!\in_array($method, $requiredMethods)) {
                     if ($hasRequiredScheme) {
                         $this->allow = array_merge($this->allow, $requiredMethods);

Tests/Matcher/UrlMatcherTest.php

@@ -723,6 +723,17 @@ public function testSlashAndVerbPrecedence()
             'customerId' => '123',
         );
         $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('get')));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('post')));
+
+        $matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
+        $expected = array(
+            '_route' => 'b',
+            'customerId' => '123',
+        );
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
     }
 
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)