Merge branch '4.1' into 4.2

* 4.1:
  [Serializer] fixed DateTimeNormalizer to maintain microseconds when a different timezone required
  [Routing] fix taking verb into account when redirecting
  [DI] Fix dumping expressions accessing single-use private services
  [WebProfilerBundle] Split form field heading

Author: nicolas-grekas

Matcher/Dumper/PhpMatcherTrait.php

@@ -67,7 +67,7 @@ public function match($pathinfo)
         throw new ResourceNotFoundException();
     }
 
-    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): ?array
+    private function doMatch(string $rawPathinfo, array &$allow = array(), array &$allowSchemes = array()): array
     {
         $allow = $allowSchemes = array();
         $pathinfo = rawurldecode($rawPathinfo) ?: '/';
@@ -91,7 +91,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
             if ('/' === $pathinfo || $hasTrailingSlash === ('/' === $pathinfo[-1])) {
                 // no-op
             } elseif ($this instanceof RedirectableUrlMatcherInterface) {
-                return null;
+                return $allow = $allowSchemes = array();
             } else {
                 continue;
             }
@@ -140,7 +140,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                         }
                         if ($hasTrailingSlash !== ('/' === $pathinfo[-1])) {
                             if ($this instanceof RedirectableUrlMatcherInterface && (!$requiredMethods || isset($requiredMethods['GET']))) {
-                                return null;
+                                return $allow = $allowSchemes = array();
                             }
                             continue;
                         }
@@ -176,6 +176,6 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
             throw new NoConfigurationException();
         }
 
-        return null;
+        return array();
     }
 }

Matcher/UrlMatcher.php

@@ -143,9 +143,9 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
             } elseif (!$supportsTrailingSlash || ($requiredMethods && !\in_array('GET', $requiredMethods))) {
                 continue;
             } elseif ('/' === $staticPrefix[-1] && substr($staticPrefix, 0, -1) === $pathinfo) {
-                return;
+                return $this->allow = $this->allowSchemes = array();
             } elseif ('/' === $pathinfo[-1] && substr($pathinfo, 0, -1) === $staticPrefix) {
-                return;
+                return $this->allow = $this->allowSchemes = array();
             } else {
                 continue;
             }
@@ -171,7 +171,7 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
                 }
                 if ($hasTrailingSlash !== ('/' === $pathinfo[-1])) {
                     if (!$requiredMethods || \in_array('GET', $requiredMethods)) {
-                        return;
+                        return $this->allow = $this->allowSchemes = array();
                     }
                     continue;
                 }
@@ -212,6 +212,8 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
 
             return $this->getAttributes($route, $name, array_replace($matches, $hostMatches, isset($status[1]) ? $status[1] : array()));
         }
+
+        return array();
     }
 
     /**

Tests/Matcher/RedirectableUrlMatcherTest.php

@@ -170,6 +170,23 @@ public function testMissingTrailingSlashAndScheme()
         $matcher->match('/foo');
     }
 
+    public function testSlashAndVerbPrecedenceWithRedirection()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('post')));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('get')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $expected = array(
+            '_route' => 'b',
+            'customerId' => '123',
+        );
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons/'));
+
+        $matcher->expects($this->once())->method('redirect')->with('/api/customers/123/contactpersons/')->willReturn(array());
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($routes, $context ?: new RequestContext()));

Tests/Matcher/UrlMatcherTest.php

@@ -711,6 +711,20 @@ public function testSlashWithVerb()
         $this->assertSame(array('_route' => 'b'), $matcher->match('/bar/'));
     }
 
+    public function testSlashAndVerbPrecedence()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('post')));
+        $coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('get')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $expected = array(
+            '_route' => 'b',
+            'customerId' => '123',
+        );
+        $this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return new UrlMatcher($routes, $context ?: new RequestContext());