bug #31331 [Workflow] Fixed dumping when many transition with same name exist (lyrixx)

This PR was merged into the 3.4 branch.

Discussion
----------

[Workflow] Fixed dumping when many transition with same name exist

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no>
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

---

With this configuration:

```yaml
framework:
    workflows:
        foobar:
            type: workflow
            supports:
                - stdClass
            initial_place: a
            places:
                - a
                - b
                - c
                - cancelled
            transitions:
                -   name: a-b
                    from: a
                    to: b
                -   name: b-c
                    from: b
                    to: c
                -   name: cancel
                    from: a
                    to: cancelled
                -   name: cancel
                    from: b
                    to: cancelled
                -   name: cancel
                    from: c
                    to: cancelled
```

before:
![workflow-broken](https://user-images.githubusercontent.com/408368/56969037-a0315500-6b64-11e9-917e-4c45820938cc.png)

After:
![workflow-fixed](https://user-images.githubusercontent.com/408368/56969047-a4f60900-6b64-11e9-8f07-30e701a4978f.png)

Commits
-------

312a456e04 [Workflow] Fixed dumping when many transition with same name exist
This commit is contained in:
Fabien Potencier 2019-05-01 08:26:53 +02:00
commit 885d08c1f5
2 changed files with 68 additions and 61 deletions

View File

@ -120,8 +120,8 @@ class GraphvizDumper implements DumperInterface
{
$code = '';
foreach ($transitions as $place) {
$code .= sprintf(" transition_%s [label=\"%s\", shape=box%s];\n", $this->dotize($place['name']), $place['name'], $this->addAttributes($place['attributes']));
foreach ($transitions as $i => $place) {
$code .= sprintf(" transition_%d [label=\"%s\", shape=box%s];\n", $this->dotize($i), $place['name'], $this->addAttributes($place['attributes']));
}
return $code;
@ -134,12 +134,13 @@ class GraphvizDumper implements DumperInterface
{
$dotEdges = [];
foreach ($definition->getTransitions() as $transition) {
foreach ($definition->getTransitions() as $i => $transition) {
foreach ($transition->getFroms() as $from) {
$dotEdges[] = [
'from' => $from,
'to' => $transition->getName(),
'direction' => 'from',
'transition_number' => $i,
];
}
foreach ($transition->getTos() as $to) {
@ -147,6 +148,7 @@ class GraphvizDumper implements DumperInterface
'from' => $transition->getName(),
'to' => $to,
'direction' => 'to',
'transition_number' => $i,
];
}
}
@ -162,12 +164,17 @@ class GraphvizDumper implements DumperInterface
$code = '';
foreach ($edges as $edge) {
$code .= sprintf(" %s_%s -> %s_%s [style=\"solid\"];\n",
'from' === $edge['direction'] ? 'place' : 'transition',
$this->dotize($edge['from']),
'from' === $edge['direction'] ? 'transition' : 'place',
$this->dotize($edge['to'])
);
if ('from' === $edge['direction']) {
$code .= sprintf(" place_%s -> transition_%d [style=\"solid\"];\n",
$this->dotize($edge['from']),
$this->dotize($edge['transition_number'])
);
} else {
$code .= sprintf(" transition_%d -> place_%s [style=\"solid\"];\n",
$this->dotize($edge['transition_number']),
$this->dotize($edge['to'])
);
}
}
return $code;

View File

@ -73,26 +73,26 @@ class GraphvizDumperTest extends TestCase
place_e [label="e", shape=circle];
place_f [label="f", shape=circle];
place_g [label="g", shape=circle];
transition_t1 [label="t1", shape=box, shape="box", regular="1"];
transition_t2 [label="t2", shape=box, shape="box", regular="1"];
transition_t3 [label="t3", shape=box, shape="box", regular="1"];
transition_t4 [label="t4", shape=box, shape="box", regular="1"];
transition_t5 [label="t5", shape=box, shape="box", regular="1"];
transition_t6 [label="t6", shape=box, shape="box", regular="1"];
place_a -> transition_t1 [style="solid"];
transition_t1 -> place_b [style="solid"];
transition_t1 -> place_c [style="solid"];
place_b -> transition_t2 [style="solid"];
place_c -> transition_t2 [style="solid"];
transition_t2 -> place_d [style="solid"];
place_d -> transition_t3 [style="solid"];
transition_t3 -> place_e [style="solid"];
place_d -> transition_t4 [style="solid"];
transition_t4 -> place_f [style="solid"];
place_e -> transition_t5 [style="solid"];
transition_t5 -> place_g [style="solid"];
place_f -> transition_t6 [style="solid"];
transition_t6 -> place_g [style="solid"];
transition_0 [label="t1", shape=box, shape="box", regular="1"];
transition_1 [label="t2", shape=box, shape="box", regular="1"];
transition_2 [label="t3", shape=box, shape="box", regular="1"];
transition_3 [label="t4", shape=box, shape="box", regular="1"];
transition_4 [label="t5", shape=box, shape="box", regular="1"];
transition_5 [label="t6", shape=box, shape="box", regular="1"];
place_a -> transition_0 [style="solid"];
transition_0 -> place_b [style="solid"];
transition_0 -> place_c [style="solid"];
place_b -> transition_1 [style="solid"];
place_c -> transition_1 [style="solid"];
transition_1 -> place_d [style="solid"];
place_d -> transition_2 [style="solid"];
transition_2 -> place_e [style="solid"];
place_d -> transition_3 [style="solid"];
transition_3 -> place_f [style="solid"];
place_e -> transition_4 [style="solid"];
transition_4 -> place_g [style="solid"];
place_f -> transition_5 [style="solid"];
transition_5 -> place_g [style="solid"];
}
';
}
@ -107,12 +107,12 @@ class GraphvizDumperTest extends TestCase
place_a [label="a", shape=circle, style="filled"];
place_b [label="b", shape=circle];
place_c [label="c", shape=circle, color="#FF0000", shape="doublecircle"];
transition_t1 [label="t1", shape=box, shape="box", regular="1"];
transition_t2 [label="t2", shape=box, shape="box", regular="1"];
place_a -> transition_t1 [style="solid"];
transition_t1 -> place_b [style="solid"];
place_b -> transition_t2 [style="solid"];
transition_t2 -> place_c [style="solid"];
transition_0 [label="t1", shape=box, shape="box", regular="1"];
transition_1 [label="t2", shape=box, shape="box", regular="1"];
place_a -> transition_0 [style="solid"];
transition_0 -> place_b [style="solid"];
place_b -> transition_1 [style="solid"];
transition_1 -> place_c [style="solid"];
}
';
}
@ -131,26 +131,26 @@ class GraphvizDumperTest extends TestCase
place_e [label="e", shape=circle];
place_f [label="f", shape=circle];
place_g [label="g", shape=circle];
transition_t1 [label="t1", shape=box, shape="box", regular="1"];
transition_t2 [label="t2", shape=box, shape="box", regular="1"];
transition_t3 [label="t3", shape=box, shape="box", regular="1"];
transition_t4 [label="t4", shape=box, shape="box", regular="1"];
transition_t5 [label="t5", shape=box, shape="box", regular="1"];
transition_t6 [label="t6", shape=box, shape="box", regular="1"];
place_a -> transition_t1 [style="solid"];
transition_t1 -> place_b [style="solid"];
transition_t1 -> place_c [style="solid"];
place_b -> transition_t2 [style="solid"];
place_c -> transition_t2 [style="solid"];
transition_t2 -> place_d [style="solid"];
place_d -> transition_t3 [style="solid"];
transition_t3 -> place_e [style="solid"];
place_d -> transition_t4 [style="solid"];
transition_t4 -> place_f [style="solid"];
place_e -> transition_t5 [style="solid"];
transition_t5 -> place_g [style="solid"];
place_f -> transition_t6 [style="solid"];
transition_t6 -> place_g [style="solid"];
transition_0 [label="t1", shape=box, shape="box", regular="1"];
transition_1 [label="t2", shape=box, shape="box", regular="1"];
transition_2 [label="t3", shape=box, shape="box", regular="1"];
transition_3 [label="t4", shape=box, shape="box", regular="1"];
transition_4 [label="t5", shape=box, shape="box", regular="1"];
transition_5 [label="t6", shape=box, shape="box", regular="1"];
place_a -> transition_0 [style="solid"];
transition_0 -> place_b [style="solid"];
transition_0 -> place_c [style="solid"];
place_b -> transition_1 [style="solid"];
place_c -> transition_1 [style="solid"];
transition_1 -> place_d [style="solid"];
place_d -> transition_2 [style="solid"];
transition_2 -> place_e [style="solid"];
place_d -> transition_3 [style="solid"];
transition_3 -> place_f [style="solid"];
place_e -> transition_4 [style="solid"];
transition_4 -> place_g [style="solid"];
place_f -> transition_5 [style="solid"];
transition_5 -> place_g [style="solid"];
}
';
}
@ -165,12 +165,12 @@ class GraphvizDumperTest extends TestCase
place_a [label="a", shape=circle, style="filled"];
place_b [label="b", shape=circle];
place_c [label="c", shape=circle];
transition_t1 [label="t1", shape=box, shape="box", regular="1"];
transition_t2 [label="t2", shape=box, shape="box", regular="1"];
place_a -> transition_t1 [style="solid"];
transition_t1 -> place_b [style="solid"];
place_b -> transition_t2 [style="solid"];
transition_t2 -> place_c [style="solid"];
transition_0 [label="t1", shape=box, shape="box", regular="1"];
transition_1 [label="t2", shape=box, shape="box", regular="1"];
place_a -> transition_0 [style="solid"];
transition_0 -> place_b [style="solid"];
place_b -> transition_1 [style="solid"];
transition_1 -> place_c [style="solid"];
}
';
}