Revert "minor #35559 [FrameworkBundle] remove mention of the old Controller class (nicolas-grekas)"

nicolas-grekas · nicolas-grekas · commit bce287e8fcd2 · 2020-03-10T16:58:10.000+01:00
This reverts commit 6bb6473, reversing changes made to 4cce23d.
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
@@ -404,6 +404,8 @@ public function load(array $configs, ContainerBuilder $container)
             ->addTag('controller.argument_value_resolver');
         $container->registerForAutoconfiguration(AbstractController::class)
             ->addTag('controller.service_arguments');
+        $container->registerForAutoconfiguration('Symfony\Bundle\FrameworkBundle\Controller\Controller')
+            ->addTag('controller.service_arguments');
         $container->registerForAutoconfiguration(DataCollectorInterface::class)
             ->addTag('data_collector');
         $container->registerForAutoconfiguration(FormTypeInterface::class)
diff --git a/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php b/src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
@@ -51,6 +51,8 @@ public function process(ContainerBuilder $container)
                     }
                 }
                 if (!$reason) {
+                    $controllers[$id.':'.$action] = $argumentRef;
+
                     if ('__invoke' === $action) {
                         $controllers[$id] = $argumentRef;
                     }
diff --git a/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php b/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
@@ -49,7 +49,7 @@ public function testProcess()
 
         $controllers = $container->getDefinition((string) $resolver->getArgument(0))->getArgument(0);
 
-        $this->assertSame(['c1::fooAction'], array_keys($controllers));
+        $this->assertSame(['c1::fooAction', 'c1:fooAction'], array_keys($controllers));
         $this->assertSame(['bar'], array_keys($container->getDefinition((string) $controllers['c1::fooAction']->getValues()[0])->getArgument(0)));
 
         $expectedLog = [
@@ -73,7 +73,7 @@ public function testInvoke()
         (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
 
         $this->assertEquals(
-            ['invokable::__invoke', 'invokable'],
+            ['invokable::__invoke', 'invokable:__invoke', 'invokable'],
             array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0))
         );
     }

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,8 @@ public function process(ContainerBuilder $container)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`if (!$reason) {`
	`54`	`+ $controllers[$id.':'.$action] = $argumentRef;`
	`55`	`+`
`54`	`56`	`if ('__invoke' === $action) {`
`55`	`57`	`$controllers[$id] = $argumentRef;`
`56`	`58`	`}`