Merge branch '5.4' into 6.0

* 5.4: (27 commits)
  feat: add completion for DebugAutowiring search argument
  [Routing] Add support for aliasing routes
  [DependencyInjection] only allow `ReflectionNamedType` for `ServiceSubscriberTrait`
  Fix CS
  [Console] Open CompleteCommand for custom outputs
  [Intl] Update the ICU data to 70.1
  [Messenger] Add completion for failed messages commands.
  Fix tests
  Fixing missing full_stack variable that's needed by toolbar.html.twig
  [PropertyInfo] Bump phpstan/phpdoc-parser
  [Security] Backport type fixes
  [VarExporter] escape unicode chars involved in directionality
  [Framework] Add completion to debug:container
  [Messenger] Add completion to command messenger:consume
  [Intl] Update the ICU data to 70.1
  Fix more generic types
  Default access_decision_manager.strategy option with merge.
  Fix typos
  Update validators.ca.xlf
  Add missing Validator translations for Estonian
  ...

Signed-off-by: Alexander M. Turek <[email protected]>

Author: derrabus

Command/ContainerDebugCommand.php

@@ -14,6 +14,8 @@
 use Symfony\Bundle\FrameworkBundle\Console\Helper\DescriptorHelper;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Completion\CompletionInput;
+use Symfony\Component\Console\Completion\CompletionSuggestions;
 use Symfony\Component\Console\Exception\InvalidArgumentException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -188,6 +190,44 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         return 0;
     }
 
