Rewrote MiddlewareRunner to iterate over the array of middleware instead of creating a new instance of itself for each middleware ran

Author: WyriHaximus

src/MiddlewareRunner.php

@@ -11,15 +11,16 @@ final class MiddlewareRunner
 {
     /**
      * @var callable[]
+     * @internal
      */
-    private $middleware = array();
+    public $middleware = array();
 
     /**
      * @param callable[] $middleware
      */
     public function __construct(array $middleware)
     {
-        $this->middleware = $middleware;
+        $this->middleware = array_values($middleware);
     }
 
     /**
@@ -32,22 +33,34 @@ public function __invoke(ServerRequestInterface $request)
             return Promise\reject(new \RuntimeException('No middleware to run'));
         }
 
-        $middlewareCollection = $this->middleware;
-        $middleware = array_shift($middlewareCollection);
-
-        $cancel = null;
-        return new Promise\Promise(function ($resolve, $reject) use ($middleware, $request, $middlewareCollection, &$cancel) {
-            $cancel = $middleware(
-                $request,
-                new MiddlewareRunner(
-                    $middlewareCollection
-                )
-            );
-            $resolve($cancel);
-        }, function () use (&$cancel) {
-            if ($cancel instanceof Promise\CancellablePromiseInterface) {
-                $cancel->cancel();
-            }
-        });
+        $position = 0;
+
+        $that = $this;
+        $func = function (ServerRequestInterface $request) use (&$func, &$position, &$that) {
+            $middleware = $that->middleware[$position];
+            $response = null;
+            $promise = new Promise\Promise(function ($resolve) use ($middleware, $request, $func, &$response, &$position) {
+                $position++;
+
+                $response = $middleware(
+                    $request,
+                    $func
+                );
+
+                $resolve($response);
+            }, function () use (&$response) {
+                if ($response instanceof Promise\CancellablePromiseInterface) {
+                    $response->cancel();
+                }
+            });
+
+            return $promise->then(null, function ($error) use (&$position) {
+                $position--;
+
+                return Promise\reject($error);
+            });
+        };
+
+        return $func($request);
     }
 }