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

zlodes · zlodes · commit 9362fa820b02 · 2020-07-30T18:22:48.000+03:00
diff --git a/src/Symfony/Component/Routing/Route.php b/src/Symfony/Component/Routing/Route.php
@@ -546,6 +546,9 @@ public function compile()
 
     private function sanitizeRequirement(string $key, string $regex)
     {
+        // Replace \A, \z with classic ^ and $
+        $regex = str_replace(['\A', '\z'], ['^', '$'], $regex);
+
         if ('' !== $regex && '^' === $regex[0]) {
             $regex = (string) substr($regex, 1); // returns false for a single character
         }
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
`@@ -546,6 +546,9 @@ public function compile()`
`546`	`546`
`547`	`547`	`private function sanitizeRequirement(string $key, string $regex)`
`548`	`548`	`{`
	`549`	`+ // Replace \A, \z with classic ^ and $`
	`550`	`+ $regex = str_replace(['\A', '\z'], ['^', '$'], $regex);`
	`551`	`+`
`549`	`552`	`if ('' !== $regex && '^' === $regex[0]) {`
`550`	`553`	`$regex = (string) substr($regex, 1); // returns false for a single character`
`551`	`554`	`}`