Removed dotkernel/dot-controller and replaced with handlers

composer.json

@@ -27,7 +27,6 @@
     },
     "require": {
         "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
-        "dotkernel/dot-controller": "^4.0.1",
         "dotkernel/dot-errorhandler": "^4.1.1",
         "laminas/laminas-component-installer": "^3.5.0",
         "laminas/laminas-config-aggregator": "^1.17.0",

config/autoload/local.php.dist

@@ -15,4 +15,10 @@ return [
     'application' => [
         'url' => $baseUrl,
     ],
+    'routes'      => [
+        'page' => [
+            'about'      => 'about',
+            'who-we-are' => 'who-we-are',
+        ],
+    ],
 ];

src/App/src/ConfigProvider.php

@@ -4,6 +4,10 @@
 
 namespace Light\App;
 
+use Light\App\Factory\IndexHandlerFactory;
+use Light\App\Handler\IndexHandler;
+use Mezzio\Application;
+
 class ConfigProvider
 {
     public function __invoke(): array
@@ -16,7 +20,16 @@ public function __invoke(): array
 
     public function getDependencies(): array
     {
-        return [];
+        return [
+            'delegators' => [
+                Application::class => [
+                    RoutesDelegator::class,
+                ],
+            ],
+            'factories'  => [
+                IndexHandler::class => IndexHandlerFactory::class,
+            ],
+        ];
     }
 
     public function getTemplates(): array

src/App/src/Factory/IndexHandlerFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Light\App\Factory;
+
+use Light\App\Handler\IndexHandler;
+use Mezzio\Template\TemplateRendererInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
+use function assert;
+
+class IndexHandlerFactory
+{
+    /**
+     * @param class-string $requestedName
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     */
+    public function __invoke(ContainerInterface $container, string $requestedName): IndexHandler
+    {
+        $template = $container->get(TemplateRendererInterface::class);
+        assert($template instanceof TemplateRendererInterface);
+
+        return new IndexHandler($template);
+    }
+}

src/App/src/Handler/IndexHandler.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Light\App\Handler;
+
+use Laminas\Diactoros\Response\HtmlResponse;
+use Mezzio\Template\TemplateRendererInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class IndexHandler implements RequestHandlerInterface
+{
+    public function __construct(
+        protected TemplateRendererInterface $template
+    ) {
+    }
+
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        return new HtmlResponse(
+            $this->template->render('app::index')
+        );
+    }
+}

src/App/src/RoutesDelegator.php

@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Light\App;
+
+use Light\App\Handler\IndexHandler;
+use Mezzio\Application;
+use Psr\Container\ContainerInterface;
+
+use function assert;
+
+class RoutesDelegator
+{
+    public function __invoke(ContainerInterface $container, string $serviceName, callable $callback): Application
+    {
+        $app = $callback();
+        assert($app instanceof Application);
+
+        $app->get('/', [IndexHandler::class], 'app::index');
+
+        return $app;
+    }
+}

src/App/templates/error/404.html.twig

@@ -9,9 +9,9 @@
             <h2>Oops!</h2>
             <h2>This is awkward.</h2>
             <h1>404</h1>
-            <p>
+            <p class="text-dark">
                 You are looking for something that doesn't exist or may have moved. Check out one of the links on this page
-                or head back to <a href="{{ path('home') }}">Home</a>.
+                or head back to <a class="text-dark" href="{{ path('app::index') }}">Home</a>.
             </p>
         </div>
     </div>

src/App/templates/error/error.html.twig

@@ -1,6 +1,7 @@
 {% extends '@layout/default.html.twig' %}
 
 {% block title %}{{ status }} {{ reason }}{% endblock %}
+{% block canonical %}{% endblock %}
 
 {% block content %}
     <div class="page-intro home-intro error-messages">
@@ -9,12 +10,6 @@
             <h2>This is awkward.</h2>
             <h1>{{ status }}</h1>
             <h2 class="message">{{ reason }}</h2>
-            {% if status == 404 %}
-                <p>
-                    You are looking for something that doesn't exist or may have moved. Check out one of the links on this page
-                    or head back to <a href="{{ path('home') }}">Home</a>.
-                </p>
-            {% endif %}
         </div>
     </div>
 {% endblock %}

src/App/templates/layout/default.html.twig

@@ -6,9 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
 
         <title>{% block title %}{% endblock %} | Dotkernel Light V1</title>
-        {% block canonical %}
-            <link rel="canonical" href="{{ url(routeName ?? null) }}" />
-        {% endblock %}
+        {% block canonical %}<link rel="canonical" href="{{ url(routeName ?? null) }}" />{% endblock %}
 
         <link rel="apple-touch-icon" sizes="180x180" href="{{ asset('images/app/favicon/apple-touch-icon.png') }}">
         <link rel="icon" type="image/png" sizes="32x32" href="{{ asset('images/app/favicon/favicon-32x32.png') }}">
@@ -46,16 +44,15 @@
                                 <li class="nav-item dropdown">
                                     <a class="nav-link dropdown-toggle" href="#" id="pageDropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Pages</a>
                                     <div class="dropdown-menu" aria-labelledby="pageDropdown">
-                                        <a class="dropdown-item" href="{{ url('page', {action: 'home'}) }}">Home</a>
-                                        <a class="dropdown-item" href="{{ url('page', {action: 'about-us'}) }}">About Us</a>
-                                        <a class="dropdown-item" href="{{ url('page', {action: 'who-we-are'}) }}">Who We Are</a>
+                                        <a class="dropdown-item" href="{{ url('page::about') }}">About Us</a>
+                                        <a class="dropdown-item" href="{{ url('page::who-we-are') }}">Who We Are</a>
                                     </div>
                                 </li>
                                 <li class="nav-item">
                                     <a class="nav-link" href="https://github.com/dotkernel/light/" target="_blank">GitHub</a>
                                 </li>
                                 <li class="nav-item">
-                                    <a class="nav-link disabled" href="{{ url('page', {action: 'index'}) }}">Disabled</a>
+                                    <a class="nav-link disabled" href="{{ url('app::index') }}">Disabled</a>
                                 </li>
                             </ul>
                         </div>

src/Page/src/ConfigProvider.php

@@ -4,9 +4,10 @@
 
 namespace Light\Page;
 
-use Light\Page\Controller\PageController;
-use Light\Page\Factory\PageControllerFactory;
+use Light\Page\Factory\PageHandlerFactory;
 use Light\Page\Factory\PageServiceFactory;
+use Light\Page\Handler\PageHandler;
+use Light\Page\RoutesDelegator;
 use Light\Page\Service\PageService;
 use Light\Page\Service\PageServiceInterface;
 use Mezzio\Application;
@@ -30,8 +31,8 @@ public function getDependencies(): array
                 ],
             ],
             'factories'  => [
-                PageController::class => PageControllerFactory::class,
-                PageService::class    => PageServiceFactory::class,
+                PageHandler::class => PageHandlerFactory::class,
+                PageService::class => PageServiceFactory::class,
             ],
             'aliases'    => [
                 PageServiceInterface::class => PageService::class,

src/Page/src/Factory/PageControllerFactory.php → src/Page/src/Factory/PageHandlerFactory.php

@@ -4,33 +4,26 @@
 
 namespace Light\Page\Factory;
 
-use Light\Page\Controller\PageController;
-use Light\Page\Service\PageServiceInterface;
-use Mezzio\Router\RouterInterface;
+use Light\Page\Handler\PageHandler;
 use Mezzio\Template\TemplateRendererInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 use function assert;
 
-class PageControllerFactory
+class PageHandlerFactory
 {
     /**
+     * @param class-string $requestedName
      * @throws NotFoundExceptionInterface
      * @throws ContainerExceptionInterface
      */
-    public function __invoke(ContainerInterface $container, string $requestedName): PageController
+    public function __invoke(ContainerInterface $container, string $requestedName): PageHandler
     {
-        $pageService = $container->get(PageServiceInterface::class);
-        assert($pageService instanceof PageServiceInterface);
-
-        $router = $container->get(RouterInterface::class);
-        assert($router instanceof RouterInterface);
-
         $template = $container->get(TemplateRendererInterface::class);
         assert($template instanceof TemplateRendererInterface);
 
-        return new PageController($pageService, $router, $template);
+        return new PageHandler($template);
     }
 }

src/Page/src/Factory/PageServiceFactory.php

@@ -10,6 +10,9 @@
 
 class PageServiceFactory
 {
+    /**
+     * @param class-string $requestedName
+     */
     public function __invoke(ContainerInterface $container, string $requestedName): PageServiceInterface
     {
         return new PageService();

src/Page/src/Handler/PageHandler.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Light\Page\Handler;
+
+use Laminas\Diactoros\Response\HtmlResponse;
+use Mezzio\Router\RouteResult;
+use Mezzio\Template\TemplateRendererInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+
+class PageHandler implements RequestHandlerInterface
+{
+    public function __construct(
+        protected TemplateRendererInterface $template,
+    ) {
+    }
+
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        $template = $request->getAttribute(RouteResult::class)->getMatchedRouteName();
+
+        return new HtmlResponse(
+            $this->template->render($template)
+        );
+    }
+}