Merge branch '5.4' into 6.0

* 5.4:
  [Console] Restore psr/log >= 3.0 conflict
  [Security] Make the abstract Voter class implement CacheableVoterInterface
  Add generic types to traversable implementations
  [Security] Fix TypeError message
  [Security] Fix deprecation layer
  [FrameworkBundle] Add completion for workflow:dump
  Fix cancel button
  Fix misleading error on missing provider with authenticator manager
  Don't limit retries of toolbar loading

Author: derrabus

Command/WorkflowDumpCommand.php

@@ -13,6 +13,8 @@
 
 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;
@@ -32,6 +34,21 @@
 #[AsCommand(name: 'workflow:dump', description: 'Dump a workflow')]
 class WorkflowDumpCommand extends Command
 {
+    private array $workflows = [];
+
+    private const DUMP_FORMAT_OPTIONS = [
+        'puml',
+        'mermaid',
+        'dot',
+    ];
+
+    public function __construct(array $workflows)
+    {
+        parent::__construct();
+
+        $this->workflows = $workflows;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -42,7 +59,7 @@ protected function configure()
                 new InputArgument('name', InputArgument::REQUIRED, 'A workflow name'),
                 new InputArgument('marking', InputArgument::IS_ARRAY, 'A marking (a list of places)'),
                 new InputOption('label', 'l', InputOption::VALUE_REQUIRED, 'Label a graph'),
-                new InputOption('dump-format', null, InputOption::VALUE_REQUIRED, 'The dump format [dot|puml]', 'dot'),
+                new InputOption('dump-format', null, InputOption::VALUE_REQUIRED, 'The dump format ['.implode('|', self::DUMP_FORMAT_OPTIONS).']', 'dot'),
             ])
             ->setHelp(<<<'EOF'
 The <info>%command.name%</info> command dumps the graphical representation of a
@@ -61,19 +78,14 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $container = $this->getApplication()->getKernel()->getContainer();
-        $serviceId = $input->getArgument('name');
-
-        if ($container->has('workflow.'.$serviceId)) {
-            $workflow = $container->get('workflow.'.$serviceId);
-            $type = 'workflow';
-        } elseif ($container->has('state_machine.'.$serviceId)) {
-            $workflow = $container->get('state_machine.'.$serviceId);
-            $type = 'state_machine';
-        } else {
-            throw new InvalidArgumentException(sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $serviceId));
+        $workflowId = $input->getArgument('name');
+
+        if (!\in_array($workflowId, array_keys($this->workflows), true)) {
+            throw new InvalidArgumentException(sprintf('No service found for "workflow.%1$s" nor "state_machine.%1$s".', $workflowId));
         }
 
+        $type = explode('.', $workflowId)[0];
+
         switch ($input->getOption('dump-format')) {
             case 'puml':
                 $transitionType = 'workflow' === $type ? PlantUmlDumper::WORKFLOW_TRANSITION : PlantUmlDumper::STATEMACHINE_TRANSITION;
@@ -96,15 +108,28 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $marking->mark($place);
         }
 
+        $workflow = $this->workflows[$workflowId];
+
         $options = [
-            'name' => $serviceId,
+            'name' => $workflowId,
             'nofooter' => true,
             'graph' => [
                 'label' => $input->getOption('label'),
             ],
         ];
-        $output->writeln($dumper->dump($workflow->getDefinition(), $marking, $options));
+        $output->writeln($dumper->dump($workflow, $marking, $options));
 
         return 0;
     }
+
+    public function complete(CompletionInput $input, CompletionSuggestions $suggestions): void
+    {
+        if ($input->mustSuggestArgumentValuesFor('name')) {
+            $suggestions->suggestValues(array_keys($this->workflows));
+        }
+
+        if ($input->mustSuggestOptionValuesFor('dump-format')) {
+            $suggestions->suggestValues(self::DUMP_FORMAT_OPTIONS);
+        }
+    }
 }

DependencyInjection/FrameworkExtension.php

@@ -789,6 +789,8 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
 
         $registryDefinition = $container->getDefinition('workflow.registry');
 
+        $workflows = [];
+
         foreach ($config['workflows'] as $name => $workflow) {
             $type = $workflow['type'];
             $workflowId = sprintf('%s.%s', $type, $name);
@@ -876,6 +878,8 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
             $definitionDefinition->addArgument($initialMarking);
             $definitionDefinition->addArgument(new Reference(sprintf('%s.metadata_store', $workflowId)));
 
+            $workflows[$workflowId] = $definitionDefinition;
+
             // Create MarkingStore
             if (isset($workflow['marking_store']['type'])) {
                 $markingStoreDefinition = new ChildDefinition('workflow.marking_store.method');
@@ -963,6 +967,9 @@ private function registerWorkflowConfiguration(array $config, ContainerBuilder $
                 $container->setParameter('workflow.has_guard_listeners', true);
             }
         }
+
+        $commandDumpDefinition = $container->getDefinition('console.command.workflow_dump');
+        $commandDumpDefinition->setArgument(0, $workflows);
     }
 
     private function registerDebugConfiguration(array $config, ContainerBuilder $container, PhpFileLoader $loader)

Tests/Command/WorkflowDumpCommandTest.php

@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Bundle\FrameworkBundle\Tests\Command;
+
+use PHPUnit\Framework\TestCase;
+use Symfony\Bundle\FrameworkBundle\Command\WorkflowDumpCommand;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Tester\CommandCompletionTester;
+
+class WorkflowDumpCommandTest extends TestCase
+{
+    /**
+     * @dataProvider provideCompletionSuggestions
+     */
+    public function testComplete(array $input, array $expectedSuggestions)
+    {
+        $application = new Application();
+        $application->add(new WorkflowDumpCommand([]));
+
+        $tester = new CommandCompletionTester($application->find('workflow:dump'));
+        $suggestions = $tester->complete($input, 2);
+        $this->assertSame($expectedSuggestions, $suggestions);
+    }
+
+    public function provideCompletionSuggestions(): iterable
+    {
+        yield 'option --dump-format' => [['--dump-format', ''], ['puml', 'mermaid', 'dot']];
+    }
+}