Merge pull request #246 from delboy1978uk/hotfix/209

Hotfix/209
thephpleague · Jun 30, 2019 · 68685b6 · 68685b6
2 parents 773bb4e + 0f86c33
commit 68685b6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -7,7 +7,6 @@
 use League\Route\Http\Exception\{MethodNotAllowedException, NotFoundException};
 use League\Route\Middleware\{MiddlewareAwareInterface, MiddlewareAwareTrait};
 use League\Route\Strategy\{StrategyAwareInterface, StrategyAwareTrait};
-use OutOfBoundsException;
 use Psr\Http\Message\{ResponseInterface, ServerRequestInterface};
 use Psr\Http\Server\RequestHandlerInterface;
 
@@ -54,10 +53,6 @@ public function handle(ServerRequestInterface $request) : ResponseInterface
     {
         $middleware = $this->shiftMiddleware();
 
-        if (is_null($middleware)) {
-            throw new OutOfBoundsException('Reached end of middleware stack. Does your controller return a response?');
-        }
-
         return $middleware->process($request, $this);
     }
 

diff --git a/src/Middleware/MiddlewareAwareTrait.php b/src/Middleware/MiddlewareAwareTrait.php
@@ -2,6 +2,7 @@
 
 namespace League\Route\Middleware;
 
+use OutOfBoundsException;
 use Psr\Http\Server\MiddlewareInterface;
 
 trait MiddlewareAwareTrait
@@ -48,7 +49,13 @@ public function prependMiddleware(MiddlewareInterface $middleware) : MiddlewareA
      */
     public function shiftMiddleware() : MiddlewareInterface
     {
-        return array_shift($this->middleware);
+        $middleware =  array_shift($this->middleware);
+
+        if (is_null($middleware)) {
+            throw new OutOfBoundsException('Reached end of middleware stack. Does your controller return a response?');
+        }
+
+        return $middleware;
     }
 
     /**