Fix #29: Defer middleware creation when building a stack (#32)

yiiliveext · web-flow · commit 986a4e903a9c · 2021-06-09T17:57:35.000+03:00
diff --git a/src/MiddlewareDispatcher.php b/src/MiddlewareDispatcher.php
@@ -87,13 +87,13 @@ public function hasMiddlewares(): bool
     }
 
     /**
-     * @return MiddlewareInterface[]
+     * @return \Closure[]
      */
     private function buildMiddlewares(): array
     {
         $middlewares = [];
         foreach ($this->middlewareDefinitions as $middlewareDefinition) {
-            $middlewares[] = $this->middlewareFactory->create($middlewareDefinition);
+            $middlewares[] = fn (): MiddlewareInterface => $this->middlewareFactory->create($middlewareDefinition);
         }
 
         return $middlewares;
diff --git a/src/MiddlewareStack.php b/src/MiddlewareStack.php
@@ -4,6 +4,7 @@
 
 namespace Yiisoft\Middleware\Dispatcher;
 
+use Closure;
 use Psr\EventDispatcher\EventDispatcherInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -27,7 +28,7 @@ final class MiddlewareStack implements RequestHandlerInterface
     private array $middlewares;
 
     /**
-     * @param MiddlewareInterface[] $middlewares Middlewares.
+     * @param Closure[] $middlewares Middlewares.
      * @param RequestHandlerInterface $fallbackHandler Fallback handler
      * @param EventDispatcherInterface $eventDispatcher Event dispatcher to use for triggering before/after middleware
      * events.
@@ -57,7 +58,7 @@ private function build(): void
     {
         $handler = $this->fallbackHandler;
 
-        /** @var  MiddlewareInterface $middleware */
+        /** @var  Closure $middleware */
         foreach ($this->middlewares as $middleware) {
             $handler = $this->wrap($middleware, $handler);
         }
@@ -68,15 +69,15 @@ private function build(): void
     /**
      * Wrap handler by middlewares.
      */
-    private function wrap(MiddlewareInterface $middleware, RequestHandlerInterface $handler): RequestHandlerInterface
+    private function wrap(Closure $middleware, RequestHandlerInterface $handler): RequestHandlerInterface
     {
         return new class($middleware, $handler, $this->eventDispatcher) implements RequestHandlerInterface {
-            private MiddlewareInterface $middleware;
+            private Closure $middleware;
             private RequestHandlerInterface $handler;
             private EventDispatcherInterface $eventDispatcher;
 
             public function __construct(
-                MiddlewareInterface $middleware,
+                Closure $middleware,
                 RequestHandlerInterface $handler,
                 EventDispatcherInterface $eventDispatcher
             ) {
@@ -87,12 +88,14 @@ public function __construct(
 
             public function handle(ServerRequestInterface $request): ResponseInterface
             {
-                $this->eventDispatcher->dispatch(new BeforeMiddleware($this->middleware, $request));
+                /** @var  MiddlewareInterface $middleware */
+                $middleware = ($this->middleware)();
+                $this->eventDispatcher->dispatch(new BeforeMiddleware($middleware, $request));
 
                 try {
-                    return $response = $this->middleware->process($request, $this->handler);
+                    return $response = $middleware->process($request, $this->handler);
                 } finally {
-                    $this->eventDispatcher->dispatch(new AfterMiddleware($this->middleware, $response ?? null));
+                    $this->eventDispatcher->dispatch(new AfterMiddleware($middleware, $response ?? null));
                 }
             }
         };

Original file line number	Diff line number	Diff line change
`@@ -87,13 +87,13 @@ public function hasMiddlewares(): bool`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`/**`
`90`		`- * @return MiddlewareInterface[]`
	`90`	`+ * @return \Closure[]`
`91`	`91`	`*/`
`92`	`92`	`private function buildMiddlewares(): array`
`93`	`93`	`{`
`94`	`94`	`$middlewares = [];`
`95`	`95`	`foreach ($this->middlewareDefinitions as $middlewareDefinition) {`
`96`		`- $middlewares[] = $this->middlewareFactory->create($middlewareDefinition);`
	`96`	`+ $middlewares[] = fn (): MiddlewareInterface => $this->middlewareFactory->create($middlewareDefinition);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`return $middlewares;`