Merge branch '6.1' into 6.2

* 6.1:
  Fix integration test gha
  Update RedisTrait.php
  Use static methods inside data providers
  [VarExporter] Fix exporting classes with __unserialize() but not __serialize()
  [Validator] Fix IBAN format for Tunisia and Mauritania
  [Workflow] Allow spaces in place names so the PUML dump doesn't break

Author: nicolas-grekas

Dumper/PlantUmlDumper.php

@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Workflow\Dumper;
 
-use InvalidArgumentException;
 use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Marking;
 use Symfony\Component\Workflow\Metadata\MetadataStoreInterface;
@@ -57,7 +56,7 @@ class PlantUmlDumper implements DumperInterface
     public function __construct(string $transitionType)
     {
         if (!\in_array($transitionType, self::TRANSITION_TYPES, true)) {
-            throw new InvalidArgumentException("Transition type '$transitionType' does not exist.");
+            throw new \InvalidArgumentException("Transition type '$transitionType' does not exist.");
         }
         $this->transitionType = $transitionType;
     }
@@ -209,9 +208,7 @@ private function getState(string $place, Definition $definition, Marking $markin
 
         $description = $workflowMetadata->getMetadata('description', $place);
         if (null !== $description) {
-            $output .= ' as '.$place.
-                \PHP_EOL.
-                $place.' : '.$description;
+            $output .= \PHP_EOL.$placeEscaped.' : '.$description;
         }
 
         return $output;

Tests/Dumper/PlantUmlDumperTest.php

@@ -12,9 +12,12 @@
 namespace Symfony\Component\Workflow\Tests\Dumper;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Workflow\Definition;
 use Symfony\Component\Workflow\Dumper\PlantUmlDumper;
 use Symfony\Component\Workflow\Marking;
+use Symfony\Component\Workflow\Metadata\InMemoryMetadataStore;
 use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait;
+use Symfony\Component\Workflow\Transition;
 
 class PlantUmlDumperTest extends TestCase
 {
@@ -63,6 +66,34 @@ public function provideStateMachineDefinitionWithoutMarking()
         yield [$this->createComplexStateMachineDefinition(), $marking, 'complex-state-machine-marking', 'SimpleDiagram'];
     }
 
+    public function testDumpWorkflowWithSpacesInTheStateNamesAndDescription()
+    {
+        $dumper = new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION);
+
+        // The graph looks like:
+        //
+        // +---------+  t 1   +----------+  |
+        // | place a | -----> | place b  |  |
+        // +---------+        +----------+  |
+        $places = ['place a', 'place b'];
+
+        $transitions = [];
+        $transition = new Transition('t 1', 'place a', 'place b');
+        $transitions[] = $transition;
+
+        $placesMetadata = [];
+        $placesMetadata['place a'] = [
+            'description' => 'My custom place description',
+        ];
+        $inMemoryMetadataStore = new InMemoryMetadataStore([], $placesMetadata);
+        $definition = new Definition($places, $transitions, null, $inMemoryMetadataStore);
+
+        $dump = $dumper->dump($definition, null, ['title' => 'SimpleDiagram']);
+        $dump = str_replace(\PHP_EOL, "\n", $dump.\PHP_EOL);
+        $file = $this->getFixturePath('simple-workflow-with-spaces', PlantUmlDumper::WORKFLOW_TRANSITION);
+        $this->assertStringEqualsFile($file, $dump);
+    }
+
     private function getFixturePath($name, $transitionType)
     {
         return __DIR__.'/../fixtures/puml/'.$transitionType.'/'.$name.'.puml';

Tests/fixtures/puml/square/simple-workflow-marking.puml

@@ -17,8 +17,8 @@ skinparam agent {
 }
 state "a" <<initial>>
 state "b" <<marked>>
-state "c" <<DeepSkyBlue>> as c
-c : My custom place description
+state "c" <<DeepSkyBlue>>
+"c" : My custom place description
 agent "t1"
 agent "t2"
 "a" -[#Purple]-> "t1": "<font color=Grey>My custom transition label 2</font>"

Tests/fixtures/puml/square/simple-workflow-nomarking.puml

@@ -17,8 +17,8 @@ skinparam agent {
 }
 state "a" <<initial>>
 state "b"
-state "c" <<DeepSkyBlue>> as c
-c : My custom place description
+state "c" <<DeepSkyBlue>>
+"c" : My custom place description
 agent "t1"
 agent "t2"
 "a" -[#Purple]-> "t1": "<font color=Grey>My custom transition label 2</font>"

Tests/fixtures/puml/square/simple-workflow-with-spaces.puml

@@ -0,0 +1,23 @@
+@startuml
+allow_mixing
+title SimpleDiagram
+skinparam titleBorderRoundCorner 15
+skinparam titleBorderThickness 2
+skinparam state {
+    BackgroundColor<<initial>> #87b741
+    BackgroundColor<<marked>> #3887C6
+    BorderColor #3887C6
+    BorderColor<<marked>> Black
+    FontColor<<marked>> White
+}
+skinparam agent {
+    BackgroundColor #ffffff
+    BorderColor #3887C6
+}
+state "place a" <<initial>>
+"place a" : My custom place description
+state "place b"
+agent "t 1"
+"place a" --> "t 1"
+"t 1" --> "place b"
+@enduml