drkthunder02/w4rpservices
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated packages

Browse Source
This commit is contained in:
drkthunder02
2019-05-18 09:06:43 +00:00
parent 901d16349e
commit e9487fa58a
2025 changed files with 30366 additions and 49653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/symfony/routing/Tests/Matcher/DumpedRedirectableUrlMatcherTest.php vendored
View File

@@ -25,11 +25,11 @@ class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest
$class = 'DumpedRedirectableUrlMatcher'.++$i;
$dumper = new PhpMatcherDumper($routes);
eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
eval('?>'.$dumper->dump(['class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher']));
return $this->getMockBuilder($class)
->setConstructorArgs(array($context ?: new RequestContext()))
->setMethods(array('redirect'))
->setConstructorArgs([$context ?: new RequestContext()])
->setMethods(['redirect'])
->getMock();
}
}
@@ -38,6 +38,6 @@ class TestDumpedRedirectableUrlMatcher extends UrlMatcher implements Redirectabl
{
public function redirect($path, $route, $scheme = null)
{
return array();
return [];
}
}

2
vendor/symfony/routing/Tests/Matcher/DumpedUrlMatcherTest.php vendored
View File

@@ -23,7 +23,7 @@ class DumpedUrlMatcherTest extends UrlMatcherTest
$class = 'DumpedUrlMatcher'.++$i;
$dumper = new PhpMatcherDumper($routes);
eval('?>'.$dumper->dump(array('class' => $class)));
eval('?>'.$dumper->dump(['class' => $class]));
return new $class($context ?: new RequestContext());
}

254
vendor/symfony/routing/Tests/Matcher/Dumper/PhpMatcherDumperTest.php vendored
View File

