symfony · nicolas-grekas · Sep 19, 2018 · Sep 17, 2018
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG
  * Added new "auto" m
8000
ode 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`
+ * Made `debug:container` and `debug:autowiring` ignore backslashes in service ids
 
 4.1.0
 -----

diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
@@ -219,23 +219,27 @@ private function findProperServiceName(InputInterface $input, SymfonyStyle $io,
             throw new InvalidArgumentException(sprintf('No services found that match "%s".', $name));
         }
 
-        $default = 1 === \count($matchingServices) ? $matchingServices[0] : null;
+        if (1 === \count($matchingServices)) {
+            return $matchingServices[0];
+        }
 
-        return $io->choice('Select one of the following services to display its information', $matchingServices, $default);
+        return $io->choice('Select one of the following services to display its information', $matchingServices);
     }
 
     private function findServiceIdsContaining(ContainerBuilder $builder, $name)
     {
         $serviceIds = $builder->getServiceIds();
-        $foundServiceIds = array();
+        $foundServiceIds = $foundServiceIdsIgnoringBackslashes = array();
         foreach ($serviceIds as $serviceId) {
-            if (false === stripos($serviceId, $name)) {
-                continue;
+            if (false !== stripos(str_replace('\\', '', $serviceId), $name)) {
+                $foundServiceIdsIgnoringBackslashes[] = $serviceId;
+            }
+            if (false !== stripos($serviceId, $name)) {
+                $foundServiceIds[] = $serviceId;
             }
-            $foundServiceIds[] = $serviceId;
         }
 
-        return $foundServiceIds;
+        return $foundServiceIds ?: $foundServiceIdsIgnoringBackslashes;
     }
 
     /**

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/Fixtures/BackslashClass.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Fixtures/BackslashClass.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Fixtures;
+
+class BackslashClass
+{
+}
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/ContainerDebugCommandTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass;
 use Symfony\Component\Console\Tester\ApplicationTester;
 
 /**
@@ -63,4 +64,27 @@ public function testPrivateAlias()
         $this->assertContains('public', $tester->getDisplay());
         $this->assertContains('private_alias', $tester->getDisplay());
     }
+
+    /**
+     * @dataProvider provideIgnoreBackslashWhenFindingService
+     */
+    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->assertNotContains('No services found', $tester->getDisplay());
+    }
+
+    public function provideIgnoreBackslashWhenFindingService()
+    {
+        return array(
+            array(BackslashClass::class),
+            array('FixturesBackslashClass'),
+        );
+    }
 }
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'));

diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/app/ContainerDebug/config.yml
@@ -8,3 +8,5 @@ services:
     private_alias:
         alias: public
         public: false
+    Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass:
+        class: Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass