[Routing] Return the _route parameter from ApacheUrlMatcher
This commit is contained in:
parent
4a0057fd56
commit
e6e9b5adbe
@ -52,6 +52,7 @@ class ApacheUrlMatcher extends UrlMatcher
|
|||||||
|
|
||||||
if ('_route' == $name) {
|
if ('_route' == $name) {
|
||||||
$match = true;
|
$match = true;
|
||||||
|
$parameters[$name] = $value;
|
||||||
} elseif (0 === strpos($name, '_allow_')) {
|
} elseif (0 === strpos($name, '_allow_')) {
|
||||||
$allow[] = substr($name, 7);
|
$allow[] = substr($name, 7);
|
||||||
} else {
|
} else {
|
||||||
|
@ -0,0 +1,60 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Symfony\Tests\Component\Routing\Matcher;
|
||||||
|
|
||||||
|
use Symfony\Component\Routing\RouteCollection;
|
||||||
|
use Symfony\Component\Routing\RequestContext;
|
||||||
|
use Symfony\Component\Routing\Matcher\ApacheUrlMatcher;
|
||||||
|
|
||||||
|
class ApacheUrlMatcherTest extends \PHPUnit_Framework_TestCase
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @dataProvider getMatchData
|
||||||
|
*/
|
||||||
|
public function testMatch($name, $pathinfo, $server, $expect)
|
||||||
|
{
|
||||||
|
$collection = new RouteCollection;
|
||||||
|
$context = new RequestContext;
|
||||||
|
$matcher = new ApacheUrlMatcher($collection, $context);
|
||||||
|
|
||||||
|
$_SERVER = $server;
|
||||||
|
|
||||||
|
$result = $matcher->match($pathinfo, $server);
|
||||||
|
$this->assertSame(var_export($expect, true), var_export($result, true));
|
||||||
|
}
|
||||||
|
|
||||||
|
public function getMatchData()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array(
|
||||||
|
'Simple route',
|
||||||
|
'/hello/world',
|
||||||
|
array(
|
||||||
|
'_ROUTING__route' => 'hello',
|
||||||
|
'_ROUTING__controller' => 'AcmeBundle:Default:index',
|
||||||
|
'_ROUTING_name' => 'world',
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'_route' => 'hello',
|
||||||
|
'_controller' => 'AcmeBundle:Default:index',
|
||||||
|
'name' => 'world',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'REDIRECT_ envs',
|
||||||
|
'/hello/world',
|
||||||
|
array(
|
||||||
|
'REDIRECT__ROUTING__route' => 'hello',
|
||||||
|
'REDIRECT__ROUTING__controller' => 'AcmeBundle:Default:index',
|
||||||
|
'REDIRECT__ROUTING_name' => 'world',
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'_route' => 'hello',
|
||||||
|
'_controller' => 'AcmeBundle:Default:index',
|
||||||
|
'name' => 'world',
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Reference in New Issue
Block a user