(chore): Short-circuit pre-PSR7 router

Core/Router.php

@@ -39,13 +39,13 @@ class Router
             ); // TODO: Ensure it works with reverse proxy
 
         $response = $dispatcher
-            ->pipe(new Kernel\CorsMiddleware())
             ->pipe(new Kernel\ContentNegotiationMiddleware())
             ->pipe(new Kernel\ErrorHandlerMiddleware())
             ->pipe(
                 (new Kernel\RouteResolverMiddleware())
                     ->setAttributeName('_request-handler')
-            )
+            ) // Note: Pre-PSR7 routes will not advance further than this
+            ->pipe(new Kernel\CorsMiddleware())
             ->pipe(new Kernel\JsonPayloadMiddleware())
             ->pipe(new Kernel\FrameSecurityMiddleware())
             ->pipe(

Core/Router/Middleware/Kernel/RouteResolverMiddleware.php

@@ -77,22 +77,16 @@ class RouteResolverMiddleware implements MiddlewareInterface
         // Pre PSR-7 Controllers
 
         if ($prePsr7Fallback->shouldRoute($request->getUri()->getPath())) {
-            return $handler
-                ->handle(
-                    $request
-                        ->withAttribute($this->attributeName, [$prePsr7Fallback, 'handle'])
-                )
+            return $prePsr7Fallback
+                ->handle($request)
                 ->withHeader('X-Route-Resolver', 'pre-psr7');
         }
 
         // Static HTML
 
         if ($request->getAttribute('accept') === 'html') {
-            return $handler
-                ->handle(
-                    $request
-                        ->withAttribute($this->attributeName, [$prePsr7Fallback, 'handleStatic'])
-                )
+            return $prePsr7Fallback
+                ->handleStatic($request)
                 ->withHeader('X-Route-Resolver', 'pre-psr7-static');
         }