diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FrameworkBundle] remove mention of the old Controller class

Browse Source
This commit is contained in:
Nicolas Grekas 2020-02-02 16:14:55 +01:00
parent bf6d38412a
commit 6620f8afd9
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
View File

@ -392,8 +392,6 @@ class FrameworkExtension extends Extension
->addTag('controller.argument_value_resolver'); ->addTag('controller.argument_value_resolver');
$container->registerForAutoconfiguration(AbstractController::class) $container->registerForAutoconfiguration(AbstractController::class)
->addTag('controller.service_arguments'); ->addTag('controller.service_arguments');
$container->registerForAutoconfiguration('Symfony\Bundle\FrameworkBundle\Controller\Controller')
->addTag('controller.service_arguments');
$container->registerForAutoconfiguration(DataCollectorInterface::class) $container->registerForAutoconfiguration(DataCollectorInterface::class)
->addTag('data_collector'); ->addTag('data_collector');
$container->registerForAutoconfiguration(FormTypeInterface::class) $container->registerForAutoconfiguration(FormTypeInterface::class)

3
src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
View File

@ -51,9 +51,6 @@ class RemoveEmptyControllerArgumentLocatorsPass implements CompilerPassInterface
} }
} }
if (!$reason) { if (!$reason) {
// Deprecated since Symfony 4.1. See Symfony\Component\HttpKernel\Controller\ContainerControllerResolver
$controllers[$id.':'.$action] = $argumentRef;
if ('__invoke' === $action) { if ('__invoke' === $action) {
$controllers[$id] = $argumentRef; $controllers[$id] = $argumentRef;
} }

4
src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
View File

@ -49,7 +49,7 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
$controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0); $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
$this->assertSame(['c1::fooAction', 'c1:fooAction'], array_keys($controllers)); $this->assertSame(['c1::fooAction'], array_keys($controllers));
$this->assertSame(['bar'], array_keys($container->getDefinition((string) $controllers['c1::fooAction']->getValues()[0])->getArgument(0))); $this->assertSame(['bar'], array_keys($container->getDefinition((string) $controllers['c1::fooAction']->getValues()[0])->getArgument(0)));
$expectedLog = [ $expectedLog = [
@ -73,7 +73,7 @@ class RemoveEmptyControllerArgumentLocatorsPassTest extends TestCase
(new RemoveEmptyControllerArgumentLocatorsPass())->process($container); (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
$this->assertEquals( $this->assertEquals(
['invokable::__invoke', 'invokable:__invoke', 'invokable'], ['invokable::__invoke', 'invokable'],
array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)) array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0))
); );
} }