verifiers and events should trigger in correct order

Author: AydinHassan

src/Event/EventDispatcher.php

@@ -2,7 +2,6 @@
 
 namespace PhpSchool\PhpWorkshop\Event;
 
-use Assert\Assertion;
 use PhpSchool\PhpWorkshop\Result\ResultInterface;
 use PhpSchool\PhpWorkshop\ResultAggregator;
 
@@ -18,11 +17,6 @@ class EventDispatcher
      */
     private $listeners = [];
 
-    /**
-     * @var array
-     */
-    private $verifiers = [];
-
     /**
      * @var ResultAggregator
      */
@@ -48,19 +42,6 @@ public function dispatch(EventInterface $event)
             }
         }
 
-        if (array_key_exists($event->getName(), $this->verifiers)) {
-            foreach ($this->verifiers[$event->getName()] as $verifier) {
-                $result = $verifier($event);
-
-                //return type hints pls
-                if ($result instanceof ResultInterface) {
-                    $this->resultAggregator->add($result);
-                } else {
-                    //??!!
-                }
-            }
-        }
-
         return $event;
     }
 
@@ -94,14 +75,19 @@ private function attachListener($eventName, callable $callback)
 
     /**
      * @param string $eventName
-     * @param callable $callback
+     * @param callable $verifier
      */
-    public function insertVerifier($eventName, callable $callback)
+    public function insertVerifier($eventName, callable $verifier)
     {
-        if (!array_key_exists($eventName, $this->verifiers)) {
-            $this->verifiers[$eventName] = [$callback];
-        } else {
-            $this->verifiers[$eventName][] = $callback;
-        }
+        $this->attachListener($eventName, function (EventInterface $event) use ($verifier) {
+            $result = $verifier($event);
+
+            //return type hints pls
+            if ($result instanceof ResultInterface) {
+                $this->resultAggregator->add($result);
+            } else {
+                //??!!
+            }
+        });
     }
 }