[Router] added \Z as regex end for route requirement

symfony · zlodes · Jul 31, 2020 · Jul 31, 2020 · 804de8720ab6a58f550147795b4c5d6a77696ddb · nicolas-grekas
commit 804de8720ab6a58f550147795b4c5d6a77696ddb
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -5,7 +5,7 @@ CHANGELOG
 -----
 
  * Added support for inline definition of requirements and defaults for host
- * Added support for `\A` and `\z` as regex start and end for route requirement
+ * Added support for `\A` as regex start and `\Z` or `\z` as end for route requirement
 
 5.1.0
 -----

diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -563,7 +563,7 @@ private function sanitizeRequirement(string $key, string $regex)
 
         if ('$' === substr($regex, -1)) {
             $regex = substr($regex, 0, -1);
-        } elseif (\strlen($regex) - 2 === strpos($regex, '\\z')) {
+        } elseif (\in_array(\strlen($regex) - 2, [strpos($regex, '\\z'), strpos($regex, '\\Z')], true)) {
             $regex = substr($regex, 0, -2);
         }
 

diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -128,6 +128,10 @@ public function testRequirementAlternativeStartAndEndRegexSyntax()
         $route->setRequirement('foo', '\A\d+\z');
         $this->assertEquals('\d+', $route->getRequirement('foo'), '->setRequirement() removes \A and \z from the path');
         $this->assertTrue($route->hasRequirement('foo'));
+
+        $route->setRequirement('bar', '\A\d+\Z');
+        $this->assertEquals('\d+', $route->getRequirement('bar'), '->setRequirement() removes \A and \Z from the path');
+        $this->assertTrue($route->hasRequirement('bar'));
     }
 
     /**
@@ -147,8 +151,10 @@ public function getInvalidRequirements()
            ['^$'],
            ['^'],
            ['$'],
+           ['\A\Z'],
            ['\A\z'],
            ['\A'],
+           ['\Z'],
            ['\z'],
         ];
     }