Fix registering lazy command services with autoconfigure enabled

Robin Chalas · Robin Chalas · commit 8a71aa31bbb1 · 2017-07-19T11:10:41.000+02:00
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -70,20 +70,15 @@ public function process(ContainerBuilder $container)
 
             $serviceIds[$commandId] = false;
             $commandName = $tags[0]['command'];
+            unset($tags[0]);
             $lazyCommandMap[$commandName] = $id;
             $lazyCommandRefs[$id] = new TypedReference($id, $class);
             $aliases = array();
 
             foreach ($tags as $tag) {
-                if (!isset($tag['command'])) {
-                    throw new InvalidArgumentException(sprintf('Missing "command" attribute on tag "%s" for service "%s".', $this->commandTag, $id));
-                }
-                if ($commandName !== $tag['command']) {
-                    throw new InvalidArgumentException(sprintf('The "command" attribute must be the same on each "%s" tag for service "%s".', $this->commandTag, $id));
-                }
-                if (isset($tag['alias'])) {
-                    $aliases[] = $tag['alias'];
-                    $lazyCommandMap[$tag['alias']] = $id;
+                if (isset($tag['command'])) {
+                    $aliases[] = $tag['command'];
+                    $lazyCommandMap[$tag['command']] = $id;
                 }
             }
 
diff --git a/src/Symfony/Component/Console/Tests/ApplicationTest.php b/src/Symfony/Component/Console/Tests/ApplicationTest.php
@@ -1431,8 +1431,9 @@ public function testRunLazyCommandService()
         $container->addCompilerPass(new AddConsoleCommandPass());
         $container
             ->register('lazy-command', LazyCommand::class)
-            ->addTag('console.command', array('command' => 'lazy:command', 'alias' => 'lazy:alias'))
-            ->addTag('console.command', array('command' => 'lazy:command', 'alias' => 'lazy:alias2'));
+            ->addTag('console.command', array('command' => 'lazy:command'))
+            ->addTag('console.command', array('command' => 'lazy:alias'))
+            ->addTag('console.command', array('command' => 'lazy:alias2'));
         $container->compile();
 
         $application = new Application();
diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -56,13 +56,14 @@ public function testProcess($public)
         $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));
     }
 
-    public function testProcessRegisterLazyCommands()
+    public function testProcessRegistersLazyCommands()
     {
         $container = new ContainerBuilder();
-        $container
+        $command = $container
             ->register('my-command', MyCommand::class)
             ->setPublic(false)
-            ->addTag('console.command', array('command' => 'my:command', 'alias' => 'my:alias'))
+            ->addTag('console.command', array('command' => 'my:command'))
+            ->addTag('console.command', array('command' => 'my:alias'))
         ;
 
         (new AddConsoleCommandPass())->process($container);
@@ -74,6 +75,7 @@ public function testProcessRegisterLazyCommands()
         $this->assertSame(array('my:command' => 'my-command', 'my:alias' => 'my-command'), $commandLoader->getArgument(1));
         $this->assertEquals(array(array('my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class)))), $commandLocator->getArguments());
         $this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_mycommand' => false), $container->getParameter('console.command.ids'));
+        $this->assertSame(array(array('setName', array('my:command')), array('setAliases', array(array('my:alias')))), $command->getMethodCalls());
     }
 
     public function visibilityProvider()

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,14 @@ public function testProcess($public)`
`56`	`56`	`$this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));`
`57`	`57`	`}`
`58`	`58`
`59`		`- public function testProcessRegisterLazyCommands()`
	`59`	`+ public function testProcessRegistersLazyCommands()`
`60`	`60`	`{`
`61`	`61`	`$container = new ContainerBuilder();`
`62`		`- $container`
	`62`	`+ $command = $container`
`63`	`63`	`->register('my-command', MyCommand::class)`
`64`	`64`	`->setPublic(false)`
`65`		`- ->addTag('console.command', array('command' => 'my:command', 'alias' => 'my:alias'))`
	`65`	`+ ->addTag('console.command', array('command' => 'my:command'))`
	`66`	`+ ->addTag('console.command', array('command' => 'my:alias'))`
`66`	`67`	`;`
`67`	`68`
`68`	`69`	`(new AddConsoleCommandPass())->process($container);`
`@@ -74,6 +75,7 @@ public function testProcessRegisterLazyCommands()`
`74`	`75`	`$this->assertSame(array('my:command' => 'my-command', 'my:alias' => 'my-command'), $commandLoader->getArgument(1));`
`75`	`76`	`$this->assertEquals(array(array('my-command' => new ServiceClosureArgument(new TypedReference('my-command', MyCommand::class)))), $commandLocator->getArguments());`
`76`	`77`	`$this->assertSame(array('console.command.symfony_component_console_tests_dependencyinjection_mycommand' => false), $container->getParameter('console.command.ids'));`
	`78`	`+ $this->assertSame(array(array('setName', array('my:command')), array('setAliases', array(array('my:alias')))), $command->getMethodCalls());`
`77`	`79`	`}`
`78`	`80`
`79`	`81`	`public function visibilityProvider()`