@@ -54,11 +54,11 @@ class PhpMatcherDumperTest extends TestCase
$class = $this->generateDumpedMatcher($collection, true);
$matcher = $this->getMockBuilder($class)
->setMethods(array('redirect'))
->setConstructorArgs(array(new RequestContext()))
->setMethods(['redirect'])
->setConstructorArgs([new RequestContext()])
->getMock();
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn(array());
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/', 'foo')->willReturn([]);
$matcher->match('/foo%3Abar');
}
@@ -66,7 +66,7 @@ class PhpMatcherDumperTest extends TestCase
/**
* @dataProvider getRouteCollections
*/
public function testDump(RouteCollection $collection, $fixture, $options = array())
public function testDump(RouteCollection $collection, $fixture, $options = [])
{
$basePath = __DIR__.'/../../Fixtures/dumper/';
@@ -85,28 +85,28 @@ class PhpMatcherDumperTest extends TestCase
// defaults and requirements
$collection->add('foo', new Route(
'/foo/{bar}',
array('def' => 'test'),
array('bar' => 'baz|symfony')
['def' => 'test'],
['bar' => 'baz|symfony']
));
// method requirement
$collection->add('bar', new Route(
'/bar/{foo}',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('GET', 'head')
[],
['GET', 'head']
));
// GET method requirement automatically adds HEAD as valid
$collection->add('barhead', new Route(
'/barhead/{foo}',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('GET')
[],
['GET']
));
// simple
$collection->add('baz', new Route(
@@ -127,33 +127,33 @@ class PhpMatcherDumperTest extends TestCase
// trailing slash and method
$collection->add('baz5', new Route(
'/test/{foo}/',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('post')
[],
['post']
));
// complex name
$collection->add('baz.baz6', new Route(
'/test/{foo}/',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('put')
[],
['put']
));
// defaults without variable
$collection->add('foofoo', new Route(
'/foofoo',
array('def' => 'test')
['def' => 'test']
));
// pattern with quotes
$collection->add('quoter', new Route(
'/{quoter}',
array(),
array('quoter' => '[\']+')
[],
['quoter' => '[\']+']
));
// space in pattern
$collection->add('space', new Route(
@@ -168,7 +168,7 @@ class PhpMatcherDumperTest extends TestCase
$collection1->addPrefix('/b\'b');
$collection2 = new RouteCollection();
$collection2->addCollection($collection1);
$collection2->add('overridden', new Route('/{var}', array(), array('var' => '.*')));
$collection2->add('overridden', new Route('/{var}', [], ['var' => '.*']));
$collection1 = new RouteCollection();
$collection1->add('foo2', new Route('/{foo1}'));
$collection1->add('bar2', new Route('/{bar1}'));
@@ -180,7 +180,7 @@ class PhpMatcherDumperTest extends TestCase
// overridden through addCollection() and multiple sub-collections with no own prefix
$collection1 = new RouteCollection();
$collection1->add('overridden2', new Route('/old'));
$collection1->add('helloWorld', new Route('/hello/{who}', array('who' => 'World!')));
$collection1->add('helloWorld', new Route('/hello/{who}', ['who' => 'World!']));
$collection2 = new RouteCollection();
$collection3 = new RouteCollection();
$collection3->add('overridden2', new Route('/new'));
@@ -211,22 +211,22 @@ class PhpMatcherDumperTest extends TestCase
$collection1 = new RouteCollection();
$route1 = new Route('/route1', array(), array(), array(), 'a.example.com');
$route1 = new Route('/route1', [], [], [], 'a.example.com');
$collection1->add('route1', $route1);
$route2 = new Route('/c2/route2', array(), array(), array(), 'a.example.com');
$route2 = new Route('/c2/route2', [], [], [], 'a.example.com');
$collection1->add('route2', $route2);
$route3 = new Route('/c2/route3', array(), array(), array(), 'b.example.com');
$route3 = new Route('/c2/route3', [], [], [], 'b.example.com');
$collection1->add('route3', $route3);
$route4 = new Route('/route4', array(), array(), array(), 'a.example.com');
$route4 = new Route('/route4', [], [], [], 'a.example.com');
$collection1->add('route4', $route4);
$route5 = new Route('/route5', array(), array(), array(), 'c.example.com');
$route5 = new Route('/route5', [], [], [], 'c.example.com');
$collection1->add('route5', $route5);
$route6 = new Route('/route6', array(), array(), array(), null);
$route6 = new Route('/route6', [], [], [], null);
$collection1->add('route6', $route6);
$collection->addCollection($collection1);
@@ -235,25 +235,25 @@ class PhpMatcherDumperTest extends TestCase
$collection1 = new RouteCollection();
$route11 = new Route('/route11', array(), array(), array(), '{var1}.example.com');
$route11 = new Route('/route11', [], [], [], '{var1}.example.com');
$collection1->add('route11', $route11);
$route12 = new Route('/route12', array('var1' => 'val'), array(), array(), '{var1}.example.com');
$route12 = new Route('/route12', ['var1' => 'val'], [], [], '{var1}.example.com');
$collection1->add('route12', $route12);
$route13 = new Route('/route13/{name}', array(), array(), array(), '{var1}.example.com');
$route13 = new Route('/route13/{name}', [], [], [], '{var1}.example.com');
$collection1->add('route13', $route13);
$route14 = new Route('/route14/{name}', array('var1' => 'val'), array(), array(), '{var1}.example.com');
$route14 = new Route('/route14/{name}', ['var1' => 'val'], [], [], '{var1}.example.com');
$collection1->add('route14', $route14);
$route15 = new Route('/route15/{name}', array(), array(), array(), 'c.example.com');
$route15 = new Route('/route15/{name}', [], [], [], 'c.example.com');
$collection1->add('route15', $route15);
$route16 = new Route('/route16/{name}', array('var1' => 'val'), array(), array(), null);
$route16 = new Route('/route16/{name}', ['var1' => 'val'], [], [], null);
$collection1->add('route16', $route16);
$route17 = new Route('/route17', array(), array(), array(), null);
$route17 = new Route('/route17', [], [], [], null);
$collection1->add('route17', $route17);
$collection->addCollection($collection1);
@@ -279,21 +279,21 @@ class PhpMatcherDumperTest extends TestCase
// force HTTPS redirection
$redirectCollection->add('secure', new Route(
'/secure',
array(),
array(),
array(),
[],
[],
[],
'',
array('https')
['https']
));
// force HTTP redirection
$redirectCollection->add('nonsecure', new Route(
'/nonsecure',
array(),
array(),
array(),
[],
[],
[],
'',
array('http')
['http']
));
/* test case 3 */
@@ -310,57 +310,57 @@ class PhpMatcherDumperTest extends TestCase
$headMatchCasesCollection = new RouteCollection();
$headMatchCasesCollection->add('just_head', new Route(
'/just_head',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('HEAD')
[],
['HEAD']
));
$headMatchCasesCollection->add('head_and_get', new Route(
'/head_and_get',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('HEAD', 'GET')
[],
['HEAD', 'GET']
));
$headMatchCasesCollection->add('get_and_head', new Route(
'/get_and_head',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('GET', 'HEAD')
[],
['GET', 'HEAD']
));
$headMatchCasesCollection->add('post_and_head', new Route(
'/post_and_head',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('POST', 'HEAD')
[],
['POST', 'HEAD']
));
$headMatchCasesCollection->add('put_and_post', new Route(
'/put_and_post',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('PUT', 'POST')
[],
['PUT', 'POST']
));
$headMatchCasesCollection->add('put_and_get_and_head', new Route(
'/put_and_post',
array(),
array(),
array(),
[],
[],
[],
'',
array(),
array('PUT', 'GET', 'HEAD')
[],
['PUT', 'GET', 'HEAD']
));
/* test case 5 */
@@ -383,29 +383,29 @@ class PhpMatcherDumperTest extends TestCase
/* test case 6 & 7 */
$trailingSlashCollection = new RouteCollection();
$trailingSlashCollection->add('simple_trailing_slash_no_methods', new Route('/trailing/simple/no-methods/', array(), array(), array(), '', array(), array()));
$trailingSlashCollection->add('simple_trailing_slash_GET_method', new Route('/trailing/simple/get-method/', array(), array(), array(), '', array(), array('GET')));
$trailingSlashCollection->add('simple_trailing_slash_HEAD_method', new Route('/trailing/simple/head-method/', array(), array(), array(), '', array(), array('HEAD')));
$trailingSlashCollection->add('simple_trailing_slash_POST_method', new Route('/trailing/simple/post-method/', array(), array(), array(), '', array(), array('POST')));
$trailingSlashCollection->add('regex_trailing_slash_no_methods', new Route('/trailing/regex/no-methods/{param}/', array(), array(), array(), '', array(), array()));
$trailingSlashCollection->add('regex_trailing_slash_GET_method', new Route('/trailing/regex/get-method/{param}/', array(), array(), array(), '', array(), array('GET')));
$trailingSlashCollection->add('regex_trailing_slash_HEAD_method', new Route('/trailing/regex/head-method/{param}/', array(), array(), array(), '', array(), array('HEAD')));
$trailingSlashCollection->add('regex_trailing_slash_POST_method', new Route('/trailing/regex/post-method/{param}/', array(), array(), array(), '', array(), array('POST')));
$trailingSlashCollection->add('simple_trailing_slash_no_methods', new Route('/trailing/simple/no-methods/', [], [], [], '', [], []));
$trailingSlashCollection->add('simple_trailing_slash_GET_method', new Route('/trailing/simple/get-method/', [], [], [], '', [], ['GET']));
$trailingSlashCollection->add('simple_trailing_slash_HEAD_method', new Route('/trailing/simple/head-method/', [], [], [], '', [], ['HEAD']));
$trailingSlashCollection->add('simple_trailing_slash_POST_method', new Route('/trailing/simple/post-method/', [], [], [], '', [], ['POST']));
$trailingSlashCollection->add('regex_trailing_slash_no_methods', new Route('/trailing/regex/no-methods/{param}/', [], [], [], '', [], []));
$trailingSlashCollection->add('regex_trailing_slash_GET_method', new Route('/trailing/regex/get-method/{param}/', [], [], [], '', [], ['GET']));
$trailingSlashCollection->add('regex_trailing_slash_HEAD_method', new Route('/trailing/regex/head-method/{param}/', [], [], [], '', [], ['HEAD']));
$trailingSlashCollection->add('regex_trailing_slash_POST_method', new Route('/trailing/regex/post-method/{param}/', [], [], [], '', [], ['POST']));
$trailingSlashCollection->add('simple_not_trailing_slash_no_methods', new Route('/not-trailing/simple/no-methods', array(), array(), array(), '', array(), array()));
$trailingSlashCollection->add('simple_not_trailing_slash_GET_method', new Route('/not-trailing/simple/get-method', array(), array(), array(), '', array(), array('GET')));
$trailingSlashCollection->add('simple_not_trailing_slash_HEAD_method', new Route('/not-trailing/simple/head-method', array(), array(), array(), '', array(), array('HEAD')));
$trailingSlashCollection->add('simple_not_trailing_slash_POST_method', new Route('/not-trailing/simple/post-method', array(), array(), array(), '', array(), array('POST')));
$trailingSlashCollection->add('regex_not_trailing_slash_no_methods', new Route('/not-trailing/regex/no-methods/{param}', array(), array(), array(), '', array(), array()));
$trailingSlashCollection->add('regex_not_trailing_slash_GET_method', new Route('/not-trailing/regex/get-method/{param}', array(), array(), array(), '', array(), array('GET')));
$trailingSlashCollection->add('regex_not_trailing_slash_HEAD_method', new Route('/not-trailing/regex/head-method/{param}', array(), array(), array(), '', array(), array('HEAD')));
$trailingSlashCollection->add('regex_not_trailing_slash_POST_method', new Route('/not-trailing/regex/post-method/{param}', array(), array(), array(), '', array(), array('POST')));
$trailingSlashCollection->add('simple_not_trailing_slash_no_methods', new Route('/not-trailing/simple/no-methods', [], [], [], '', [], []));
$trailingSlashCollection->add('simple_not_trailing_slash_GET_method', new Route('/not-trailing/simple/get-method', [], [], [], '', [], ['GET']));
$trailingSlashCollection->add('simple_not_trailing_slash_HEAD_method', new Route('/not-trailing/simple/head-method', [], [], [], '', [], ['HEAD']));
$trailingSlashCollection->add('simple_not_trailing_slash_POST_method', new Route('/not-trailing/simple/post-method', [], [], [], '', [], ['POST']));
$trailingSlashCollection->add('regex_not_trailing_slash_no_methods', new Route('/not-trailing/regex/no-methods/{param}', [], [], [], '', [], []));
$trailingSlashCollection->add('regex_not_trailing_slash_GET_method', new Route('/not-trailing/regex/get-method/{param}', [], [], [], '', [], ['GET']));
$trailingSlashCollection->add('regex_not_trailing_slash_HEAD_method', new Route('/not-trailing/regex/head-method/{param}', [], [], [], '', [], ['HEAD']));
$trailingSlashCollection->add('regex_not_trailing_slash_POST_method', new Route('/not-trailing/regex/post-method/{param}', [], [], [], '', [], ['POST']));
/* test case 8 */
$unicodeCollection = new RouteCollection();
$unicodeCollection->add('a', new Route('/{a}', array(), array('a' => 'a'), array('utf8' => false)));
$unicodeCollection->add('b', new Route('/{a}', array(), array('a' => '.'), array('utf8' => true)));
$unicodeCollection->add('c', new Route('/{a}', array(), array('a' => '.'), array('utf8' => false)));
$unicodeCollection->add('a', new Route('/{a}', [], ['a' => 'a'], ['utf8' => false]));
$unicodeCollection->add('b', new Route('/{a}', [], ['a' => '.'], ['utf8' => true]));
$unicodeCollection->add('c', new Route('/{a}', [], ['a' => '.'], ['utf8' => false]));
/* test case 9 */
$hostTreeCollection = new RouteCollection();
@@ -424,21 +424,21 @@ class PhpMatcherDumperTest extends TestCase
$demoCollection = new RouteCollection();
$demoCollection->add('a', new Route('/admin/post/'));
$demoCollection->add('b', new Route('/admin/post/new'));
$demoCollection->add('c', (new Route('/admin/post/{id}'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('d', (new Route('/admin/post/{id}/edit'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('e', (new Route('/admin/post/{id}/delete'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('c', (new Route('/admin/post/{id}'))->setRequirements(['id' => '\d+']));
$demoCollection->add('d', (new Route('/admin/post/{id}/edit'))->setRequirements(['id' => '\d+']));
$demoCollection->add('e', (new Route('/admin/post/{id}/delete'))->setRequirements(['id' => '\d+']));
$demoCollection->add('f', new Route('/blog/'));
$demoCollection->add('g', new Route('/blog/rss.xml'));
$demoCollection->add('h', (new Route('/blog/page/{page}'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('i', (new Route('/blog/posts/{page}'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('j', (new Route('/blog/comments/{id}/new'))->setRequirements(array('id' => '\d+')));
$demoCollection->add('h', (new Route('/blog/page/{page}'))->setRequirements(['id' => '\d+']));
$demoCollection->add('i', (new Route('/blog/posts/{page}'))->setRequirements(['id' => '\d+']));
$demoCollection->add('j', (new Route('/blog/comments/{id}/new'))->setRequirements(['id' => '\d+']));
$demoCollection->add('k', new Route('/blog/search'));
$demoCollection->add('l', new Route('/login'));
$demoCollection->add('m', new Route('/logout'));
$demoCollection->addPrefix('/{_locale}');
$demoCollection->add('n', new Route('/{_locale}'));
$demoCollection->addRequirements(array('_locale' => 'en|fr'));
$demoCollection->addDefaults(array('_locale' => 'en'));
$demoCollection->addRequirements(['_locale' => 'en|fr']);
$demoCollection->addDefaults(['_locale' => 'en']);
/* test case 12 */
$suffixCollection = new RouteCollection();
@@ -454,27 +454,27 @@ class PhpMatcherDumperTest extends TestCase
$hostCollection->add('r1', (new Route('abc{foo}'))->setHost('{foo}.exampple.com'));
$hostCollection->add('r2', (new Route('abc{foo}'))->setHost('{foo}.exampple.com'));
return array(
array(new RouteCollection(), 'url_matcher0.php', array()),
array($collection, 'url_matcher1.php', array()),
array($redirectCollection, 'url_matcher2.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
array($rootprefixCollection, 'url_matcher3.php', array()),
array($headMatchCasesCollection, 'url_matcher4.php', array()),
array($groupOptimisedCollection, 'url_matcher5.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
array($trailingSlashCollection, 'url_matcher6.php', array()),
array($trailingSlashCollection, 'url_matcher7.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
array($unicodeCollection, 'url_matcher8.php', array()),
array($hostTreeCollection, 'url_matcher9.php', array()),
array($chunkedCollection, 'url_matcher10.php', array()),
array($demoCollection, 'url_matcher11.php', array('base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher')),
array($suffixCollection, 'url_matcher12.php', array()),
array($hostCollection, 'url_matcher13.php', array()),
);
return [
[new RouteCollection(), 'url_matcher0.php', []],
[$collection, 'url_matcher1.php', []],
[$redirectCollection, 'url_matcher2.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
[$rootprefixCollection, 'url_matcher3.php', []],
[$headMatchCasesCollection, 'url_matcher4.php', []],
[$groupOptimisedCollection, 'url_matcher5.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
[$trailingSlashCollection, 'url_matcher6.php', []],
[$trailingSlashCollection, 'url_matcher7.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
[$unicodeCollection, 'url_matcher8.php', []],
[$hostTreeCollection, 'url_matcher9.php', []],
[$chunkedCollection, 'url_matcher10.php', []],
[$demoCollection, 'url_matcher11.php', ['base_class' => 'Symfony\Component\Routing\Tests\Fixtures\RedirectableUrlMatcher']],
[$suffixCollection, 'url_matcher12.php', []],
[$hostCollection, 'url_matcher13.php', []],
];
}
private function generateDumpedMatcher(RouteCollection $collection, $redirectableStub = false)
{
$options = array('class' => $this->matcherClass);
$options = ['class' => $this->matcherClass];
if ($redirectableStub) {
$options['base_class'] = '\Symfony\Component\Routing\Tests\Matcher\Dumper\RedirectableUrlMatcherStub';
@@ -496,7 +496,7 @@ class PhpMatcherDumperTest extends TestCase
public function testGenerateDumperMatcherWithObject()
{
$routeCollection = new RouteCollection();
$routeCollection->add('_', new Route('/', array(new \stdClass())));
$routeCollection->add('_', new Route('/', [new \stdClass()]));
$dumper = new PhpMatcherDumper($routeCollection);
$dumper->dump();
}

138
vendor/symfony/routing/Tests/Matcher/Dumper/StaticPrefixCollectionTest.php vendored
View File

@@ -18,7 +18,7 @@ class StaticPrefixCollectionTest extends TestCase
foreach ($routes as $route) {
list($path, $name) = $route;
$staticPrefix = (new Route($path))->compile()->getStaticPrefix();
$collection->addRoute($staticPrefix, array($name));
$collection->addRoute($staticPrefix, [$name]);
}
$dumped = $this->dumpCollection($collection);
@@ -27,52 +27,52 @@ class StaticPrefixCollectionTest extends TestCase
public function routeProvider()
{
return array(
'Simple - not nested' => array(
array(
array('/', 'root'),
array('/prefix/segment/', 'prefix_segment'),
array('/leading/segment/', 'leading_segment'),
),
return [
'Simple - not nested' => [
[
['/', 'root'],
['/prefix/segment/', 'prefix_segment'],
['/leading/segment/', 'leading_segment'],
],
<<<EOF
root
prefix_segment
leading_segment
EOF
),
'Nested - small group' => array(
array(
array('/', 'root'),
array('/prefix/segment/aa', 'prefix_segment'),
array('/prefix/segment/bb', 'leading_segment'),
),
],
'Nested - small group' => [
[
['/', 'root'],
['/prefix/segment/aa', 'prefix_segment'],
['/prefix/segment/bb', 'leading_segment'],
],
<<<EOF
root
/prefix/segment/
-> prefix_segment
-> leading_segment
EOF
),
'Nested - contains item at intersection' => array(
array(
array('/', 'root'),
array('/prefix/segment/', 'prefix_segment'),
array('/prefix/segment/bb', 'leading_segment'),
),
],
'Nested - contains item at intersection' => [
[
['/', 'root'],
['/prefix/segment/', 'prefix_segment'],
['/prefix/segment/bb', 'leading_segment'],
],
<<<EOF
root
/prefix/segment/
-> prefix_segment
-> leading_segment
EOF
),
'Simple one level nesting' => array(
array(
array('/', 'root'),
array('/group/segment/', 'nested_segment'),
array('/group/thing/', 'some_segment'),
array('/group/other/', 'other_segment'),
),
],
'Simple one level nesting' => [
[
['/', 'root'],
['/group/segment/', 'nested_segment'],
['/group/thing/', 'some_segment'],
['/group/other/', 'other_segment'],
],
<<<EOF
root
/group/
@@ -80,17 +80,17 @@ root
-> some_segment
-> other_segment
EOF
),
'Retain matching order with groups' => array(
array(
array('/group/aa/', 'aa'),
array('/group/bb/', 'bb'),
array('/group/cc/', 'cc'),
array('/(.*)', 'root'),
array('/group/dd/', 'dd'),
array('/group/ee/', 'ee'),
array('/group/ff/', 'ff'),
),
],
'Retain matching order with groups' => [
[
['/group/aa/', 'aa'],
['/group/bb/', 'bb'],
['/group/cc/', 'cc'],
['/(.*)', 'root'],
['/group/dd/', 'dd'],
['/group/ee/', 'ee'],
['/group/ff/', 'ff'],
],
<<<EOF
/group/
-> aa
@@ -102,21 +102,21 @@ root
-> ee
-> ff
EOF
),
'Retain complex matching order with groups at base' => array(
array(
array('/aaa/111/', 'first_aaa'),
array('/prefixed/group/aa/', 'aa'),
array('/prefixed/group/bb/', 'bb'),
array('/prefixed/group/cc/', 'cc'),
array('/prefixed/(.*)', 'root'),
array('/prefixed/group/dd/', 'dd'),
array('/prefixed/group/ee/', 'ee'),
array('/prefixed/', 'parent'),
array('/prefixed/group/ff/', 'ff'),
array('/aaa/222/', 'second_aaa'),
array('/aaa/333/', 'third_aaa'),
),
],
'Retain complex matching order with groups at base' => [
[
['/aaa/111/', 'first_aaa'],
['/prefixed/group/aa/', 'aa'],
['/prefixed/group/bb/', 'bb'],
['/prefixed/group/cc/', 'cc'],
['/prefixed/(.*)', 'root'],
['/prefixed/group/dd/', 'dd'],
['/prefixed/group/ee/', 'ee'],
['/prefixed/', 'parent'],
['/prefixed/group/ff/', 'ff'],
['/aaa/222/', 'second_aaa'],
['/aaa/333/', 'third_aaa'],
],
<<<EOF
/aaa/
-> first_aaa
@@ -134,17 +134,17 @@ EOF
-> -> ff
-> parent
EOF
),
],
'Group regardless of segments' => array(
array(
array('/aaa-111/', 'a1'),
array('/aaa-222/', 'a2'),
array('/aaa-333/', 'a3'),
array('/group-aa/', 'g1'),
array('/group-bb/', 'g2'),
array('/group-cc/', 'g3'),
),
'Group regardless of segments' => [
[
['/aaa-111/', 'a1'],
['/aaa-222/', 'a2'],
['/aaa-333/', 'a3'],
['/group-aa/', 'g1'],
['/group-bb/', 'g2'],
['/group-cc/', 'g3'],
],
<<<EOF
/aaa-
-> a1
@@ -155,13 +155,13 @@ EOF
-> g2
-> g3
EOF
),
);
],
];
}
private function dumpCollection(StaticPrefixCollection $collection, $prefix = '')
{
$lines = array();
$lines = [];
foreach ($collection->getRoutes() as $item) {
if ($item instanceof StaticPrefixCollection) {

80
vendor/symfony/routing/Tests/Matcher/RedirectableUrlMatcherTest.php vendored
View File

@@ -23,7 +23,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
$coll->add('foo', new Route('/foo/'));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->will($this->returnValue(array()));
$matcher->expects($this->once())->method('redirect')->will($this->returnValue([]));
$matcher->match('/foo');
}
@@ -33,7 +33,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
$coll->add('foo', new Route('/foo'));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->will($this->returnValue(array()));
$matcher->expects($this->once())->method('redirect')->will($this->returnValue([]));
$matcher->match('/foo/');
}
@@ -54,14 +54,14 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
public function testSchemeRedirectRedirectsToFirstScheme()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('FTP', 'HTTPS')));
$coll->add('foo', new Route('/foo', [], [], [], '', ['FTP', 'HTTPS']));
$matcher = $this->getUrlMatcher($coll);
$matcher
->expects($this->once())
->method('redirect')
->with('/foo', 'foo', 'ftp')
->will($this->returnValue(array('_route' => 'foo')))
->will($this->returnValue(['_route' => 'foo']))
;
$matcher->match('/foo');
}
@@ -69,7 +69,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http')));
$coll->add('foo', new Route('/foo', [], [], [], '', ['https', 'http']));
$matcher = $this->getUrlMatcher($coll);
$matcher
@@ -81,30 +81,30 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
public function testSchemeRedirectWithParams()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/{bar}', array(), array(), array(), '', array('https')));
$coll->add('foo', new Route('/foo/{bar}', [], [], [], '', ['https']));
$matcher = $this->getUrlMatcher($coll);
$matcher
->expects($this->once())
->method('redirect')
->with('/foo/baz', 'foo', 'https')
->will($this->returnValue(array('redirect' => 'value')))
->will($this->returnValue(['redirect' => 'value']))
;
$this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
$this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
}
public function testSchemeRedirectForRoot()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/', array(), array(), array(), '', array('https')));
$coll->add('foo', new Route('/', [], [], [], '', ['https']));
$matcher = $this->getUrlMatcher($coll);
$matcher
->expects($this->once())
->method('redirect')
->with('/', 'foo', 'https')
->will($this->returnValue(array('redirect' => 'value')));
$this->assertEquals(array('_route' => 'foo', 'redirect' => 'value'), $matcher->match('/'));
->will($this->returnValue(['redirect' => 'value']));
$this->assertEquals(['_route' => 'foo', 'redirect' => 'value'], $matcher->match('/'));
}
public function testSlashRedirectWithParams()
@@ -117,9 +117,9 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
->expects($this->once())
->method('redirect')
->with('/foo/baz/', 'foo', null)
->will($this->returnValue(array('redirect' => 'value')))
->will($this->returnValue(['redirect' => 'value']))
;
$this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'), $matcher->match('/foo/baz'));
$this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'redirect' => 'value'], $matcher->match('/foo/baz'));
}
public function testRedirectPreservesUrlEncoding()
@@ -128,17 +128,17 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
$coll->add('foo', new Route('/foo:bar/'));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn(array());
$matcher->expects($this->once())->method('redirect')->with('/foo%3Abar/')->willReturn([]);
$matcher->match('/foo%3Abar');
}
public function testSchemeRequirement()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
$coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
$matcher = $this->getUrlMatcher($coll, new RequestContext());
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn(array());
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo', 'https')->willReturn([]);
$this->assertSame(['_route' => 'foo'], $matcher->match('/foo'));
}
public function testFallbackPage()
@@ -148,47 +148,69 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
$coll->add('bar', new Route('/{name}'));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/foo/', 'foo')->will($this->returnValue(array('_route' => 'foo')));
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo'));
$matcher->expects($this->once())->method('redirect')->with('/foo/', 'foo')->will($this->returnValue(['_route' => 'foo']));
$this->assertSame(['_route' => 'foo'], $matcher->match('/foo'));
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo'));
$coll->add('bar', new Route('/{name}/'));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo')->will($this->returnValue(array('_route' => 'foo')));
$this->assertSame(array('_route' => 'foo'), $matcher->match('/foo/'));
$matcher->expects($this->once())->method('redirect')->with('/foo', 'foo')->will($this->returnValue(['_route' => 'foo']));
$this->assertSame(['_route' => 'foo'], $matcher->match('/foo/'));
}
public function testMissingTrailingSlashAndScheme()
{
$coll = new RouteCollection();
$coll->add('foo', (new Route('/foo/'))->setSchemes(array('https')));
$coll->add('foo', (new Route('/foo/'))->setSchemes(['https']));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/foo/', 'foo', 'https')->will($this->returnValue(array()));
$matcher->expects($this->once())->method('redirect')->with('/foo/', 'foo', 'https')->will($this->returnValue([]));
$matcher->match('/foo');
}
public function testSlashAndVerbPrecedenceWithRedirection()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('post')));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('get')));
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['post']));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['get']));
$matcher = $this->getUrlMatcher($coll);
$expected = array(
$expected = [
'_route' => 'b',
'customerId' => '123',
);
];
$this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons/'));
$matcher->expects($this->once())->method('redirect')->with('/api/customers/123/contactpersons/')->willReturn(array());
$matcher->expects($this->once())->method('redirect')->with('/api/customers/123/contactpersons/')->willReturn([]);
$this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
}
public function testNonGreedyTrailingRequirement()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{a}', [], ['a' => '\d+']));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/123')->willReturn([]);
$this->assertEquals(['_route' => 'a', 'a' => '123'], $matcher->match('/123/'));
}
public function testTrailingRequirementWithDefault_A()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+']));
$matcher = $this->getUrlMatcher($coll);
$matcher->expects($this->once())->method('redirect')->with('/fr-fr')->willReturn([]);
$this->assertEquals(['_route' => 'a', 'a' => 'aaa'], $matcher->match('/fr-fr/'));
}
protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
{
return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', array($routes, $context ?: new RequestContext()));
return $this->getMockForAbstractClass('Symfony\Component\Routing\Matcher\RedirectableUrlMatcher', [$routes, $context ?: new RequestContext()]);
}
}

48
vendor/symfony/routing/Tests/Matcher/TraceableUrlMatcherTest.php vendored
View File

@@ -23,41 +23,41 @@ class TraceableUrlMatcherTest extends TestCase
public function test()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('POST')));
$coll->add('bar', new Route('/bar/{id}', array(), array('id' => '\d+')));
$coll->add('bar1', new Route('/bar/{name}', array(), array('id' => '\w+'), array(), '', array(), array('POST')));
$coll->add('bar2', new Route('/foo', array(), array(), array(), 'baz'));
$coll->add('bar3', new Route('/foo1', array(), array(), array(), 'baz'));
$coll->add('bar4', new Route('/foo2', array(), array(), array(), 'baz', array(), array(), 'context.getMethod() == "GET"'));
$coll->add('foo', new Route('/foo', [], [], [], '', [], ['POST']));
$coll->add('bar', new Route('/bar/{id}', [], ['id' => '\d+']));
$coll->add('bar1', new Route('/bar/{name}', [], ['id' => '\w+'], [], '', [], ['POST']));
$coll->add('bar2', new Route('/foo', [], [], [], 'baz'));
$coll->add('bar3', new Route('/foo1', [], [], [], 'baz'));
$coll->add('bar4', new Route('/foo2', [], [], [], 'baz', [], [], 'context.getMethod() == "GET"'));
$context = new RequestContext();
$context->setHost('baz');
$matcher = new TraceableUrlMatcher($coll, $context);
$traces = $matcher->getTraces('/babar');
$this->assertSame(array(0, 0, 0, 0, 0, 0), $this->getLevels($traces));
$this->assertSame([0, 0, 0, 0, 0, 0], $this->getLevels($traces));
$traces = $matcher->getTraces('/foo');
$this->assertSame(array(1, 0, 0, 2), $this->getLevels($traces));
$this->assertSame([1, 0, 0, 2], $this->getLevels($traces));
$traces = $matcher->getTraces('/bar/12');
$this->assertSame(array(0, 2), $this->getLevels($traces));
$this->assertSame([0, 2], $this->getLevels($traces));
$traces = $matcher->getTraces('/bar/dd');
$this->assertSame(array(0, 1, 1, 0, 0, 0), $this->getLevels($traces));
$this->assertSame([0, 1, 1, 0, 0, 0], $this->getLevels($traces));
$traces = $matcher->getTraces('/foo1');
$this->assertSame(array(0, 0, 0, 0, 2), $this->getLevels($traces));
$this->assertSame([0, 0, 0, 0, 2], $this->getLevels($traces));
$context->setMethod('POST');
$traces = $matcher->getTraces('/foo');
$this->assertSame(array(2), $this->getLevels($traces));
$this->assertSame([2], $this->getLevels($traces));
$traces = $matcher->getTraces('/bar/dd');
$this->assertSame(array(0, 1, 2), $this->getLevels($traces));
$this->assertSame([0, 1, 2], $this->getLevels($traces));
$traces = $matcher->getTraces('/foo2');
$this->assertSame(array(0, 0, 0, 0, 0, 1), $this->getLevels($traces));
$this->assertSame([0, 0, 0, 0, 0, 1], $this->getLevels($traces));
}
public function testMatchRouteOnMultipleHosts()
@@ -65,17 +65,17 @@ class TraceableUrlMatcherTest extends TestCase
$routes = new RouteCollection();
$routes->add('first', new Route(
'/mypath/',
array('_controller' => 'MainBundle:Info:first'),
array(),
array(),
['_controller' => 'MainBundle:Info:first'],
[],
[],
'some.example.com'
));
$routes->add('second', new Route(
'/mypath/',
array('_controller' => 'MainBundle:Info:second'),
array(),
array(),
['_controller' => 'MainBundle:Info:second'],
[],
[],
'another.example.com'
));
@@ -86,14 +86,14 @@ class TraceableUrlMatcherTest extends TestCase
$traces = $matcher->getTraces('/mypath/');
$this->assertSame(
array(TraceableUrlMatcher::ROUTE_ALMOST_MATCHES, TraceableUrlMatcher::ROUTE_ALMOST_MATCHES),
[TraceableUrlMatcher::ROUTE_ALMOST_MATCHES, TraceableUrlMatcher::ROUTE_ALMOST_MATCHES],
$this->getLevels($traces)
);
}
public function getLevels($traces)
{
$levels = array();
$levels = [];
foreach ($traces as $trace) {
$levels[] = $trace['level'];
}
@@ -104,7 +104,7 @@ class TraceableUrlMatcherTest extends TestCase
public function testRoutesWithConditions()
{
$routes = new RouteCollection();
$routes->add('foo', new Route('/foo', array(), array(), array(), 'baz', array(), array(), "request.headers.get('User-Agent') matches '/firefox/i'"));
$routes->add('foo', new Route('/foo', [], [], [], 'baz', [], [], "request.headers.get('User-Agent') matches '/firefox/i'"));
$context = new RequestContext();
$context->setHost('baz');
@@ -115,7 +115,7 @@ class TraceableUrlMatcherTest extends TestCase
$traces = $matcher->getTracesForRequest($notMatchingRequest);
$this->assertEquals("Condition \"request.headers.get('User-Agent') matches '/firefox/i'\" does not evaluate to \"true\"", $traces[0]['log']);
$matchingRequest = Request::create('/foo', 'GET', array(), array(), array(), array('HTTP_USER_AGENT' => 'Firefox'));
$matchingRequest = Request::create('/foo', 'GET', [], [], [], ['HTTP_USER_AGENT' => 'Firefox']);
$traces = $matcher->getTracesForRequest($matchingRequest);
$this->assertEquals('Route matches!', $traces[0]['log']);
}

409
vendor/symfony/routing/Tests/Matcher/UrlMatcherTest.php vendored
View File

@@ -33,7 +33,7 @@ class UrlMatcherTest extends TestCase
public function testMethodNotAllowed()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('post')));
$coll->add('foo', new Route('/foo', [], [], [], '', [], ['post']));
$matcher = $this->getUrlMatcher($coll);
@@ -41,14 +41,14 @@ class UrlMatcherTest extends TestCase
$matcher->match('/foo');
$this->fail();
} catch (MethodNotAllowedException $e) {
$this->assertEquals(array('POST'), $e->getAllowedMethods());
$this->assertEquals(['POST'], $e->getAllowedMethods());
}
}
public function testMethodNotAllowedOnRoot()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/', array(), array(), array(), '', array(), array('GET')));
$coll->add('foo', new Route('/', [], [], [], '', [], ['GET']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
@@ -56,14 +56,14 @@ class UrlMatcherTest extends TestCase
$matcher->match('/');
$this->fail();
} catch (MethodNotAllowedException $e) {
$this->assertEquals(array('GET'), $e->getAllowedMethods());
$this->assertEquals(['GET'], $e->getAllowedMethods());
}
}
public function testHeadAllowedWhenRequirementContainsGet()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get')));
$coll->add('foo', new Route('/foo', [], [], [], '', [], ['get']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'head'));
$this->assertInternalType('array', $matcher->match('/foo'));
@@ -72,8 +72,8 @@ class UrlMatcherTest extends TestCase
public function testMethodNotAllowedAggregatesAllowedMethods()
{
$coll = new RouteCollection();
$coll->add('foo1', new Route('/foo', array(), array(), array(), '', array(), array('post')));
$coll->add('foo2', new Route('/foo', array(), array(), array(), '', array(), array('put', 'delete')));
$coll->add('foo1', new Route('/foo', [], [], [], '', [], ['post']));
$coll->add('foo2', new Route('/foo', [], [], [], '', [], ['put', 'delete']));
$matcher = $this->getUrlMatcher($coll);
@@ -81,13 +81,12 @@ class UrlMatcherTest extends TestCase
$matcher->match('/foo');
$this->fail();
} catch (MethodNotAllowedException $e) {
$this->assertEquals(array('POST', 'PUT', 'DELETE'), $e->getAllowedMethods());
$this->assertEquals(['POST', 'PUT', 'DELETE'], $e->getAllowedMethods());
}
}
public function testMatch()
public function testPatternMatchAndParameterReturn()
{
// test the patterns are matched and parameters are returned
$collection = new RouteCollection();
$collection->add('foo', new Route('/foo/{bar}'));
$matcher = $this->getUrlMatcher($collection);
@@ -96,17 +95,24 @@ class UrlMatcherTest extends TestCase
$this->fail();
} catch (ResourceNotFoundException $e) {
}
$this->assertEquals(array('_route' => 'foo', 'bar' => 'baz'), $matcher->match('/foo/baz'));
$this->assertEquals(['_route' => 'foo', 'bar' => 'baz'], $matcher->match('/foo/baz'));
}
public function testDefaultsAreMerged()
{
// test that defaults are merged
$collection = new RouteCollection();
$collection->add('foo', new Route('/foo/{bar}', array('def' => 'test')));
$collection->add('foo', new Route('/foo/{bar}', ['def' => 'test']));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'foo', 'bar' => 'baz', 'def' => 'test'), $matcher->match('/foo/baz'));
$this->assertEquals(['_route' => 'foo', 'bar' => 'baz', 'def' => 'test'], $matcher->match('/foo/baz'));
}
public function testMethodIsIgnoredIfNoMethodGiven()
{
// test that route "method" is ignored if no method is given in the context
$collection = new RouteCollection();
$collection->add('foo', new Route('/foo', array(), array(), array(), '', array(), array('get', 'head')));
$collection->add('foo', new Route('/foo', [], [], [], '', [], ['get', 'head']));
$matcher = $this->getUrlMatcher($collection);
$this->assertInternalType('array', $matcher->match('/foo'));
@@ -123,27 +129,31 @@ class UrlMatcherTest extends TestCase
$this->assertInternalType('array', $matcher->match('/foo'));
$matcher = $this->getUrlMatcher($collection, new RequestContext('', 'head'));
$this->assertInternalType('array', $matcher->match('/foo'));
}
// route with an optional variable as the first segment
public function testRouteWithOptionalVariableAsFirstSegment()
{
$collection = new RouteCollection();
$collection->add('bar', new Route('/{bar}/foo', array('bar' => 'bar'), array('bar' => 'foo|bar')));
$collection->add('bar', new Route('/{bar}/foo', ['bar' => 'bar'], ['bar' => 'foo|bar']));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/bar/foo'));
$this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo/foo'));
$this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/bar/foo'));
$this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo/foo'));
$collection = new RouteCollection();
$collection->add('bar', new Route('/{bar}', array('bar' => 'bar'), array('bar' => 'foo|bar')));
$collection->add('bar', new Route('/{bar}', ['bar' => 'bar'], ['bar' => 'foo|bar']));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'bar', 'bar' => 'foo'), $matcher->match('/foo'));
$this->assertEquals(array('_route' => 'bar', 'bar' => 'bar'), $matcher->match('/'));
$this->assertEquals(['_route' => 'bar', 'bar' => 'foo'], $matcher->match('/foo'));
$this->assertEquals(['_route' => 'bar', 'bar' => 'bar'], $matcher->match('/'));
}
// route with only optional variables
public function testRouteWithOnlyOptionalVariables()
{
$collection = new RouteCollection();
$collection->add('bar', new Route('/{foo}/{bar}', array('foo' => 'foo', 'bar' => 'bar'), array()));
$collection->add('bar', new Route('/{foo}/{bar}', ['foo' => 'foo', 'bar' => 'bar'], []));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'), $matcher->match('/'));
$this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'), $matcher->match('/a'));
$this->assertEquals(array('_route' => 'bar', 'foo' => 'a', 'bar' => 'b'), $matcher->match('/a/b'));
$this->assertEquals(['_route' => 'bar', 'foo' => 'foo', 'bar' => 'bar'], $matcher->match('/'));
$this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'bar'], $matcher->match('/a'));
$this->assertEquals(['_route' => 'bar', 'foo' => 'a', 'bar' => 'b'], $matcher->match('/a/b'));
}
public function testMatchWithPrefixes()
@@ -154,7 +164,7 @@ class UrlMatcherTest extends TestCase
$collection->addPrefix('/a');
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'foo', 'foo' => 'foo'), $matcher->match('/a/b/foo'));
$this->assertEquals(['_route' => 'foo', 'foo' => 'foo'], $matcher->match('/a/b/foo'));
}
public function testMatchWithDynamicPrefix()
@@ -165,7 +175,7 @@ class UrlMatcherTest extends TestCase
$collection->addPrefix('/{_locale}');
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'), $matcher->match('/fr/b/foo'));
$this->assertEquals(['_locale' => 'fr', '_route' => 'foo', 'foo' => 'foo'], $matcher->match('/fr/b/foo'));
}
public function testMatchSpecialRouteName()
@@ -174,7 +184,7 @@ class UrlMatcherTest extends TestCase
$collection->add('$péß^a|', new Route('/bar'));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => '$péß^a|'), $matcher->match('/bar'));
$this->assertEquals(['_route' => '$péß^a|'], $matcher->match('/bar'));
}
/**
@@ -193,20 +203,20 @@ class UrlMatcherTest extends TestCase
{
$collection = new RouteCollection();
$chars = '!"$%éà &\'()*+,./:;<=>@ABCDEFGHIJKLMNOPQRSTUVWXYZ\\[]^_`abcdefghijklmnopqrstuvwxyz{|}~-';
$collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '['.preg_quote($chars).']+'), array('utf8' => true)));
$collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '['.preg_quote($chars).']+'], ['utf8' => true]));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.rawurlencode($chars).'/bar'));
$this->assertEquals(array('_route' => 'foo', 'foo' => $chars), $matcher->match('/'.strtr($chars, array('%' => '%25')).'/bar'));
$this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.rawurlencode($chars).'/bar'));
$this->assertEquals(['_route' => 'foo', 'foo' => $chars], $matcher->match('/'.strtr($chars, ['%' => '%25']).'/bar'));
}
public function testMatchWithDotMetacharacterInRequirements()
{
$collection = new RouteCollection();
$collection->add('foo', new Route('/{foo}/bar', array(), array('foo' => '.+')));
$collection->add('foo', new Route('/{foo}/bar', [], ['foo' => '.+']));
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'foo', 'foo' => "\n"), $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched');
$this->assertEquals(['_route' => 'foo', 'foo' => "\n"], $matcher->match('/'.urlencode("\n").'/bar'), 'linefeed character is matched');
}
public function testMatchOverriddenRoute()
@@ -221,9 +231,9 @@ class UrlMatcherTest extends TestCase
$matcher = $this->getUrlMatcher($collection);
$this->assertEquals(array('_route' => 'foo'), $matcher->match('/foo1'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo1'));
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$this->assertEquals(array(), $matcher->match('/foo'));
$this->assertEquals([], $matcher->match('/foo'));
}
public function testMatchRegression()
@@ -233,7 +243,7 @@ class UrlMatcherTest extends TestCase
$coll->add('bar', new Route('/foo/bar/{foo}'));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('foo' => 'bar', '_route' => 'bar'), $matcher->match('/foo/bar/bar'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/foo/bar/bar'));
$collection = new RouteCollection();
$collection->add('foo', new Route('/{bar}'));
@@ -260,36 +270,36 @@ class UrlMatcherTest extends TestCase
public function testDefaultRequirementForOptionalVariables()
{
$coll = new RouteCollection();
$coll->add('test', new Route('/{page}.{_format}', array('page' => 'index', '_format' => 'html')));
$coll->add('test', new Route('/{page}.{_format}', ['page' => 'index', '_format' => 'html']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('page' => 'my-page', '_format' => 'xml', '_route' => 'test'), $matcher->match('/my-page.xml'));
$this->assertEquals(['page' => 'my-page', '_format' => 'xml', '_route' => 'test'], $matcher->match('/my-page.xml'));
}
public function testMatchingIsEager()
{
$coll = new RouteCollection();
$coll->add('test', new Route('/{foo}-{bar}-', array(), array('foo' => '.+', 'bar' => '.+')));
$coll->add('test', new Route('/{foo}-{bar}-', [], ['foo' => '.+', 'bar' => '.+']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'), $matcher->match('/text1-text2-text3-text4-'));
$this->assertEquals(['foo' => 'text1-text2-text3', 'bar' => 'text4', '_route' => 'test'], $matcher->match('/text1-text2-text3-text4-'));
}
public function testAdjacentVariables()
{
$coll = new RouteCollection();
$coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', array('z' => 'default-z', '_format' => 'html'), array('y' => 'y|Y')));
$coll->add('test', new Route('/{w}{x}{y}{z}.{_format}', ['z' => 'default-z', '_format' => 'html'], ['y' => 'y|Y']));
$matcher = $this->getUrlMatcher($coll);
// 'w' eagerly matches as much as possible and the other variables match the remaining chars.
// This also shows that the variables w-z must all exclude the separating char (the dot '.' in this case) by default requirement.
// Otherwise they would also consume '.xml' and _format would never match as it's an optional variable.
$this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'), $matcher->match('/wwwwwxYZ.xml'));
$this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'Y', 'z' => 'Z', '_format' => 'xml', '_route' => 'test'], $matcher->match('/wwwwwxYZ.xml'));
// As 'y' has custom requirement and can only be of value 'y|Y', it will leave 'ZZZ' to variable z.
// So with carefully chosen requirements adjacent variables, can be useful.
$this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxyZZZ'));
$this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'ZZZ', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxyZZZ'));
// z and _format are optional.
$this->assertEquals(array('w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'), $matcher->match('/wwwwwxy'));
$this->assertEquals(['w' => 'wwwww', 'x' => 'x', 'y' => 'y', 'z' => 'default-z', '_format' => 'html', '_route' => 'test'], $matcher->match('/wwwwwxy'));
$this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Routing\Exception\ResourceNotFoundException');
$matcher->match('/wxy.html');
@@ -298,11 +308,11 @@ class UrlMatcherTest extends TestCase
public function testOptionalVariableWithNoRealSeparator()
{
$coll = new RouteCollection();
$coll->add('test', new Route('/get{what}', array('what' => 'All')));
$coll->add('test', new Route('/get{what}', ['what' => 'All']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('what' => 'All', '_route' => 'test'), $matcher->match('/get'));
$this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSites'));
$this->assertEquals(['what' => 'All', '_route' => 'test'], $matcher->match('/get'));
$this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSites'));
// Usually the character in front of an optional parameter can be left out, e.g. with pattern '/get/{what}' just '/get' would match.
// But here the 't' in 'get' is not a separating character, so it makes no sense to match without it.
@@ -316,7 +326,7 @@ class UrlMatcherTest extends TestCase
$coll->add('test', new Route('/get{what}Suffix'));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('what' => 'Sites', '_route' => 'test'), $matcher->match('/getSitesSuffix'));
$this->assertEquals(['what' => 'Sites', '_route' => 'test'], $matcher->match('/getSitesSuffix'));
}
public function testDefaultRequirementOfVariable()
@@ -325,7 +335,7 @@ class UrlMatcherTest extends TestCase
$coll->add('test', new Route('/{page}.{_format}'));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('page' => 'index', '_format' => 'mobile.html', '_route' => 'test'), $matcher->match('/index.mobile.html'));
$this->assertEquals(['page' => 'index', '_format' => 'mobile.html', '_route' => 'test'], $matcher->match('/index.mobile.html'));
}
/**
@@ -346,7 +356,7 @@ class UrlMatcherTest extends TestCase
public function testDefaultRequirementOfVariableDisallowsNextSeparator()
{
$coll = new RouteCollection();
$coll->add('test', new Route('/{page}.{_format}', array(), array('_format' => 'html|xml')));
$coll->add('test', new Route('/{page}.{_format}', [], ['_format' => 'html|xml']));
$matcher = $this->getUrlMatcher($coll);
$matcher->match('/do.t.html');
@@ -410,7 +420,7 @@ class UrlMatcherTest extends TestCase
public function testSchemeRequirement()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
$coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
$matcher = $this->getUrlMatcher($coll);
$matcher->match('/foo');
}
@@ -421,7 +431,7 @@ class UrlMatcherTest extends TestCase
public function testSchemeRequirementForNonSafeMethod()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https')));
$coll->add('foo', new Route('/foo', [], [], [], '', ['https']));
$context = new RequestContext();
$context->setMethod('POST');
@@ -432,10 +442,10 @@ class UrlMatcherTest extends TestCase
public function testSamePathWithDifferentScheme()
{
$coll = new RouteCollection();
$coll->add('https_route', new Route('/', array(), array(), array(), '', array('https')));
$coll->add('http_route', new Route('/', array(), array(), array(), '', array('http')));
$coll->add('https_route', new Route('/', [], [], [], '', ['https']));
$coll->add('http_route', new Route('/', [], [], [], '', ['http']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'http_route'), $matcher->match('/'));
$this->assertEquals(['_route' => 'http_route'], $matcher->match('/'));
}
/**
@@ -461,7 +471,7 @@ class UrlMatcherTest extends TestCase
$route->setCondition('request.getBaseUrl() == "/sub/front.php" and request.getPathInfo() == "/foo/bar"');
$coll->add('foo', $route);
$matcher = $this->getUrlMatcher($coll, new RequestContext('/sub/front.php'));
$this->assertEquals(array('bar' => 'bar', '_route' => 'foo'), $matcher->match('/foo/bar'));
$this->assertEquals(['bar' => 'bar', '_route' => 'foo'], $matcher->match('/foo/bar'));
}
public function testDecodeOnce()
@@ -470,7 +480,7 @@ class UrlMatcherTest extends TestCase
$coll->add('foo', new Route('/foo/{foo}'));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('foo' => 'bar%23', '_route' => 'foo'), $matcher->match('/foo/bar%2523'));
$this->assertEquals(['foo' => 'bar%23', '_route' => 'foo'], $matcher->match('/foo/bar%2523'));
}
public function testCannotRelyOnPrefix()
@@ -486,30 +496,165 @@ class UrlMatcherTest extends TestCase
$coll->addCollection($subColl);
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'bar'), $matcher->match('/new'));
$this->assertEquals(['_route' => 'bar'], $matcher->match('/new'));
}
public function testWithHost()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com'));
$coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
$this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
}
public function testWithHostOnRouteCollection()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/{foo}'));
$coll->add('bar', new Route('/bar/{foo}', array(), array(), array(), '{locale}.example.net'));
$coll->add('bar', new Route('/bar/{foo}', [], [], [], '{locale}.example.net'));
$coll->setHost('{locale}.example.com');
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
$this->assertEquals(array('foo' => 'bar', '_route' => 'foo', 'locale' => 'en'), $matcher->match('/foo/bar'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo', 'locale' => 'en'], $matcher->match('/foo/bar'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
$this->assertEquals(array('foo' => 'bar', '_route' => 'bar', 'locale' => 'en'), $matcher->match('/bar/bar'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar', 'locale' => 'en'], $matcher->match('/bar/bar'));
}
public function testVariationInTrailingSlashWithHosts()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com'));
$coll->add('bar', new Route('/foo', [], [], [], 'bar.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com'));
$this->assertEquals(['_route' => 'bar'], $matcher->match('/foo'));
}
public function testVariationInTrailingSlashWithHostsInReverse()
{
// The order should not matter
$coll = new RouteCollection();
$coll->add('bar', new Route('/foo', [], [], [], 'bar.example.com'));
$coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com'));
$this->assertEquals(['_route' => 'bar'], $matcher->match('/foo'));
}
public function testVariationInTrailingSlashWithHostsAndVariable()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/{foo}/', [], [], [], 'foo.example.com'));
$coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
}
public function testVariationInTrailingSlashWithHostsAndVariableInReverse()
{
// The order should not matter
$coll = new RouteCollection();
$coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com'));
$coll->add('foo', new Route('/{foo}/', [], [], [], 'foo.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
}
public function testVariationInTrailingSlashWithMethods()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST']));
$coll->add('bar', new Route('/foo', [], [], [], '', [], ['GET']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET'));
$this->assertEquals(['_route' => 'bar'], $matcher->match('/foo'));
}
public function testVariationInTrailingSlashWithMethodsInReverse()
{
// The order should not matter
$coll = new RouteCollection();
$coll->add('bar', new Route('/foo', [], [], [], '', [], ['GET']));
$coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET'));
$this->assertEquals(['_route' => 'bar'], $matcher->match('/foo'));
}
public function testVariableVariationInTrailingSlashWithMethods()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/{foo}/', [], [], [], '', [], ['POST']));
$coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
}
public function testVariableVariationInTrailingSlashWithMethodsInReverse()
{
// The order should not matter
$coll = new RouteCollection();
$coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET']));
$coll->add('foo', new Route('/{foo}/', [], [], [], '', [], ['POST']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$this->assertEquals(['foo' => 'bar', '_route' => 'foo'], $matcher->match('/bar/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
}
public function testMixOfStaticAndVariableVariationInTrailingSlashWithHosts()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/', [], [], [], 'foo.example.com'));
$coll->add('bar', new Route('/{foo}', [], [], [], 'bar.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo.example.com'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'bar.example.com'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
}
public function testMixOfStaticAndVariableVariationInTrailingSlashWithMethods()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/', [], [], [], '', [], ['POST']));
$coll->add('bar', new Route('/{foo}', [], [], [], '', [], ['GET']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$this->assertEquals(['_route' => 'foo'], $matcher->match('/foo/'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET'));
$this->assertEquals(['foo' => 'bar', '_route' => 'bar'], $matcher->match('/bar'));
$this->assertEquals(['foo' => 'foo', '_route' => 'bar'], $matcher->match('/foo'));
}
/**
@@ -518,7 +663,7 @@ class UrlMatcherTest extends TestCase
public function testWithOutHostHostDoesNotMatch()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/foo/{foo}', array(), array(), array(), '{locale}.example.com'));
$coll->add('foo', new Route('/foo/{foo}', [], [], [], '{locale}.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'example.com'));
$matcher->match('/foo/bar');
@@ -530,7 +675,7 @@ class UrlMatcherTest extends TestCase
public function testPathIsCaseSensitive()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/locale', array(), array('locale' => 'EN|FR|DE')));
$coll->add('foo', new Route('/locale', [], ['locale' => 'EN|FR|DE']));
$matcher = $this->getUrlMatcher($coll);
$matcher->match('/en');
@@ -539,10 +684,10 @@ class UrlMatcherTest extends TestCase
public function testHostIsCaseInsensitive()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/', array(), array('locale' => 'EN|FR|DE'), array(), '{locale}.example.com'));
$coll->add('foo', new Route('/', [], ['locale' => 'EN|FR|DE'], [], '{locale}.example.com'));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
$this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/'));
$this->assertEquals(['_route' => 'foo', 'locale' => 'en'], $matcher->match('/'));
}
/**
@@ -575,9 +720,9 @@ class UrlMatcherTest extends TestCase
$coll->addCollection($subColl);
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'a'), $matcher->match('/p/a'));
$this->assertEquals(array('_route' => 'baz', 'baz' => 'p'), $matcher->match('/p'));
$this->assertEquals(array('_route' => 'buz'), $matcher->match('/prefix/buz'));
$this->assertEquals(['_route' => 'a'], $matcher->match('/p/a'));
$this->assertEquals(['_route' => 'baz', 'baz' => 'p'], $matcher->match('/p'));
$this->assertEquals(['_route' => 'buz'], $matcher->match('/prefix/buz'));
}
/**
@@ -586,7 +731,7 @@ class UrlMatcherTest extends TestCase
public function testSchemeAndMethodMismatch()
{
$coll = new RouteCollection();
$coll->add('foo', new Route('/', array(), array(), array(), null, array('https'), array('POST')));
$coll->add('foo', new Route('/', [], [], [], null, ['https'], ['POST']));
$matcher = $this->getUrlMatcher($coll);
$matcher->match('/');
@@ -600,54 +745,54 @@ class UrlMatcherTest extends TestCase
$coll->add('c', new Route('/a{a}'));
$coll->add('d', (new Route('/b{a}'))->setCondition('false'));
$coll->add('e', (new Route('/{b}{a}'))->setCondition('false'));
$coll->add('f', (new Route('/{b}{a}'))->setRequirements(array('b' => 'b')));
$coll->add('f', (new Route('/{b}{a}'))->setRequirements(['b' => 'b']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'c', 'a' => 'a'), $matcher->match('/aa'));
$this->assertEquals(array('_route' => 'f', 'b' => 'b', 'a' => 'a'), $matcher->match('/ba'));
$this->assertEquals(['_route' => 'c', 'a' => 'a'], $matcher->match('/aa'));
$this->assertEquals(['_route' => 'f', 'b' => 'b', 'a' => 'a'], $matcher->match('/ba'));
}
public function testUnicodeRoute()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{a}', array(), array('a' => '.'), array('utf8' => false)));
$coll->add('b', new Route('/{a}', array(), array('a' => '.'), array('utf8' => true)));
$coll->add('a', new Route('/{a}', [], ['a' => '.'], ['utf8' => false]));
$coll->add('b', new Route('/{a}', [], ['a' => '.'], ['utf8' => true]));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'b', 'a' => 'é'), $matcher->match('/é'));
$this->assertEquals(['_route' => 'b', 'a' => 'é'], $matcher->match('/é'));
}
public function testRequirementWithCapturingGroup()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{a}/{b}', array(), array('a' => '(a|b)')));
$coll->add('a', new Route('/{a}/{b}', [], ['a' => '(a|b)']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'a', 'a' => 'a', 'b' => 'b'), $matcher->match('/a/b'));
$this->assertEquals(['_route' => 'a', 'a' => 'a', 'b' => 'b'], $matcher->match('/a/b'));
}
public function testDotAllWithCatchAll()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{id}.html', array(), array('id' => '.+')));
$coll->add('b', new Route('/{all}', array(), array('all' => '.+')));
$coll->add('a', new Route('/{id}.html', [], ['id' => '.+']));
$coll->add('b', new Route('/{all}', [], ['all' => '.+']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'a', 'id' => 'foo/bar'), $matcher->match('/foo/bar.html'));
$this->assertEquals(['_route' => 'a', 'id' => 'foo/bar'], $matcher->match('/foo/bar.html'));
}
public function testHostPattern()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{app}/{action}/{unused}', array(), array(), array(), '{host}'));
$coll->add('a', new Route('/{app}/{action}/{unused}', [], [], [], '{host}'));
$expected = array(
$expected = [
'_route' => 'a',
'app' => 'an_app',
'action' => 'an_action',
'unused' => 'unused',
'host' => 'foo',
);
];
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'GET', 'foo'));
$this->assertEquals($expected, $matcher->match('/an_app/an_action/unused'));
}
@@ -655,8 +800,8 @@ class UrlMatcherTest extends TestCase
public function testUtf8Prefix()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/é{foo}', array(), array(), array('utf8' => true)));
$coll->add('b', new Route('/è{bar}', array(), array(), array('utf8' => true)));
$coll->add('a', new Route('/é{foo}', [], [], ['utf8' => true]));
$coll->add('b', new Route('/è{bar}', [], [], ['utf8' => true]));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals('a', $matcher->match('/éo')['_route']);
@@ -665,9 +810,9 @@ class UrlMatcherTest extends TestCase
public function testUtf8AndMethodMatching()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/admin/api/list/{shortClassName}/{id}.{_format}', array(), array(), array('utf8' => true), '', array(), array('PUT')));
$coll->add('b', new Route('/admin/api/package.{_format}', array(), array(), array(), '', array(), array('POST')));
$coll->add('c', new Route('/admin/api/package.{_format}', array('_format' => 'json'), array(), array(), '', array(), array('GET')));
$coll->add('a', new Route('/admin/api/list/{shortClassName}/{id}.{_format}', [], [], ['utf8' => true], '', [], ['PUT']));
$coll->add('b', new Route('/admin/api/package.{_format}', [], [], [], '', [], ['POST']));
$coll->add('c', new Route('/admin/api/package.{_format}', ['_format' => 'json'], [], [], '', [], ['GET']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals('c', $matcher->match('/admin/api/package.json')['_route']);
@@ -676,7 +821,7 @@ class UrlMatcherTest extends TestCase
public function testHostWithDot()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/foo', array(), array(), array(), 'foo.example.com'));
$coll->add('a', new Route('/foo', [], [], [], 'foo.example.com'));
$coll->add('b', new Route('/bar/{baz}'));
$matcher = $this->getUrlMatcher($coll);
@@ -686,7 +831,7 @@ class UrlMatcherTest extends TestCase
public function testSlashVariant()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/foo/{bar}', array(), array('bar' => '.*')));
$coll->add('a', new Route('/foo/{bar}', [], ['bar' => '.*']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals('a', $matcher->match('/foo/')['_route']);
@@ -695,57 +840,103 @@ class UrlMatcherTest extends TestCase
public function testSlashVariant2()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/foo/{bar}/', array(), array('bar' => '.*')));
$coll->add('a', new Route('/foo/{bar}/', [], ['bar' => '.*']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(array('_route' => 'a', 'bar' => 'bar'), $matcher->match('/foo/bar/'));
$this->assertEquals(['_route' => 'a', 'bar' => 'bar'], $matcher->match('/foo/bar/'));
}
public function testSlashWithVerb()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{foo}', array(), array(), array(), '', array(), array('put', 'delete')));
$coll->add('a', new Route('/{foo}', [], [], [], '', [], ['put', 'delete']));
$coll->add('b', new Route('/bar/'));
$matcher = $this->getUrlMatcher($coll);
$this->assertSame(array('_route' => 'b'), $matcher->match('/bar/'));
$this->assertSame(['_route' => 'b'], $matcher->match('/bar/'));
$coll = new RouteCollection();
$coll->add('a', new Route('/dav/{foo<.*>?}', array(), array(), array(), '', array(), array('GET', 'OPTIONS')));
$coll->add('a', new Route('/dav/{foo}', [], ['foo' => '.*'], [], '', [], ['GET', 'OPTIONS']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'OPTIONS'));
$expected = array(
$expected = [
'_route' => 'a',
'foo' => 'files/bar',
);
'foo' => 'files/bar/',
];
$this->assertEquals($expected, $matcher->match('/dav/files/bar/'));
}
public function testSlashAndVerbPrecedence()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('post')));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('get')));
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['post']));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['get']));
$matcher = $this->getUrlMatcher($coll);
$expected = array(
$expected = [
'_route' => 'b',
'customerId' => '123',
);
];
$this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
$coll = new RouteCollection();
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', array(), array(), array(), '', array(), array('get')));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons', array(), array(), array(), '', array(), array('post')));
$coll->add('a', new Route('/api/customers/{customerId}/contactpersons/', [], [], [], '', [], ['get']));
$coll->add('b', new Route('/api/customers/{customerId}/contactpersons', [], [], [], '', [], ['post']));
$matcher = $this->getUrlMatcher($coll, new RequestContext('', 'POST'));
$expected = array(
$expected = [
'_route' => 'b',
'customerId' => '123',
);
];
$this->assertEquals($expected, $matcher->match('/api/customers/123/contactpersons'));
}
public function testGreedyTrailingRequirement()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/{a}', [], ['a' => '.+']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(['_route' => 'a', 'a' => 'foo'], $matcher->match('/foo'));
$this->assertEquals(['_route' => 'a', 'a' => 'foo/'], $matcher->match('/foo/'));
}
public function testTrailingRequirementWithDefault()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+']));
$coll->add('b', new Route('/en-en/{b}', ['b' => 'bbb'], ['b' => '.*']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(['_route' => 'a', 'a' => 'aaa'], $matcher->match('/fr-fr'));
$this->assertEquals(['_route' => 'a', 'a' => 'AAA'], $matcher->match('/fr-fr/AAA'));
$this->assertEquals(['_route' => 'b', 'b' => 'bbb'], $matcher->match('/en-en'));
$this->assertEquals(['_route' => 'b', 'b' => 'BBB'], $matcher->match('/en-en/BBB'));
}
public function testTrailingRequirementWithDefault_A()
{
$coll = new RouteCollection();
$coll->add('a', new Route('/fr-fr/{a}', ['a' => 'aaa'], ['a' => '.+']));
$matcher = $this->getUrlMatcher($coll);
$this->expectException(ResourceNotFoundException::class);
$matcher->match('/fr-fr/');
}
public function testTrailingRequirementWithDefault_B()
{
$coll = new RouteCollection();
$coll->add('b', new Route('/en-en/{b}', ['b' => 'bbb'], ['b' => '.*']));
$matcher = $this->getUrlMatcher($coll);
$this->assertEquals(['_route' => 'b', 'b' => ''], $matcher->match('/en-en/'));
}
protected function getUrlMatcher(RouteCollection $routes, RequestContext $context = null)
{
return new UrlMatcher($routes, $context ?: new RequestContext());