Add global middleware event, remove controller concept

dummy_app/src/GlobalMiddlewareListener.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace Labrador\DummyApp;
+
+use Amp\Future;
+use Labrador\AsyncEvent\Autowire\AutowiredListener;
+use Labrador\AsyncEvent\Event;
+use Labrador\AsyncEvent\Listener;
+use Labrador\CompositeFuture\CompositeFuture;
+use Labrador\DummyApp\Middleware\BarMiddleware;
+use Labrador\DummyApp\Middleware\BazMiddleware;
+use Labrador\DummyApp\Middleware\FooMiddleware;
+use Labrador\DummyApp\Middleware\QuxMiddleware;
+use Labrador\Web\Application\ApplicationEvent;
+use Labrador\Web\Middleware\GlobalMiddlewareCollection;
+
+#[AutowiredListener(ApplicationEvent::AddGlobalMiddleware->value)]
+class GlobalMiddlewareListener implements Listener {
+
+    public function __construct(
+        private readonly MiddlewareCallRegistry $middlewareCallRegistry
+    ) {}
+
+    /**
+     * @param Event<GlobalMiddlewareCollection> $event
+     * @return Future|CompositeFuture|null
+     */
+    public function handle(Event $event) : Future|CompositeFuture|null {
+        $event->payload()->add(new QuxMiddleware($this->middlewareCallRegistry));
+        $event->payload()->add(new FooMiddleware($this->middlewareCallRegistry));
+        $event->payload()->add(new BazMiddleware($this->middlewareCallRegistry));
+        $event->payload()->add(new BarMiddleware($this->middlewareCallRegistry));
+
+        return null;
+    }
+}

dummy_app/src/Middleware/ControllerSpecificMiddleware.php → dummy_app/src/Middleware/RequestHandlerSpecificMiddleware.php

@@ -9,7 +9,7 @@
 use Cspray\AnnotatedContainer\Attribute\Service;
 
 #[Service]
-class ControllerSpecificMiddleware implements Middleware {
+class RequestHandlerSpecificMiddleware implements Middleware {
 
     public function handleRequest(Request $request, RequestHandler $requestHandler) : Response {
         $request->setAttribute('labrador.http-dummy-app.routeMiddleware', 'Universe');

dummy_app/src/RequestHandler/HelloMiddlewareRequestHandler.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Labrador\DummyApp\RequestHandler;
+
+use Amp\Http\Server\Request;
+use Amp\Http\Server\RequestHandler;
+use Amp\Http\Server\Response;
+
+class HelloMiddlewareRequestHandler implements RequestHandler {
+
+    public function handleRequest(Request $request) : Response {
+        $who = $request->getAttribute('labrador.http-dummy-app.routeMiddleware');
+        return new Response(body: 'Hello, ' . $who . '!');
+    }
+}

dummy_app/src/RequestHandler/HelloWorldRequestHandler.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Labrador\DummyApp\RequestHandler;
+
+use Amp\Http\Server\Request;
+use Amp\Http\Server\RequestHandler;
+use Amp\Http\Server\Response;
+
+class HelloWorldRequestHandler implements RequestHandler {
+
+    public function handleRequest(Request $request) : Response {
+        return new Response(body: 'Hello, world!');
+    }
+
+}

dummy_app/src/RouterListener.php

@@ -4,45 +4,47 @@
 
 use Amp\Future;
 use Amp\Http\Server\Request;
+use Amp\Http\Server\RequestHandler;
 use Amp\Http\Server\Response;
+use Cspray\AnnotatedContainer\Autowire\AutowireableFactory;
 use Labrador\AsyncEvent\Autowire\AutowiredListener;
 use Labrador\AsyncEvent\Event;
 use Labrador\AsyncEvent\Listener;
 use Labrador\CompositeFuture\CompositeFuture;
-use Labrador\DummyApp\Middleware\BarMiddleware;
-use Labrador\DummyApp\Middleware\BazMiddleware;
-use Labrador\DummyApp\Middleware\FooMiddleware;
-use Labrador\DummyApp\Middleware\QuxMiddleware;
+use Labrador\DummyApp\RequestHandler\HelloMiddlewareRequestHandler;
+use Labrador\DummyApp\RequestHandler\HelloWorldRequestHandler;
+use Labrador\DummyApp\Middleware\RequestHandlerSpecificMiddleware;
 use Labrador\Web\Application\ApplicationEvent;
-use Labrador\Web\Application\Event\AddRoutes;
-use Labrador\Web\Application\Event\RouterAndGlobalMiddlewareCollection;
-use Labrador\Web\Controller\Controller;
-use Labrador\Web\Router\Mapping\GetMapping;
+use Labrador\Web\Router\FriendlyRouter;
+use Labrador\Web\Router\Router;
 
 #[AutowiredListener(ApplicationEvent::AddRoutes->value)]
 class RouterListener implements Listener {
 
     public function __construct(
-        private readonly MiddlewareCallRegistry $middlewareCallRegistry
+        private readonly AutowireableFactory $factory
     ) {}
 
     /**
-     * @param Event<RouterAndGlobalMiddlewareCollection> $event
+     * @param Event<Router> $event
      * @return Future|CompositeFuture|null
      */
     public function handle(Event $event) : Future|CompositeFuture|null {
-        $event->payload()->globalMiddleware()->add(new QuxMiddleware($this->middlewareCallRegistry));
-        $event->payload()->globalMiddleware()->add(new FooMiddleware($this->middlewareCallRegistry));
-        $event->payload()->globalMiddleware()->add(new BazMiddleware($this->middlewareCallRegistry));
-        $event->payload()->globalMiddleware()->add(new BarMiddleware($this->middlewareCallRegistry));
-        $event->payload()->router()->addRoute(
-            new GetMapping('/exception'),
-            new class implements Controller {
-
-                public function toString() : string {
-                    return 'ErrorThrowingController';
-                }
+        $friendlyRouter = new FriendlyRouter($event->payload());
+
+        $friendlyRouter->get(
+            '/hello/world',
+            $this->factory->make(HelloWorldRequestHandler::class)
+        );
+        $friendlyRouter->get(
+            '/hello/middleware',
+            $this->factory->make(HelloMiddlewareRequestHandler::class),
+            $this->factory->make(RequestHandlerSpecificMiddleware::class)
+        );
 
+        $friendlyRouter->get(
+            '/exception',
+            new class implements RequestHandler {
                 public function handleRequest(Request $request) : Response {
                     throw new \RuntimeException('A message detailing what went wrong that should show up in logs.');
                 }

known-issues.xml

@@ -8,9 +8,4 @@
       <code><![CDATA[$this->routingStarted]]></code>
     </PossiblyNullOperand>
   </file>
-  <file src="src/Web/Controller/StaticAssetController.php">
-    <MixedOperand>
-      <code><![CDATA[$request->getAttribute('path')]]></code>
-    </MixedOperand>
-  </file>
 </files>

src/TestHelper/InvokedControllerResponse.php → src/TestHelper/InvokedRequestHandlerResponse.php

@@ -2,13 +2,19 @@
 
 namespace Labrador\TestHelper;
 
+use Amp\Http\Server\Middleware;
 use Amp\Http\Server\Request;
+use Amp\Http\Server\RequestHandler;
 use Amp\Http\Server\Response;
-use Labrador\Web\Controller\Controller;
 
-interface InvokedControllerResponse {
+interface InvokedRequestHandlerResponse {
 
-    public function invokedController() : Controller;
+    public function requestHandler() : RequestHandler;
+
+    /**
+     * @return list<Middleware>
+     */
+    public function middleware() : array;
 
     public function request() : Request;