From 9b946471e0c2f06228efc54618039ad6a395b7a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Pineau?= Date: Fri, 9 Feb 2018 16:32:31 +0100 Subject: [PATCH] [Workflow] Drop nofooter option in PlantUmlDumper (dead code) I also update the test suite: Dumping a worklow with a state machine dumper does not make sense. --- .../Workflow/Dumper/PlantUmlDumper.php | 23 +---- .../Tests/Dumper/PlantUmlDumperTest.php | 86 +++++++------------ ...uml => complex-state-machine-marking.puml} | 7 +- ...l => complex-state-machine-nomarking.puml} | 3 + .../complex-workflow-marking-nofooter.puml | 28 ------ .../puml/arrow/complex-workflow-marking.puml | 37 -------- .../complex-workflow-nomarking-nofooter.puml | 28 ------ .../arrow/complex-workflow-nomarking.puml | 37 -------- .../puml/arrow/simple-workflow-marking.puml | 27 ------ .../puml/arrow/simple-workflow-nomarking.puml | 27 ------ .../complex-workflow-marking-nofooter.puml | 44 ---------- .../puml/square/complex-workflow-marking.puml | 9 -- .../complex-workflow-nomarking-nofooter.puml | 44 ---------- .../square/complex-workflow-nomarking.puml | 9 -- .../simple-workflow-marking-nofooter.puml | 26 ------ .../puml/square/simple-workflow-marking.puml | 9 -- .../simple-workflow-nomarking-nofooter.puml | 26 ------ .../square/simple-workflow-nomarking.puml | 9 -- 18 files changed, 40 insertions(+), 439 deletions(-) rename src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/{simple-workflow-marking-nofooter.puml => complex-state-machine-marking.puml} (82%) rename src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/{simple-workflow-nomarking-nofooter.puml => complex-state-machine-nomarking.puml} (89%) delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking-nofooter.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking-nofooter.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking-nofooter.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking-nofooter.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking-nofooter.puml delete mode 100644 src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking-nofooter.puml diff --git a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php index d0f4bdb225..2acf919ca1 100644 --- a/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php +++ b/src/Symfony/Component/Workflow/Dumper/PlantUmlDumper.php @@ -26,14 +26,6 @@ use Symfony\Component\Workflow\Marking; */ class PlantUmlDumper implements DumperInterface { - private const SYMFONY_LOGO = 'sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -}'; private const INITIAL = '<>'; private const MARKED = '<>'; @@ -62,7 +54,7 @@ knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 public function __construct(string $transitionType = null) { - if (!in_array($transitionType, self::TRANSITION_TYPES)) { + if (!\in_array($transitionType, self::TRANSITION_TYPES, true)) { throw new InvalidArgumentException("Transition type '$transitionType' does not exist."); } $this->transitionType = $transitionType; @@ -121,21 +113,12 @@ knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 $start = '@startuml'.PHP_EOL; $start .= 'allow_mixing'.PHP_EOL; - if ($options['nofooter'] ?? false) { - return $start; - } - - return $start.self::SYMFONY_LOGO.PHP_EOL; + return $start; } private function endPuml(array $options): string { - $end = PHP_EOL.'@enduml'; - if ($options['nofooter'] ?? false) { - return $end; - } - - return PHP_EOL.'footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML**'.$end; + return PHP_EOL.'@enduml'; } private function getLines(array $code): string diff --git a/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php b/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php index 0fae31d689..8469415255 100644 --- a/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php +++ b/src/Symfony/Component/Workflow/Tests/Dumper/PlantUmlDumperTest.php @@ -11,7 +11,6 @@ namespace Symfony\Component\Workflow\Tests\Dumper; use PHPUnit\Framework\TestCase; -use Symfony\Component\Workflow\Dumper\DumperInterface; use Symfony\Component\Workflow\Dumper\PlantUmlDumper; use Symfony\Component\Workflow\Marking; use Symfony\Component\Workflow\Tests\WorkflowBuilderTrait; @@ -20,74 +19,47 @@ class PlantUmlDumperTest extends TestCase { use WorkflowBuilderTrait; - /** - * @var DumperInterface[] - */ - private $dumpers; - - protected function setUp() - { - $this->dumpers = - array( - PlantUmlDumper::STATEMACHINE_TRANSITION => new PlantUmlDumper(PlantUmlDumper::STATEMACHINE_TRANSITION), - PlantUmlDumper::WORKFLOW_TRANSITION => new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION), - ); - } - /** * @dataProvider provideWorkflowDefinitionWithoutMarking */ - public function testDumpWithoutMarking($definition, $expectedFileName, $title, $nofooter) + public function testDumpWorkflowWithoutMarking($definition, $marking, $expectedFileName, $title) { - foreach ($this->dumpers as $transitionType => $dumper) { - $dump = $dumper->dump($definition, null, array('title' => $title, 'nofooter' => $nofooter)); - // handle windows, and avoid to create more fixtures - $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL); - $this->assertStringEqualsFile($this->getFixturePath($expectedFileName, $transitionType), $dump); - } - } - - /** - * @dataProvider provideWorkflowDefinitionWithMarking - */ - public function testDumpWithMarking($definition, $marking, $expectedFileName, $title, $footer) - { - foreach ($this->dumpers as $transitionType => $dumper) { - $dump = $dumper->dump($definition, $marking, array('title' => $title, 'nofooter' => $footer)); - // handle windows, and avoid to create more fixtures - $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL); - $this->assertStringEqualsFile($this->getFixturePath($expectedFileName, $transitionType), $dump); - } + $dumper = new PlantUmlDumper(PlantUmlDumper::WORKFLOW_TRANSITION); + $dump = $dumper->dump($definition, $marking, array('title' => $title)); + // handle windows, and avoid to create more fixtures + $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL); + $file = $this->getFixturePath($expectedFileName, PlantUmlDumper::WORKFLOW_TRANSITION); + $this->assertStringEqualsFile($file, $dump); } public function provideWorkflowDefinitionWithoutMarking() { - $title = 'SimpleDiagram'; - yield array($this->createSimpleWorkflowDefinition(), 'simple-workflow-nomarking-nofooter', $title, true); - yield array($this->createSimpleWorkflowDefinition(), 'simple-workflow-nomarking', $title, false); - $title = 'ComplexDiagram'; - yield array($this->createComplexWorkflowDefinition(), 'complex-workflow-nomarking-nofooter', $title, true); - yield array($this->createComplexWorkflowDefinition(), 'complex-workflow-nomarking', $title, false); + yield array($this->createSimpleWorkflowDefinition(), null, 'simple-workflow-nomarking', 'SimpleDiagram'); + yield array($this->createComplexWorkflowDefinition(), null, 'complex-workflow-nomarking', 'ComplexDiagram'); + $marking = new Marking(array('b' => 1)); + yield array($this->createSimpleWorkflowDefinition(), $marking, 'simple-workflow-marking', 'SimpleDiagram'); + $marking = new Marking(array('c' => 1, 'e' => 1)); + yield array($this->createComplexWorkflowDefinition(), $marking, 'complex-workflow-marking', 'ComplexDiagram'); } - public function provideWorkflowDefinitionWithMarking() + /** + * @dataProvider provideStateMachineDefinitionWithoutMarking + */ + public function testDumpStateMachineWithoutMarking($definition, $marking, $expectedFileName, $title) { - $title = 'SimpleDiagram'; - $marking = new Marking(array('b' => 1)); - yield array( - $this->createSimpleWorkflowDefinition(), $marking, 'simple-workflow-marking-nofooter', $title, true, - ); - yield array( - $this->createSimpleWorkflowDefinition(), $marking, 'simple-workflow-marking', $title, false, - ); - $title = 'ComplexDiagram'; + $dumper = new PlantUmlDumper(PlantUmlDumper::STATEMACHINE_TRANSITION); + $dump = $dumper->dump($definition, $marking, array('title' => $title)); + // handle windows, and avoid to create more fixtures + $dump = str_replace(PHP_EOL, "\n", $dump.PHP_EOL); + $file = $this->getFixturePath($expectedFileName, PlantUmlDumper::STATEMACHINE_TRANSITION); + $this->assertStringEqualsFile($file, $dump); + } + + public function provideStateMachineDefinitionWithoutMarking() + { + yield array($this->createComplexStateMachineDefinition(), null, 'complex-state-machine-nomarking', 'SimpleDiagram'); $marking = new Marking(array('c' => 1, 'e' => 1)); - yield array( - $this->createComplexWorkflowDefinition(), $marking, 'complex-workflow-marking-nofooter', $title, true, - ); - yield array( - $this->createComplexWorkflowDefinition(), $marking, 'complex-workflow-marking', $title, false, - ); + yield array($this->createComplexStateMachineDefinition(), $marking, 'complex-state-machine-marking', 'SimpleDiagram'); } private function getFixturePath($name, $transitionType) diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-marking.puml similarity index 82% rename from src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking-nofooter.puml rename to src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-marking.puml index ba1abf9215..699548ef16 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking-nofooter.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-marking.puml @@ -11,8 +11,11 @@ skinparam state { FontColor<> White } state "a" <> -state "b" <> -state "c" +state "b" +state "c" <> +state "d" "a" --> "b": "t1" +"d" --> "b": "t1" "b" --> "c": "t2" +"b" --> "d": "t3" @enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-nomarking.puml similarity index 89% rename from src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking-nofooter.puml rename to src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-nomarking.puml index a2800a627f..eb91152a46 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking-nofooter.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-state-machine-nomarking.puml @@ -13,6 +13,9 @@ skinparam state { state "a" <> state "b" state "c" +state "d" "a" --> "b": "t1" +"d" --> "b": "t1" "b" --> "c": "t2" +"b" --> "d": "t3" @enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking-nofooter.puml deleted file mode 100644 index c6e43db94b..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking-nofooter.puml +++ /dev/null @@ -1,28 +0,0 @@ -@startuml -allow_mixing -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" -state "c" <> -state "d" -state "e" <> -state "f" -state "g" -"a" --> "b": "t1" -"a" --> "c": "t1" -"b" --> "d": "t2" -"c" --> "d": "t2" -"d" --> "e": "t3" -"d" --> "f": "t4" -"e" --> "g": "t5" -"f" --> "g": "t6" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking.puml deleted file mode 100644 index 8342a9f9de..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-marking.puml +++ /dev/null @@ -1,37 +0,0 @@ -@startuml -allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" -state "c" <> -state "d" -state "e" <> -state "f" -state "g" -"a" --> "b": "t1" -"a" --> "c": "t1" -"b" --> "d": "t2" -"c" --> "d": "t2" -"d" --> "e": "t3" -"d" --> "f": "t4" -"e" --> "g": "t5" -"f" --> "g": "t6" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking-nofooter.puml deleted file mode 100644 index c247438954..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking-nofooter.puml +++ /dev/null @@ -1,28 +0,0 @@ -@startuml -allow_mixing -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" -state "c" -state "d" -state "e" -state "f" -state "g" -"a" --> "b": "t1" -"a" --> "c": "t1" -"b" --> "d": "t2" -"c" --> "d": "t2" -"d" --> "e": "t3" -"d" --> "f": "t4" -"e" --> "g": "t5" -"f" --> "g": "t6" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking.puml deleted file mode 100644 index 160d725468..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/complex-workflow-nomarking.puml +++ /dev/null @@ -1,37 +0,0 @@ -@startuml -allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" -state "c" -state "d" -state "e" -state "f" -state "g" -"a" --> "b": "t1" -"a" --> "c": "t1" -"b" --> "d": "t2" -"c" --> "d": "t2" -"d" --> "e": "t3" -"d" --> "f": "t4" -"e" --> "g": "t5" -"f" --> "g": "t6" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking.puml deleted file mode 100644 index 7546338da3..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-marking.puml +++ /dev/null @@ -1,27 +0,0 @@ -@startuml -allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} -title SimpleDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" <> -state "c" -"a" --> "b": "t1" -"b" --> "c": "t2" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking.puml deleted file mode 100644 index ffe310b4a2..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/arrow/simple-workflow-nomarking.puml +++ /dev/null @@ -1,27 +0,0 @@ -@startuml -allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} -title SimpleDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -state "a" <> -state "b" -state "c" -"a" --> "b": "t1" -"b" --> "c": "t2" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking-nofooter.puml deleted file mode 100644 index 0ae74a7c44..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking-nofooter.puml +++ /dev/null @@ -1,44 +0,0 @@ -@startuml -allow_mixing -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -skinparam agent { - BackgroundColor #ffffff - BorderColor #3887C6 -} -state "a" <> -state "b" -state "c" <> -state "d" -state "e" <> -state "f" -state "g" -agent "t1" -agent "t2" -agent "t3" -agent "t4" -agent "t5" -agent "t6" -"a" --> "t1" -"t1" --> "b" -"t1" --> "c" -"b" --> "t2" -"t2" --> "d" -"c" --> "t2" -"d" --> "t3" -"t3" --> "e" -"d" --> "t4" -"t4" --> "f" -"e" --> "t5" -"t5" --> "g" -"f" --> "t6" -"t6" --> "g" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking.puml index fa7efe91f6..0ae74a7c44 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-marking.puml @@ -1,13 +1,5 @@ @startuml allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} title ComplexDiagram skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 2 @@ -49,5 +41,4 @@ agent "t6" "t5" --> "g" "f" --> "t6" "t6" --> "g" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** @enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking-nofooter.puml deleted file mode 100644 index db3c8bf208..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking-nofooter.puml +++ /dev/null @@ -1,44 +0,0 @@ -@startuml -allow_mixing -title ComplexDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -skinparam agent { - BackgroundColor #ffffff - BorderColor #3887C6 -} -state "a" <> -state "b" -state "c" -state "d" -state "e" -state "f" -state "g" -agent "t1" -agent "t2" -agent "t3" -agent "t4" -agent "t5" -agent "t6" -"a" --> "t1" -"t1" --> "b" -"t1" --> "c" -"b" --> "t2" -"t2" --> "d" -"c" --> "t2" -"d" --> "t3" -"t3" --> "e" -"d" --> "t4" -"t4" --> "f" -"e" --> "t5" -"t5" --> "g" -"f" --> "t6" -"t6" --> "g" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking.puml index aa6c2fee39..db3c8bf208 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/complex-workflow-nomarking.puml @@ -1,13 +1,5 @@ @startuml allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} title ComplexDiagram skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 2 @@ -49,5 +41,4 @@ agent "t6" "t5" --> "g" "f" --> "t6" "t6" --> "g" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** @enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking-nofooter.puml deleted file mode 100644 index f81c44c5c2..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking-nofooter.puml +++ /dev/null @@ -1,26 +0,0 @@ -@startuml -allow_mixing -title SimpleDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -skinparam agent { - BackgroundColor #ffffff - BorderColor #3887C6 -} -state "a" <> -state "b" <> -state "c" -agent "t1" -agent "t2" -"a" --> "t1" -"t1" --> "b" -"b" --> "t2" -"t2" --> "c" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml index 999d8add0f..f81c44c5c2 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-marking.puml @@ -1,13 +1,5 @@ @startuml allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} title SimpleDiagram skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 2 @@ -31,5 +23,4 @@ agent "t2" "t1" --> "b" "b" --> "t2" "t2" --> "c" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** @enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking-nofooter.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking-nofooter.puml deleted file mode 100644 index c677c24f89..0000000000 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking-nofooter.puml +++ /dev/null @@ -1,26 +0,0 @@ -@startuml -allow_mixing -title SimpleDiagram -skinparam titleBorderRoundCorner 15 -skinparam titleBorderThickness 2 -skinparam state { - BackgroundColor<> #87b741 - BackgroundColor<> #3887C6 - BorderColor #3887C6 - BorderColor<> Black - FontColor<> White -} -skinparam agent { - BackgroundColor #ffffff - BorderColor #3887C6 -} -state "a" <> -state "b" -state "c" -agent "t1" -agent "t2" -"a" --> "t1" -"t1" --> "b" -"b" --> "t2" -"t2" --> "c" -@enduml diff --git a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml index 7e57fdd54e..c677c24f89 100644 --- a/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml +++ b/src/Symfony/Component/Workflow/Tests/fixtures/puml/square/simple-workflow-nomarking.puml @@ -1,13 +1,5 @@ @startuml allow_mixing -sprite $sf_logo [81x20/16z] { -hPNRaYiX24K1xwBo_tyx6-qaCtDEJ-KXLYMTLbp0HWcHZr3KRDJ8z94HG3jZn4_mijbQ2ryJoFePtXLWA_qxyGy19DpdY_10z11ZAbGjFHRwcEbcKx5-wqsV -yIMo8StMCHKh8ZUxnEwrZiwRAUOvy1lLcPQF4lEFAjhzMd5WOAqvKflS0Enx8PbihiSYXM8ClGVAseIWTAjCgVSAcnYbQG79xKFsZ0VnDCNc7AVBoPSMcTsX -UnrujbYjjz0NnsObkTgnmolqJD4QgGUYTQiNe8eIjtx4b6Vv8nPGpncn3NJ8Geo9W9VW2wGACm_JzgIO8A8KXr2jUBCVGEAAJSZ6JUlsNnmOzmIYti9G7bjL -8InaHM9G40NkwTG7OxrggvNIejA8AZuqyWjOzTIKi-wwYvjeHYesSWuPiTGDN5THzkYLU4MD5r2_0PDhG7LIUG33z5HtM6CP3icyWEVOS61sD_2ZsBfJdbVA -qM53XHDUwhY0TAwPug3OG9NonRFhO8ynF3I4unuAMDHmSrXH57V1RGvl9jafuZF9ZhqjWOEh98y0tUYGsUxkBSllIyBdT2oM5Fn2-ut-fzsq_cQNuL6Uvwqr -knh4RrvOKzxZfLV3s0rs_R_1SdYt3VxeQ1_y2_W2 -} title SimpleDiagram skinparam titleBorderRoundCorner 15 skinparam titleBorderThickness 2 @@ -31,5 +23,4 @@ agent "t2" "t1" --> "b" "b" --> "t2" "t2" --> "c" -footer \nGenerated by <$sf_logo> **Workflow Component** and **PlantUML** @enduml