Avoid reflection-based registration for command public services

chalasr · chalasr · commit 6c1b384b751d · 2017-04-29T11:46:23.000+02:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -53,7 +53,7 @@ public function testProcess($public)
         }
 
         $this->assertTrue($container->hasParameter('console.command.ids'));
-        $this->assertSame(array($id), $container->getParameter('console.command.ids'));
+        $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));
     }
 
     public function visibilityProvider()
diff --git a/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php b/src/Symfony/Component/Console/DependencyInjection/AddConsoleCommandPass.php
@@ -39,16 +39,16 @@ public function process(ContainerBuilder $container)
                 throw new InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "%s".', $id, Command::class));
             }
 
+            $commandId = 'console.command.'.strtolower(str_replace('\\', '_', $class));
+            if ($container->hasAlias($commandId) || isset($serviceIds[$commandId])) {
+                $commandId = $commandId.'_'.$id;
+            }
             if (!$definition->isPublic()) {
-                $serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class));
-                if ($container->hasAlias($serviceId)) {
-                    $serviceId = $serviceId.'_'.$id;
-                }
-                $container->setAlias($serviceId, $id);
-                $id = $serviceId;
+                $container->setAlias($commandId, $id);
+                $id = $commandId;
             }
 
-            $serviceIds[] = $id;
+            $serviceIds[$commandId] = $id;
         }
 
         $container->setParameter('console.command.ids', $serviceIds);
diff --git a/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php b/src/Symfony/Component/Console/Tests/DependencyInjection/AddConsoleCommandPassTest.php
@@ -50,7 +50,7 @@ public function testProcess($public)
         }
 
         $this->assertTrue($container->hasParameter('console.command.ids'));
-        $this->assertSame(array($id), $container->getParameter('console.command.ids'));
+        $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));
     }
 
     public function visibilityProvider()
diff --git a/src/Symfony/Component/HttpKernel/Bundle/Bundle.php b/src/Symfony/Component/HttpKernel/Bundle/Bundle.php
@@ -183,8 +183,9 @@ public function registerCommands(Application $application)
             }
             $class = $ns.'\\'.$file->getBasename('.php');
             if ($this->container) {
+                $commandIds = $this->container->hasParameter('console.command.ids') ? $this->container->getParameter('console.command.ids') : array();
                 $alias = 'console.command.'.strtolower(str_replace('\\', '_', $class));
-                if ($this->container->has($alias)) {
+                if (isset($commandIds[$alias]) || $this->container->has($alias)) {
                     continue;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function testProcess($public)`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`$this->assertTrue($container->hasParameter('console.command.ids'));`
`56`		`- $this->assertSame(array($id), $container->getParameter('console.command.ids'));`
	`56`	`+ $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`public function visibilityProvider()`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ public function testProcess($public)`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`$this->assertTrue($container->hasParameter('console.command.ids'));`
`53`		`- $this->assertSame(array($id), $container->getParameter('console.command.ids'));`
	`53`	`+ $this->assertSame(array($alias => $id), $container->getParameter('console.command.ids'));`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public function visibilityProvider()`
Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,9 @@ public function registerCommands(Application $application)`
`183`	`183`	`}`
`184`	`184`	`$class = $ns.'\\'.$file->getBasename('.php');`
`185`	`185`	`if ($this->container) {`
	`186`	`+ $commandIds = $this->container->hasParameter('console.command.ids') ? $this->container->getParameter('console.command.ids') : array();`
`186`	`187`	`$alias = 'console.command.'.strtolower(str_replace('\\', '_', $class));`
`187`		`- if ($this->container->has($alias)) {`
	`188`	`+ if (isset($commandIds[$alias]) \|\| $this->container->has($alias)) {`
`188`	`189`	`continue;`
`189`	`190`	`}`
`190`	`191`	`}`