[Router] allow to use \A and \z as regex start and end

zlodes · fabpot · commit f752eeeaa64d · 2020-07-31T08:30:09.000+02:00
diff --git a/src/Symfony/Component/Routing/CHANGELOG.md b/src/Symfony/Component/Routing/CHANGELOG.md
@@ -5,6 +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
 
 5.1.0
 -----
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -553,12 +553,18 @@ private function extractInlineDefaultsAndRequirements(string $pattern): string
 
     private function sanitizeRequirement(string $key, string $regex)
     {
-        if ('' !== $regex && '^' === $regex[0]) {
-            $regex = (string) substr($regex, 1); // returns false for a single character
+        if ('' !== $regex) {
+            if ('^' === $regex[0]) {
+                $regex = substr($regex, 1);
+            } elseif (0 === strpos($regex, '\\A')) {
+                $regex = substr($regex, 2);
+            }
         }
 
         if ('$' === substr($regex, -1)) {
             $regex = substr($regex, 0, -1);
+        } elseif (\strlen($regex) - 2 === strpos($regex, '\\z')) {
+            $regex = substr($regex, 0, -2);
         }
 
         if ('' === $regex) {
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -122,6 +122,14 @@ public function testRequirement()
         $this->assertTrue($route->hasRequirement('foo'), '->hasRequirement() return true if requirement is set');
     }
 
+    public function testRequirementAlternativeStartAndEndRegexSyntax()
+    {
+        $route = new Route('/{foo}');
+        $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'));
+    }
+
     /**
      * @dataProvider getInvalidRequirements
      */
@@ -139,6 +147,9 @@ public function getInvalidRequirements()
            ['^$'],
            ['^'],
            ['$'],
+           ['\A\z'],
+           ['\A'],
+           ['\z'],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -553,12 +553,18 @@ private function extractInlineDefaultsAndRequirements(string $pattern): string`
`553`	`553`
`554`	`554`	`private function sanitizeRequirement(string $key, string $regex)`
`555`	`555`	`{`
`556`		`- if ('' !== $regex && '^' === $regex[0]) {`
`557`		`- $regex = (string) substr($regex, 1); // returns false for a single character`
	`556`	`+ if ('' !== $regex) {`
	`557`	`+ if ('^' === $regex[0]) {`
	`558`	`+ $regex = substr($regex, 1);`
	`559`	`+ } elseif (0 === strpos($regex, '\\A')) {`
	`560`	`+ $regex = substr($regex, 2);`
	`561`	`+ }`
`558`	`562`	`}`
`559`	`563`
`560`	`564`	`if ('$' === substr($regex, -1)) {`
`561`	`565`	`$regex = substr($regex, 0, -1);`
	`566`	`+ } elseif (\strlen($regex) - 2 === strpos($regex, '\\z')) {`
	`567`	`+ $regex = substr($regex, 0, -2);`
`562`	`568`	`}`
`563`	`569`
`564`	`570`	`if ('' === $regex) {`