Merge branch '4.1' into 4.2

* 4.1:
  [Routing] fix trailing slash redirection
  calculate cache keys for property setters depending on the value
  updated VERSION for 2.8.48
  update CONTRIBUTORS for 2.8.48
  updated CHANGELOG for 2.8.48

Author: nicolas-grekas

Matcher/Dumper/PhpMatcherTrait.php

@@ -130,7 +130,7 @@ private function doMatch(string $rawPathinfo, array &$allow = array(), array &$a
                         continue;
                     }
 
-                    if ('/' === $pathinfo || $hasTrailingSlash === ('/' === $pathinfo[-1])) {
+                    if ('/' === $pathinfo || (!$hasTrailingSlash ? '/' !== $pathinfo[-1] || !preg_match($regex, substr($pathinfo, 0, -1), $n) || $m !== (int) $n['MARK'] : '/' === $pathinfo[-1])) {
                         // no-op
                     } elseif ($this instanceof RedirectableUrlMatcherInterface) {
                         return null;

Matcher/UrlMatcher.php

@@ -160,8 +160,13 @@ protected function matchCollection($pathinfo, RouteCollection $routes)
                 continue;
             }
 
-            if ($supportsTrailingSlash && $hasTrailingSlash !== ('/' === $pathinfo[-1])) {
-                return;
+            if ($supportsTrailingSlash) {
+                if (!$hasTrailingSlash && '/' === $pathinfo[-1] && preg_match($regex, substr($pathinfo, 0, -1))) {
+                    return;
+                }
+                if ($hasTrailingSlash && '/' !== $pathinfo[-1]) {
+                    return;
+                }
             }
 
             $hostMatches = array();

Tests/Matcher/UrlMatcherTest.php

@@ -683,6 +683,15 @@ public function testHostWithDot()
         $this->assertEquals('b', $matcher->match('/bar/abc.123')['_route']);
     }
 
+    public function testSlashVariant()
+    {
+        $coll = new RouteCollection();
+        $coll->add('a', new Route('/foo/{bar}', array(), array('bar' => '.*')));
+
+        $matcher = $this->getUrlMatcher($coll);
+        $this->assertEquals('a', $matcher->match('/foo/')['_route']);
+    }
+
     protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
     {
         return new UrlMatcher($routes, $context ?: new RequestContext());