This commit is contained in:
Fabien Potencier 2019-02-21 11:18:37 +01:00
parent 5ac4c2abf5
commit 7b4f4bfd47
1 changed files with 6 additions and 6 deletions

View File

@ -708,16 +708,16 @@ class UrlGeneratorTest extends TestCase
*/ */
public function testLookRoundRequirementsInPath($expected, $path, $requirement) public function testLookRoundRequirementsInPath($expected, $path, $requirement)
{ {
$routes = $this->getRoutes('test', new Route($path, array(), array('foo' => $requirement, 'baz' => '.+?'))); $routes = $this->getRoutes('test', new Route($path, [], ['foo' => $requirement, 'baz' => '.+?']));
$this->assertSame($expected, $this->getGenerator($routes)->generate('test', array('foo' => 'a/b', 'baz' => 'c/d/e'))); $this->assertSame($expected, $this->getGenerator($routes)->generate('test', ['foo' => 'a/b', 'baz' => 'c/d/e']));
} }
public function provideLookAroundRequirementsInPath() public function provideLookAroundRequirementsInPath()
{ {
yield array('/app.php/a/b/b%28ar/c/d/e', '/{foo}/b(ar/{baz}', '.+(?=/b\\(ar/)'); yield ['/app.php/a/b/b%28ar/c/d/e', '/{foo}/b(ar/{baz}', '.+(?=/b\\(ar/)'];
yield array('/app.php/a/b/bar/c/d/e', '/{foo}/bar/{baz}', '.+(?!$)'); yield ['/app.php/a/b/bar/c/d/e', '/{foo}/bar/{baz}', '.+(?!$)'];
yield array('/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<=/bar/).+'); yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<=/bar/).+'];
yield array('/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'); yield ['/app.php/bar/a/b/bam/c/d/e', '/bar/{foo}/bam/{baz}', '(?<!^).+'];
} }
protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null) protected function getGenerator(RouteCollection $routes, array $parameters = [], $logger = null)