symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+4-38Lines changed: 4 additions & 38 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Command/DebugAutowiringCommand.php
+4-38Lines changed: 4 additions & 38 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
+5-9Lines changed: 5 additions & 9 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/Tests/Functional/DebugAutowiringCommandTest.php
+5-9Lines changed: 5 additions & 9 deletions
@@ -20,7 +20,6 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
 
 /**
@@ -80,10 +79,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $errorIo = $io->getErrorStyle();
 
         $builder = $this->getContainerBuilder($this->getApplication()->getKernel());
-        $serviceIds = $this->getServices($builder);
+        $serviceIds = $builder->getServiceIds();
+        $serviceIds = array_filter($serviceIds, [$this, 'filterToServiceTypes']);
 
         if ($search = $input->getArgument('search')) {
-            $searchNormalized = preg_replace('/[^a-zA-Z0-9\x7f-\xff]++/', '', $search);
+            $searchNormalized = preg_replace('/[^a-zA-Z0-9\x7f-\xff $]++/', '', $search);
 
             $serviceIds = array_filter($serviceIds, function ($serviceId) use ($searchNormalized) {
                 return false !== stripos(str_replace('\\', '', $serviceId), $searchNormalized) && !str_starts_with($serviceId, '.');
@@ -170,42 +170,8 @@ public function complete(CompletionInput $input, CompletionSuggestions $suggesti
     {
         if ($input->mustSuggestArgumentValuesFor('search')) {
             $builder = $this->getContainerBuilder($this->getApplication()->getKernel());
-            $serviceIds = $this->getServices($builder);
-
-            $services = $this->getServicesCompletion($serviceIds, $input->getArgument('search'), $builder);
-
-            $suggestions->suggestValues($services);
-        }
-    }
-
-    private function getServices(ContainerBuilder $builder): array
-    {
-        $serviceIds = $builder->getServiceIds();
-
-        return array_filter($serviceIds, [$this, 'filterToServiceTypes']);
-    }
 
-    private function getServicesCompletion(array $serviceIds, string $search, ContainerBuilder $builder): array
-    {
-        $services = [];
-        foreach ($serviceIds as $serviceId) {
-            $service = str_replace('\\', '', $serviceId);
-            $service = str_replace('.', '', $service);
-
-            if (
-                false === stripos($service, $search) ||
-                str_starts_with($service, '.') ||
-                false !== strpos($service, ' ')) {
-                continue;
-            }
-
-            $services[] = $serviceId;
-
-            if ($builder->hasAlias($serviceId)) {
-                $services[] = (string) $builder->getAlias($serviceId);
-            }
+            $suggestions->suggestValues(array_filter($builder->getServiceIds(), [$this, 'filterToServiceTypes']));
         }
-
-        return $services;
     }
 }
@@ -117,24 +117,20 @@ public function testNotConfusedByClassAliases()
      */
     public function testComplete(array $input, array $expectedSuggestions)
     {
-        $kernel = static::bootKernel(['test_case' => 'BundlePaths']);
+        $kernel = static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);
         $command = (new Application($kernel))->add(new DebugAutowiringCommand());
 
         $tester = new CommandCompletionTester($command);
 
         $suggestions = $tester->complete($input);
 
-        $this->assertSame($expectedSuggestions, $suggestions);
+        foreach ($expectedSuggestions as $expectedSuggestion) {
+            $this->assertContains($expectedSuggestion, $suggestions);
+        }
     }
 
     public function provideCompletionSuggestions(): \Generator
     {
-        yield 'search' => [
-            ['twig'],
-            [
-                'Twig\Environment',
-                'twig',
-            ],
-        ];
+        yield 'search' => [[''], ['SessionHandlerInterface', 'Psr\\Log\\LoggerInterface', 'Psr\\Container\\ContainerInterface $parameterBag']];
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -117,24 +117,20 @@ public function testNotConfusedByClassAliases()`
`117`	`117`	`*/`
`118`	`118`	`public function testComplete(array $input, array $expectedSuggestions)`
`119`	`119`	`{`
`120`		`- $kernel = static::bootKernel(['test_case' => 'BundlePaths']);`
	`120`	`+ $kernel = static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml']);`
`121`	`121`	`$command = (new Application($kernel))->add(new DebugAutowiringCommand());`
`122`	`122`
`123`	`123`	`$tester = new CommandCompletionTester($command);`
`124`	`124`
`125`	`125`	`$suggestions = $tester->complete($input);`
`126`	`126`
`127`		`- $this->assertSame($expectedSuggestions, $suggestions);`
	`127`	`+ foreach ($expectedSuggestions as $expectedSuggestion) {`
	`128`	`+ $this->assertContains($expectedSuggestion, $suggestions);`
	`129`	`+ }`
`128`	`130`	`}`
`129`	`131`
`130`	`132`	`public function provideCompletionSuggestions(): \Generator`
`131`	`133`	`{`
`132`		`- yield 'search' => [`
`133`		`- ['twig'],`
`134`		`- [`
`135`		`- 'Twig\Environment',`
`136`		`- 'twig',`
`137`		`- ],`
`138`		`- ];`
	`134`	`+ yield 'search' => [[''], ['SessionHandlerInterface', 'Psr\\Log\\LoggerInterface', 'Psr\\Container\\ContainerInterface $parameterBag']];`
`139`	`135`	`}`
`140`	`136`	`}`