Edge case for $current being empty, handled

Author: nilportugues

src/CommandBus/CommandBus.php

@@ -34,7 +34,7 @@ public function __invoke(Command $command, callable $next = null)
         $middleware = $this->middleware;
         $current = array_shift($middleware);
 
-        if (empty($middleware)) {
+        if (empty($middleware) && !empty($current)) {
             $current->__invoke($command);
             return;
         }
@@ -47,6 +47,5 @@ public function __invoke(Command $command, callable $next = null)
             $current->__invoke($command, $callable);
             $current = $commandBusMiddleware;
         }
-        unset($middleware);
     }
 }

src/EventBus/EventBus.php

@@ -37,11 +37,11 @@ public function __invoke(Event $event, callable $next = null)
         $middleware = $this->middleware;
         $current = array_shift($middleware);
 
-        if (empty($middleware)) {
+        if (empty($middleware) && !empty($current)) {
             $current->__invoke($event);
             return;
         }
-        
+
         foreach ($middleware as $eventBusMiddleware) {
             $callable = function ($event) use ($eventBusMiddleware) {
                 return $eventBusMiddleware($event);
@@ -50,6 +50,5 @@ public function __invoke(Event $event, callable $next = null)
             $current->__invoke($event, $callable);
             $current = $eventBusMiddleware;
         }
-        unset($middleware);
     }
 }