Merge pull request #5 from laurenkt/master

Add support for multiple transitions with the same name
brexis · Nov 17, 2017 · 18f73ed · 18f73ed
2 parents 876075f + 05a41c4
commit 18f73ed
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 1 deletion.
diff --git a/src/WorkflowRegistry.php b/src/WorkflowRegistry.php
@@ -48,6 +48,10 @@ public function __construct(array $config)
             $builder = new DefinitionBuilder($workflowData['places']);
 
             foreach ($workflowData['transitions'] as $transitionName => $transition) {
+                if (!is_string($transitionName)) {
+                    $transitionName = $transition['name'];
+                }
+
                 $builder->addTransition(new Transition($transitionName, $transition['from'], $transition['to']));
             }
 

diff --git a/tests/WorkflowRegistryTest.php b/tests/WorkflowRegistryTest.php
@@ -79,4 +79,50 @@ public function testIfStateMachineIsRegistered()
         $this->assertTrue($workflow instanceof StateMachine);
         $this->assertTrue($markingStore instanceof MultipleStateMarkingStore);
     }
+
+	public function testIfTransitionsWithSameNameCanBothBeUsed()
+	{
+        $config = [
+            'straight' => [
+                'type'        => 'state_machine',
+                'supports'    => ['Tests\Fixtures\TestObject'],
+                'places'      => ['a', 'b', 'c'],
+                'transitions' => [
+                    [
+                        'name' => 't1',
+                        'from' => 'a',
+                        'to'   => 'b',
+                    ],
+                    [
+                        'name' => 't1',
+                        'from' => 'c',
+                        'to'   => 'b',
+                    ],
+                    [
+                        'name' => 't2',
+                        'from' => 'b',
+                        'to'   => 'c',
+                    ]
+                ],
+            ]
+        ];
+
+        $registry = new WorkflowRegistry($config);
+        $subject  = new TestObject;
+        $workflow = $registry->get($subject);
+
+        $markingStoreProp = new ReflectionProperty(Workflow::class, 'markingStore');
+        $markingStoreProp->setAccessible(true);
+
+        $markingStore = $markingStoreProp->getValue($workflow);
+
+        $this->assertTrue($workflow instanceof StateMachine);
+        $this->assertTrue($markingStore instanceof SingleStateMarkingStore);
+        $this->assertTrue($workflow->can($subject, 't1'));
+
+        $workflow->apply($subject, 't1');
+        $workflow->apply($subject, 't2');
+
+        $this->assertTrue($workflow->can($subject, 't1'));
+    }
 }
diff --git a/tests/WorkflowSubscriberTest.php b/tests/WorkflowSubscriberTest.php
@@ -7,10 +7,12 @@
 
     class WorkflowSubscriberTest extends TestCase
     {
-        public function testIfWorkflowIsRegisrter()
+        public function testIfWorkflowEmitsEvents()
         {
             global $events;
 
+            $events = [];
+
             $config     = [
             'straight'   => [
                 'supports'      => ['Tests\Fixtures\TestObject'],