Reuse same DI container instance when loading global middleware classes

Author: clue

src/App.php

@@ -37,8 +37,18 @@ class App
      */
     public function __construct(...$middleware)
     {
+        $container = new Container();
         $errorHandler = new ErrorHandler();
-        $this->router = new RouteHandler();
+        $this->router = new RouteHandler($container);
+
+        if ($middleware) {
+            $middleware = array_map(
+                function ($handler) use ($container) {
+                    return is_callable($handler) ? $handler : $container->callable($handler);
+                },
+                $middleware
+            );
+        }
 
         // new MiddlewareHandler([$accessLogHandler, $errorHandler, ...$middleware, $routeHandler])
         \array_unshift($middleware, $errorHandler);

src/RouteHandler.php

@@ -27,11 +27,11 @@ class RouteHandler
     /** @var Container */
     private $container;
 
-    public function __construct()
+    public function __construct(Container $container = null)
     {
         $this->routeCollector = new RouteCollector(new RouteParser(), new RouteGenerator());
         $this->errorHandler = new ErrorHandler();
-        $this->container = new Container();
+        $this->container = $container ?? new Container();
     }
 
     /**

tests/AppMiddlewareTest.php

@@ -452,6 +452,112 @@ public function testGlobalMiddlewareCallsNextReturnsResponseFromController()
         $this->assertEquals("OK\n", (string) $response->getBody());
     }
 
+    public function testGlobalMiddlewareInstanceCallsNextReturnsResponseFromController()
+    {
+        $middleware = new class {
+            public function __invoke(ServerRequestInterface $request, callable $next)
+            {
+                return $next($request);
+            }
+        };
+
+        $app = $this->createAppWithoutLogger($middleware);
+
+        $app->get('/', function () {
+            return new Response(
+                200,
+                [
+                    'Content-Type' => 'text/html'
+                ],
+                "OK\n"
+            );
+        });
+
+        $request = new ServerRequest('GET', 'http://localhost/');
+
+        // $response = $app->handleRequest($request);
+        $ref = new \ReflectionMethod($app, 'handleRequest');
+        $ref->setAccessible(true);
+        $response = $ref->invoke($app, $request);
+
+        /** @var ResponseInterface $response */
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
+        $this->assertEquals("OK\n", (string) $response->getBody());
+    }
+
+    public function testGlobalMiddlewareClassNameCallsNextReturnsResponseFromController()
+    {
+        $middleware = new class {
+            public function __invoke(ServerRequestInterface $request, callable $next)
+            {
+                return $next($request);
+            }
+        };
+
+        $app = $this->createAppWithoutLogger(get_class($middleware));
+
+        $app->get('/', function () {
+            return new Response(
+                200,
+                [
+                    'Content-Type' => 'text/html'
+                ],
+                "OK\n"
+            );
+        });
+
+        $request = new ServerRequest('GET', 'http://localhost/');
+
+        // $response = $app->handleRequest($request);
+        $ref = new \ReflectionMethod($app, 'handleRequest');
+        $ref->setAccessible(true);
+        $response = $ref->invoke($app, $request);
+
+        /** @var ResponseInterface $response */
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
+        $this->assertEquals("OK\n", (string) $response->getBody());
+    }
+
+    public function testGlobalMiddlewareClassNameAndSameForRouterCallsSameMiddlewareInstanceTwiceAndNextReturnsResponseFromController()
+    {
+        $middleware = new class {
+            private $called = 0;
+            public function __invoke(ServerRequestInterface $request, callable $next)
+            {
+                return $next($request->withAttribute('called', ++$this->called));
+            }
+        };
+
+        $app = $this->createAppWithoutLogger(get_class($middleware));
+
+        $app->get('/', get_class($middleware), function (ServerRequestInterface $request) {
+            return new Response(
+                200,
+                [
+                    'Content-Type' => 'text/html'
+                ],
+                $request->getAttribute('called') . "\n"
+            );
+        });
+
+        $request = new ServerRequest('GET', 'http://localhost/');
+
+        // $response = $app->handleRequest($request);
+        $ref = new \ReflectionMethod($app, 'handleRequest');
+        $ref->setAccessible(true);
+        $response = $ref->invoke($app, $request);
+
+        /** @var ResponseInterface $response */
+        $this->assertInstanceOf(ResponseInterface::class, $response);
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEquals('text/html', $response->getHeaderLine('Content-Type'));
+        $this->assertEquals("2\n", (string) $response->getBody());
+    }
+
     public function testGlobalMiddlewareCallsNextWithModifiedRequestWillBeUsedForRouting()
     {
         $app = $this->createAppWithoutLogger(function (ServerRequestInterface $request, callable $next) {
@@ -669,7 +775,8 @@ public function testGlobalMiddlewareCallsNextReturnsPromiseWhichResolvesWithModi
         $this->assertEquals("OK\n", (string) $response->getBody());
     }
 
-    private function createAppWithoutLogger(callable ...$middleware): App
+    /** @param callable|class-string ...$middleware */
+    private function createAppWithoutLogger(...$middleware): App
     {
         $app = new App(...$middleware);