[HttpKernel] Fix BC of the test suite

This commit is contained in:
Nicolas Grekas 2018-02-22 11:27:16 +01:00
parent 76aa86d773
commit 716adf8641
3 changed files with 3 additions and 6 deletions

View File

@ -20,7 +20,6 @@ use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
class ControllerResolverTest extends ContainerControllerResolverTest
@ -169,7 +168,7 @@ class ControllerResolverTest extends ContainerControllerResolverTest
$this->assertSame($controllerContainer, $controller->getContainer());
}
protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null, ControllerNameParser $parser = null): ControllerResolverInterface
protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null, ControllerNameParser $parser = null)
{
if (!$parser) {
$parser = $this->createMockParser();

View File

@ -16,7 +16,6 @@ use Psr\Log\LoggerInterface;
use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
class ContainerControllerResolverTest extends ControllerResolverTest
{
@ -204,7 +203,7 @@ class ContainerControllerResolverTest extends ControllerResolverTest
return $tests;
}
protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null): ControllerResolverInterface
protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null)
{
if (!$container) {
$container = $this->createMockContainer();

View File

@ -15,7 +15,6 @@ use PHPUnit\Framework\TestCase;
use Psr\Log\LoggerInterface;
use Symfony\Component\HttpKernel\Controller\ControllerResolver;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
class ControllerResolverTest extends TestCase
{
@ -194,7 +193,7 @@ class ControllerResolverTest extends TestCase
);
}
protected function createControllerResolver(LoggerInterface $logger = null): ControllerResolverInterface
protected function createControllerResolver(LoggerInterface $logger = null)
{
return new ControllerResolver($logger);
}