feature #22120 [FrameworkBundle] Multiple services on one Command class (SenseException)

fabpot · fabpot · commit 42e5b4e10d69 · 2017-03-22T16:05:06.000-07:00
This PR was squashed before being merged into the 3.3-dev branch (closes #22120). Discussion ---------- [FrameworkBundle] Multiple services on one Command class rebased version of #19305 Commits ------- 2b82fcb [FrameworkBundle] Multiple services on one Command class
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -92,6 +92,29 @@ public function testProcessThrowAnExceptionIfTheServiceIsNotASubclassOfCommand()
 
         $container->compile();
     }
+
+    public function testProcessServicesWithSameCommand()
+    {
+        $container = new ContainerBuilder();
+        $container->addCompilerPass(new AddConsoleCommandPass());
+        $className = 'Symfony\Bundle\FrameworkBundle\Tests\DependencyInjection\Compiler\MyCommand';
+
+        $definition1 = new Definition($className);
+        $definition1->addTag('console.command');
+
+        $definition2 = new Definition($className);
+        $definition2->addTag('console.command');
+
+        $container->setDefinition('my-command1', $definition1);
+        $container->setDefinition('my-command2', $definition2);
+
+        $container->compile();
+
+        $alias1 = 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';
+        $alias2 = $alias1.'_my-command2';
+        $this->assertTrue($container->hasAlias($alias1));
+        $this->assertTrue($container->hasAlias($alias2));
+    }
 }
 
 class MyCommand extends Command
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -44,7 +44,11 @@ public function process(ContainerBuilder $container)
                 throw new InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "%s".', $id, Command::class));
             }
 
-            $container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);
+            $serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class));
+            if ($container->hasAlias($serviceId)) {
+                $serviceId = $serviceId.'_'.$id;
+            }
+            $container->setAlias($serviceId, $id);
             $serviceIds[] = $definition->isPublic() ? $id : $serviceId;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,11 @@ public function process(ContainerBuilder $container)`
`44`	`44`	`throw new InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "%s".', $id, Command::class));`
`45`	`45`	`}`
`46`	`46`
`47`		`- $container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);`
	`47`	`+ $serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class));`
	`48`	`+ if ($container->hasAlias($serviceId)) {`
	`49`	`+ $serviceId = $serviceId.'_'.$id;`
	`50`	`+ }`
	`51`	`+ $container->setAlias($serviceId, $id);`
`48`	`52`	`$serviceIds[] = $definition->isPublic() ? $id : $serviceId;`
`49`	`53`	`}`
`50`	`54`