symfony
diff --git a/‎src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+3Lines changed: 3 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPass.php
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
+45Lines changed: 45 additions & 0 deletions b/‎src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RemoveEmptyControllerArgumentLocatorsPassTest.php
+45Lines changed: 45 additions & 0 deletions
@@ -60,6 +60,9 @@ public function process(ContainerBuilder $container)
                     if ($controllerDef->getClass() === $id) {
                         $controllers[$id.'::'.$action] = $argumentRef;
                     }
+                    if ('__invoke' === $action) {
+                        $controllers[$id] = $argumentRef;
+                    }
                     continue;
                 }
             }
 
@@ -78,6 +78,44 @@ public function testSameIdClass()
         );
         $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
     }
+
+    public function testInvoke()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register('invokable', InvokableRegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $this->assertEquals(
+            array('invokable:__invoke', 'invokable'),
+            array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0))
+        );
+    }
+
+    public function testInvokeSameIdClass()
+    {
+        $container = new ContainerBuilder();
+        $resolver = $container->register('argument_resolver.service')->addArgument(array());
+
+        $container->register(InvokableRegisterTestController::class, InvokableRegisterTestController::class)
+            ->addTag('controller.service_arguments')
+        ;
+
+        (new RegisterControllerArgumentLocatorsPass())->process($container);
+        (new RemoveEmptyControllerArgumentLocatorsPass())->process($container);
+
+        $expected = array(
+            InvokableRegisterTestController::class.':__invoke',
+            InvokableRegisterTestController::class.'::__invoke',
+            InvokableRegisterTestController::class,
+        );
+        $this->assertEquals($expected, array_keys($container->getDefinition((string) $resolver->getArgument(0))->getArgument(0)));
+    }
 }
 
 class RemoveTestController1
@@ -97,3 +135,10 @@ public function fooAction(NotFound $bar)
     {
     }
 }
+
+class InvokableRegisterTestController
+{
+    public function __invoke(\stdClass $bar)
+    {
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,9 @@ public function process(ContainerBuilder $container)`
`60`	`60`	`if ($controllerDef->getClass() === $id) {`
`61`	`61`	`$controllers[$id.'::'.$action] = $argumentRef;`
`62`	`62`	`}`
	`63`	`+ if ('__invoke' === $action) {`
	`64`	`+ $controllers[$id] = $argumentRef;`
	`65`	`+ }`
`63`	`66`	`continue;`
`64`	`67`	`}`
`65`	`68`	`}`