10000 minor #26266 [HttpKernel] Fix BC of the test suite (nicolas-grekas) · symfony/symfony@74f4156 · GitHub
[go: up one dir, main page]

Skip to content

Commit 74f4156

Browse files
minor #26266 [HttpKernel] Fix BC of the test suite (nicolas-grekas)
This PR was merged into the 4.1-dev branch. Discussion ---------- [HttpKernel] Fix BC of the test suite | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - replaces #26262 Commits ------- 716adf8 [HttpKernel] Fix BC of the test suite
2 parents 76aa86d + 716adf8 commit 74f4156

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

src/Symfony/Bundle/FrameworkBundle/Tests/Controller/ControllerResolverTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
use Symfony\Component\DependencyInjection\ContainerAwareInterface;
2121
use Symfony\Component\DependencyInjection\ContainerInterface;
2222
use Symfony\Component\HttpFoundation\Request;
23-
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
2423
use Symfony\Component\HttpKernel\Tests\Controller\ContainerControllerResolverTest;
2524

2625
class ControllerResolverTest extends ContainerControllerResolverTest
@@ -169,7 +168,7 @@ class_exists(AbstractControllerTest::class);
169168
$this->assertSame($controllerContainer, $controller->getContainer());
170169
}
171170

172-
protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null, ControllerNameParser $parser = null): ControllerResolverInterface
171+
protected function createControllerResolver(LoggerInterface $logger = null, Psr11ContainerInterface $container = null, ControllerNameParser $parser = null)
173172
{
174173
if (!$parser) {
175174
$parser = $this->createMockParser();

src/Symfony/Component/HttpKernel/Tests/Controller/ContainerControllerResolverTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
use Symfony\Component\DependencyInjection\Container;
1717
use Symfony\Component\HttpFoundation\Request;
1818
use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
19-
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
2019

2120
class ContainerControllerResolverTest extends ControllerResolverTest
2221
{
@@ -204,7 +203,7 @@ public function getUndefinedControllers()
204203
return $tests;
205204
}
206205

207-
protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null): ControllerResolverInterface
206+
protected function createControllerResolver(LoggerInterface $logger = null, ContainerInterface $container = null)
208207
{
209208
if (!$container) {
210209
$container = $this->createMockContainer();

src/Symfony/Component/HttpKernel/Tests/Controller/ControllerResolverTest.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Psr\Log\LoggerInterface;
1616
use Symfony\Component\HttpKernel\Controller\ControllerResolver;
1717
use Symfony\Component\HttpFoundation\Request;
18-
use Symfony\Component\HttpKernel\Controller\ControllerResolverInterface;
1918

2019
class ControllerResolverTest extends TestCase
2120
{
@@ -194,7 +193,7 @@ public function getUndefinedControllers()
194193
);
195194
}
196195

197-
protected function createControllerResolver(LoggerInterface $logger = null): ControllerResolverInterface
196+
protected function createControllerResolver(LoggerInterface $logger = null)
198197
{
199198
return new ControllerResolver($logger);
200199
}

0 commit comments

Comments
 (0)
0