+    public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
+    {
+        if ($input->mustSuggestOptionValuesFor('format')) {
+            $helper = new DescriptorHelper();
+            $suggestions->suggestValues($helper->getFormats());
+
+            return;
+        }
+
+        $kernel = $this->getApplication()->getKernel();
+        $object = $this->getContainerBuilder($kernel);
+
+        if ($input->mustSuggestArgumentValuesFor('name')
+            && !$input->getOption('tag') && !$input->getOption('tags')
+            && !$input->getOption('parameter') && !$input->getOption('parameters')
+            && !$input->getOption('env-var') && !$input->getOption('env-vars')
+            && !$input->getOption('types') && !$input->getOption('deprecations')
+        ) {
+            $suggestions->suggestValues($this->findServiceIdsContaining(
+                $object,
+                $input->getCompletionValue(),
+                (bool) $input->getOption('show-hidden')
+            ));
+
+            return;
+        }
+
+        if ($input->mustSuggestOptionValuesFor('tag')) {
+            $suggestions->suggestValues($object->findTags());
+
+            return;
+        }
+
+        if ($input->mustSuggestOptionValuesFor('parameter')) {
+            $suggestions->suggestValues(array_keys($object->getParameterBag()->all()));
+        }
+    }
+
     /**
      * Validates input arguments and options.
      *
@@ -243,7 +283,7 @@ private function findServiceIdsContaining(ContainerBuilder $builder, string $nam
             if (false !== stripos(str_replace('\\', '', $serviceId), $name)) {
                 $foundServiceIdsIgnoringBackslashes[] = $serviceId;
             }
-            if (false !== stripos($serviceId, $name)) {
+            if ('' === $name || false !== stripos($serviceId, $name)) {
                 $foundServiceIds[] = $serviceId;
             }
         }

Command/DebugAutowiringCommand.php

@@ -13,6 +13,8 @@
 
 use Symfony\Bundle\FrameworkBundle\Console\Descriptor\Descriptor;
 use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Completion\CompletionInput;
+use Symfony\Component\Console\Completion\CompletionSuggestions;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
@@ -79,7 +81,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
         $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, '.');
             });
@@ -160,4 +163,13 @@ private function getFileLink(string $class): string
 
         return (string) $this->fileLinkFormatter->format($r->getFileName(), $r->getStartLine());
     }
+
+    public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
+    {
+        if ($input->mustSuggestArgumentValuesFor('search')) {
+            $builder = $this->getContainerBuilder($this->getApplication()->getKernel());
+
+            $suggestions->suggestValues(array_filter($builder->getServiceIds(), [$this, 'filterToServiceTypes']));
+        }
+    }
 }

Resources/config/console.php

@@ -151,6 +151,7 @@
                 service('logger')->nullOnInvalid(),
                 [], // Receiver names
                 service('messenger.listener.reset_services')->nullOnInvalid(),
+                [], // Bus names
             ])
             ->tag('console.command')
             ->tag('monolog.logger', ['channel' => 'messenger'])

Tests/Functional/ContainerDebugCommandTest.php

@@ -14,6 +14,7 @@
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Bundle\FrameworkBundle\Tests\Fixtures\BackslashClass;
 use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\Console\Tester\CommandCompletionTester;
 
 /**
  * @group functional
@@ -211,4 +212,68 @@ public function provideIgnoreBackslashWhenFindingService()
             ['\\'.BackslashClass::class],
         ];
     }
+
+    /**
+     * @dataProvider provideCompletionSuggestions
+     */
+    public function testComplete(array $input, array $expectedSuggestions, array $notExpectedSuggestions = [])
+    {
+        static::bootKernel(['test_case' => 'ContainerDebug', 'root_config' => 'config.yml', 'debug' => true]);
+
+        $application = new Application(static::$kernel);
+        $tester = new CommandCompletionTester($application->find('debug:container'));
+        $suggestions = $tester->complete($input);
+
+        foreach ($expectedSuggestions as $expectedSuggestion) {
+            $this->assertContains($expectedSuggestion, $suggestions);
+        }
+        foreach ($notExpectedSuggestions as $notExpectedSuggestion) {
+            $this->assertNotContains($notExpectedSuggestion, $suggestions);
+        }
+    }
+
+    public function provideCompletionSuggestions()
+    {
+        $serviceId = 'console.command.container_debug';
+        $hiddenServiceId = '.console.command.container_debug.lazy';
+        $interfaceServiceId = 'Symfony\Component\HttpKernel\HttpKernelInterface';
+
+        yield 'name' => [
+            [''],
+            [$serviceId, $interfaceServiceId],
+            [$hiddenServiceId],
+        ];
+
+        yield 'name (with hidden)' => [
+            ['--show-hidden', ''],
+            [$serviceId, $interfaceServiceId, $hiddenServiceId],
+        ];
+
+        yield 'name (with current value)' => [
+            ['--show-hidden', 'console'],
+            [$serviceId, $hiddenServiceId],
+            [$interfaceServiceId],
+        ];
+
+        yield 'name (no suggestion with --tags)' => [
+            ['--tags', ''],
+            [],
+            [$serviceId, $interfaceServiceId, $hiddenServiceId],
+        ];
+
+        yield 'option --tag' => [
+            ['--tag', ''],
+            ['console.command'],
+        ];
+
+        yield 'option --parameter' => [
+            ['--parameter', ''],
+            ['kernel.debug'],
+        ];
+
+        yield 'option --format' => [
+            ['--format', ''],
+            ['txt', 'xml', 'json', 'md'],
+        ];
+    }
 }

Tests/Functional/DebugAutowiringCommandTest.php

@@ -11,8 +11,10 @@
 
 namespace Symfony\Bundle\FrameworkBundle\Tests\Functional;
 
+use Symfony\Bundle\FrameworkBundle\Command\DebugAutowiringCommand;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
 use Symfony\Component\Console\Tester\ApplicationTester;
+use Symfony\Component\Console\Tester\CommandCompletionTester;
 
 /**
  * @group functional
@@ -109,4 +111,26 @@ public function testNotConfusedByClassAliases()
         $tester->run(['command' => 'debug:autowiring', 'search' => 'ClassAlias']);
         $this->assertStringContainsString('Symfony\Bundle\FrameworkBundle\Tests\Fixtures\ClassAliasExampleClass', $tester->getDisplay());
     }
+
+    /**
+     * @dataProvider provideCompletionSuggestions
+     */
+    public function testComplete(array $input, array $expectedSuggestions)
+    {
+        $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);
+
+        foreach ($expectedSuggestions as $expectedSuggestion) {
+            $this->assertContains($expectedSuggestion, $suggestions);
+        }
+    }
+
+    public function provideCompletionSuggestions(): \Generator
+    {
+        yield 'search' => [[''], ['SessionHandlerInterface', 'Psr\\Log\\LoggerInterface', 'Psr\\Container\\ContainerInterface $parameterBag']];
+    }
 }