bug #18925 [Console] Fix BC break introduced by #18101 (dunglas)

fabpot · fabpot · commit c7f1f7810c5a · 2016-06-01T08:04:30.000+02:00
This PR was squashed before being merged into the 3.1 branch (closes #18925). Discussion ---------- [Console] Fix BC break introduced by #18101 | Q | A | ------------- | --- | Branch? | 3.1 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no | Fixed tickets | #18101 (comment) | License | MIT | Doc PR | n/a * [x] Fix tests Commits ------- 7a5a139 [Console] Fix BC break introduced by #18101
diff --git a/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConsoleCommandPass.php b/src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/AddConsoleCommandPass.php
@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container)
                 throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "Symfony\\Component\\Console\\Command\\Command".', $id));
             }
             $container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);
-            $serviceIds[] = $serviceId;
+            $serviceIds[] = $definition->isPublic() ? $id : $serviceId;
         }
 
         $container->setParameter('console.command.ids', $serviceIds);
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/AddConsoleCommandPassTest.php
@@ -45,8 +45,9 @@ public function testProcess($public)
             $this->assertTrue($container->hasDefinition($alias));
         }
 
+        $id = $public ? 'my-command' : 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';
         $this->assertTrue($container->hasParameter('console.command.ids'));
-        $this->assertSame(array('console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand'), $container->getParameter('console.command.ids'));
+        $this->assertSame(array($id), $container->getParameter('console.command.ids'));
     }
 
     public function visibilityProvider()

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public function process(ContainerBuilder $container)`
`38`	`38`	`throw new \InvalidArgumentException(sprintf('The service "%s" tagged "console.command" must be a subclass of "Symfony\\Component\\Console\\Command\\Command".', $id));`
`39`	`39`	`}`
`40`	`40`	`$container->setAlias($serviceId = 'console.command.'.strtolower(str_replace('\\', '_', $class)), $id);`
`41`		`- $serviceIds[] = $serviceId;`
	`41`	`+ $serviceIds[] = $definition->isPublic() ? $id : $serviceId;`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`$container->setParameter('console.command.ids', $serviceIds);`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,9 @@ public function testProcess($public)`
`45`	`45`	`$this->assertTrue($container->hasDefinition($alias));`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ $id = $public ? 'my-command' : 'console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand';`
`48`	`49`	`$this->assertTrue($container->hasParameter('console.command.ids'));`
`49`		`- $this->assertSame(array('console.command.symfony_bundle_frameworkbundle_tests_dependencyinjection_compiler_mycommand'), $container->getParameter('console.command.ids'));`
	`50`	`+ $this->assertSame(array($id), $container->getParameter('console.command.ids'));`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`public function visibilityProvider()`