Merge

Author: brexis

composer.json

@@ -1,15 +1,15 @@
 {
     "name": "brexis/laravel-workflow",
     "description": "Integerate Symfony Workflow component into Laravel.",
-    "keywords": ["workflow", "symfony", "laravel", "laravel5"],
+    "keywords": ["workflow", "symfony", "laravel", "laravel5", "laravel6"],
     "license": "MIT",
     "require": {
         "php": ">=5.5.9",
         "symfony/workflow": "^3.3 || ^4.0",
         "symfony/process": "^3.3 || ^4.0",
         "symfony/event-dispatcher": "^3.3 || ^4.0",
-        "illuminate/console": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*",
-        "illuminate/support": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.*"
+        "illuminate/console": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*",
+        "illuminate/support": "5.3.* || 5.4.* || 5.5.* || 5.6.* || 5.7.* || 5.8.* || 6.*"
     },
     "autoload": {
         "psr-4": {
@@ -36,6 +36,6 @@
     },
     "require-dev": {
         "mockery/mockery": "^1.0",
-        "phpunit/phpunit": "^6.0 || ~7.0"
+        "phpunit/phpunit": "^6.0 || ~7.0 || ^8.0"
     }
 }

tests/WorkflowSubscriberTest.php

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