Added completed event and fixed using of incorrect event names.

Author: psmeets-devnl

src/Events/CompletedEvent.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace Brexis\LaravelWorkflow\Events;
+
+class CompletedEvent extends BaseEvent
+{
+
+}

src/Events/WorkflowSubscriber.php

@@ -24,7 +24,9 @@ public function leaveEvent(Event $event)
         event(new LeaveEvent($event));
         event('workflow.leave', $event);
         event('workflow.' . $event->getWorkflowName() . '.leave', $event);
-        event('workflow.' . $event->getWorkflowName() . '.leave.' . $event->getTransition()->getName(), $event);
+        foreach ($event->getTransition()->getFroms() as $marking) {
+            event('workflow.' . $event->getWorkflowName() . '.leave.' . $marking, $event);
+        }
     }
 
     public function transitionEvent(Event $event)
@@ -40,17 +42,30 @@ public function enterEvent(Event $event)
         event(new EnterEvent($event));
         event('workflow.enter', $event);
         event('workflow.' . $event->getWorkflowName() . '.enter', $event);
-        event('workflow.' . $event->getWorkflowName() . '.enter.' . $event->getTransition()->getName(), $event);
+        foreach ($event->getTransition()->getTos() as $marking) {
+            event('workflow.' . $event->getWorkflowName() . '.enter.' . $marking, $event);
+        }
     }
 
     public function enteredEvent(Event $event)
     {
         event(new EnteredEvent($event));
         event('workflow.entered', $event);
         event('workflow.' . $event->getWorkflowName() . '.entered', $event);
-        event('workflow.' . $event->getWorkflowName() . '.entered.' . $event->getTransition()->getName(), $event);
+        foreach ($event->getTransition()->getTos() as $marking) {
+            event('workflow.' . $event->getWorkflowName() . '.entered.' . $marking, $event);
+        }
     }
 
+    public function completedEvent(Event $event)
+    {
+        event(new CompletedEvent($event));
+        event('workflow.completed', $event);
+        event('workflow.' . $event->getWorkflowName() . '.completed', $event);
+        event('workflow.' . $event->getWorkflowName() . '.completed.' . $event->getTransition()->getName(), $event);
+    }
+
+
     public static function getSubscribedEvents()
     {
         return [
@@ -59,6 +74,7 @@ public static function getSubscribedEvents()
             'workflow.transition' => ['transitionEvent'],
             'workflow.enter'      => ['enterEvent'],
             'workflow.entered'    => ['enteredEvent'],
+            'workflow.completed'  => ['completedEvent'],
         ];
     }
 }

tests/WorkflowSubscriberTest.php

@@ -2,6 +2,8 @@
 
 namespace Tests {
 
+    use Brexis\LaravelWorkflow\Events\AnnounceEvent;
+    use Brexis\LaravelWorkflow\Events\CompletedEvent;
     use Brexis\LaravelWorkflow\Events\EnteredEvent;
     use Brexis\LaravelWorkflow\Events\EnterEvent;
     use Brexis\LaravelWorkflow\Events\GuardEvent;
@@ -42,6 +44,8 @@ public function testIfWorkflowEmitsEvents()
 
             $workflow->apply($object, 't1');
 
+            $this->assertCount(28, $events);
+
             $this->assertInstanceOf(GuardEvent::class, $events[0]);
             $this->assertEquals('workflow.guard', $events[1]);
             $this->assertEquals('workflow.straight.guard', $events[2]);
@@ -50,7 +54,7 @@ public function testIfWorkflowEmitsEvents()
             $this->assertInstanceOf(LeaveEvent::class, $events[4]);
             $this->assertEquals('workflow.leave', $events[5]);
             $this->assertEquals('workflow.straight.leave', $events[6]);
-            $this->assertEquals('workflow.straight.leave.t1', $events[7]);
+            $this->assertEquals('workflow.straight.leave.a', $events[7]);
 
             $this->assertInstanceOf(TransitionEvent::class, $events[8]);
             $this->assertEquals('workflow.transition', $events[9]);
@@ -60,12 +64,22 @@ public function testIfWorkflowEmitsEvents()
             $this->assertInstanceOf(EnterEvent::class, $events[12]);
             $this->assertEquals('workflow.enter', $events[13]);
             $this->assertEquals('workflow.straight.enter', $events[14]);
-            $this->assertEquals('workflow.straight.enter.t1', $events[15]);
+            $this->assertEquals('workflow.straight.enter.b', $events[15]);
 
             $this->assertInstanceOf(EnteredEvent::class, $events[16]);
             $this->assertEquals('workflow.entered', $events[17]);
             $this->assertEquals('workflow.straight.entered', $events[18]);
-            $this->assertEquals('workflow.straight.entered.t1', $events[19]);
+            $this->assertEquals('workflow.straight.entered.b', $events[19]);
+
+            $this->assertInstanceOf(CompletedEvent::class, $events[20]);
+            $this->assertEquals('workflow.completed', $events[21]);
+            $this->assertEquals('workflow.straight.completed', $events[22]);
+            $this->assertEquals('workflow.straight.completed.t1', $events[23]);
+
+            $this->assertInstanceOf(GuardEvent::class, $events[24]);
+            $this->assertEquals('workflow.guard', $events[25]);
+            $this->assertEquals('workflow.straight.guard', $events[26]);
+            $this->assertEquals('workflow.straight.guard.t2', $events[27]);
         }
     }
 }