Merge branch '2.7' into 2.8
* 2.7: Pass on previous exception in FatalThrowableError [Routing] remove dead code [Routing] fix typo
This commit is contained in:
commit
3dd843ba7e
@ -36,7 +36,8 @@ class FatalThrowableError extends FatalErrorException
|
||||
$e->getCode(),
|
||||
$severity,
|
||||
$e->getFile(),
|
||||
$e->getLine()
|
||||
$e->getLine(),
|
||||
$e->getPrevious()
|
||||
);
|
||||
|
||||
$this->setTrace($e->getTrace());
|
||||
|
@ -25,7 +25,7 @@ class DumpedRedirectableUrlMatcherTest extends RedirectableUrlMatcherTest
|
||||
|
||||
$class = 'DumpedRedirectableUrlMatcher'.++$i;
|
||||
$dumper = new PhpMatcherDumper($routes);
|
||||
$dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
|
||||
eval('?>'.$dumper->dump(array('class' => $class, 'base_class' => 'Symfony\Component\Routing\Tests\Matcher\TestDumpedRedirectableUrlMatcher')));
|
||||
|
||||
return $this->getMockBuilder($class)
|
||||
->setConstructorArgs(array($context ?: new RequestContext()))
|
||||
|
@ -41,7 +41,7 @@ class DumpedUrlMatcherTest extends UrlMatcherTest
|
||||
|
||||
$class = 'DumpedUrlMatcher'.++$i;
|
||||
$dumper = new PhpMatcherDumper($routes);
|
||||
$dumpedRoutes = eval('?>'.$dumper->dump(array('class' => $class)));
|
||||
eval('?>'.$dumper->dump(array('class' => $class)));
|
||||
|
||||
return new $class($context ?: new RequestContext());
|
||||
}
|
||||
|
@ -17,7 +17,7 @@ use Symfony\Component\Routing\RequestContext;
|
||||
|
||||
class RedirectableUrlMatcherTest extends UrlMatcherTest
|
||||
{
|
||||
public function testRedirectWhenNoSlash()
|
||||
public function testMissingTrailingSlash()
|
||||
{
|
||||
$coll = new RouteCollection();
|
||||
$coll->add('foo', new Route('/foo/'));
|
||||
@ -56,7 +56,7 @@ class RedirectableUrlMatcherTest extends UrlMatcherTest
|
||||
$matcher->match('/foo');
|
||||
}
|
||||
|
||||
public function testNoSchemaRedirectIfOnOfMultipleSchemesMatches()
|
||||
public function testNoSchemaRedirectIfOneOfMultipleSchemesMatches()
|
||||
{
|
||||
$coll = new RouteCollection();
|
||||
$coll->add('foo', new Route('/foo', array(), array(), array(), '', array('https', 'http')));
|
||||
|
Reference in New Issue
Block a user