[FrameworkBundle] Add the ability to ignore backslashes in service ids when using debug:container and debug:autowiring

respinoza · respinoza · commit 20f37b31ac54 · 2018-09-17T20:11:51.000+09:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Added new "auto" mode for `framework.session.cookie_secure` to turn it on when HTTPS is used
  * Removed the `framework.messenger.encoder` and `framework.messenger.decoder` options. Use the `framework.messenger.serializer.id` option to replace the Messenger serializer. 
  * Deprecated the `ContainerAwareCommand` class in favor of `Symfony\Component\Console\Command\Command`
+ * Add the ability to ignore backslashes in service ids when using `debug:container` and `debug:autowiring`
 
 4.1.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -229,7 +229,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, $name)
         $serviceIds = $builder->getServiceIds();
         $foundServiceIds = array();
         foreach ($serviceIds as $serviceId) {
-            if (false === stripos($serviceId, $name)) {
+            if (false === stripos(str_replace('\\', '', $serviceId), $name)) {
                 continue;
             }
             $foundServiceIds[] = $serviceId;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($search = $input->getArgument('search')) {
             $serviceIds = array_filter($serviceIds, function ($serviceId) use ($search) {
-                return false !== stripos($serviceId, $search);
+                return false !== stripos(str_replace('\\', '', $serviceId), $search);
             });
 
             if (empty($serviceIds)) {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -63,4 +63,27 @@ public function testPrivateAlias()
         $this->assertContains('public', $tester->getDisplay());
         $this->assertContains('private_alias', $tester->getDisplay());
     }
+
+    /**
+     * @dataProvider getValidServiceIds
+     */
+    public function testIgnoreBackslashWhenFindingService(string $validServiceId)
+    {
+        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'debug:container', 'name' => $validServiceId));
+        $this->assertContains('Information for Service "logger"', $tester->getDisplay());
+    }
+
+    public function getValidServiceIds()
+    {
+        return array(
+            array('Psr\\Log\\LoggerInterface'),
+            array('LogLoggerInterface'),
+        );
+    }
 }
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
@@ -47,6 +47,18 @@ public function testSearchArgument()
         $this->assertNotContains('Symfony\Component\Routing\RouterInterface', $tester->getDisplay());
     }
 
+    public function testSearchIgnoreBackslashWhenFindingService()
+    {
+        static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));
+
+        $application = new Application(static::$kernel);
+        $application->setAutoExit(false);
+
+        $tester = new ApplicationTester($application);
+        $tester->run(array('command' => 'debug:autowiring', 'search' => 'HttpKernelHttpKernelInterface'));
+        $this->assertContains('Symfony\Component\HttpKernel\HttpKernelInterface', $tester->getDisplay());
+    }
+
     public function testSearchNoResults()
     {
         static::bootKernel(array('test_case' => 'ContainerDebug', 'root_config' => 'config.yml'));

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, $name)`
`229`	`229`	`$serviceIds = $builder->getServiceIds();`
`230`	`230`	`$foundServiceIds = array();`
`231`	`231`	`foreach ($serviceIds as $serviceId) {`
`232`		`- if (false === stripos($serviceId, $name)) {`
	`232`	`+ if (false === stripos(str_replace('\\', '', $serviceId), $name)) {`
`233`	`233`	`continue;`
`234`	`234`	`}`
`235`	`235`	`$foundServiceIds[] = $serviceId;`