Use GetPageViewHandler for static pages. Update routes and unit tests

Author: OStefan2001

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

@@ -34,7 +34,7 @@
                         <a class="nav-link px-3 fw-semibold fs-5 transition-all" target="_blank" href="https://docs.dotkernel.org/">Documentation</a>
                     </li>
                     <li class="nav-item">
-                        <a class="nav-link px-3 fw-semibold fs-5 transition-all" href="{{ url('page::static-page', {'static-page': 'dotkernel-packages-oss-lifecycle'}) }}">Packages Lifecycle</a>
+                        <a class="nav-link px-3 fw-semibold fs-5 transition-all" href="{{ url('page::dotkernel-packages-oss-lifecycle') }}">Packages Lifecycle</a>
                     </li>
                     <li class="nav-item">
                         <a class="nav-link px-3 fw-semibold fs-5 transition-all" href="{{ url('page::category-resource', {slug: 'how-to'}) }}">How to's</a>
@@ -47,7 +47,7 @@
                     </li>
                 </ul>
                 <div class="d-none d-lg-block">
-                    <a href="{{ url('page::static-page', {'static-page': 'contact'}) }}" class="btn btn-primary rounded-pill px-4">Contact</a>
+                    <a href="{{ url('page::contact') }}" class="btn btn-primary rounded-pill px-4">Contact</a>
                 </div>
             </div>
         </div>

src/App/templates/partial/left-menu.html.twig

@@ -11,7 +11,7 @@
                 </div>
             </div>
         </div>
-        {% if data is defined %}
+        {% if data is defined and data is iterable %}
             <div class="card border-0 shadow-sm rounded-3 my-2">
                 <div class="card-body p-3">
                     <h6 class="fw-bold text-uppercase text-muted small px-1 mb-2">Recent Articles</h6>
@@ -54,7 +54,7 @@
                 </div>
             </div>
         </div>
-        {% if posts is defined and posts %}
+        {% if posts is defined and posts is iterable %}
             <div class="card border-0 shadow-sm rounded-3 my-2">
                 <div class="card-body p-3">
                     <h6 class="fw-bold text-uppercase text-muted small px-1 mb-2">Recent Articles</h6>

src/Blog/src/ConfigProvider.php

@@ -66,7 +66,6 @@ private function getDependencies(): array
                 GetCategoryResourceHandler::class   => CategoryResourceHandlerFactory::class,
                 AuthorRepository::class             => AuthorResourceRepositoryFactory::class,
                 GetAuthorResourceHandler::class     => AuthorResourceHandlerFactory::class,
-                GetStaticPageDataHandler::class     => GetStaticPageDataFactory::class,
             ],
         ];
     }

src/Blog/src/Factory/StaticPages/GetStaticPageDataFactory.php

@@ -4,6 +4,7 @@
 
 namespace Light\Blog\Handler;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 use Light\Blog\Repository\CategoryRepository;
 use Mezzio\Template\TemplateRendererInterface;
@@ -26,7 +27,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $meta         = $category;
 
         if (! $category) {
-            return new HtmlResponse('Category not found', 404);
+            return new HtmlResponse('Category not found', StatusCodeInterface::STATUS_NOT_FOUND);
         }
         $categories       = $this->categoryRepository->getCategories();
         $categoryArticles = $this->categoryRepository->getCategoryPost($category);

src/Blog/src/Handler/GetCategoryResourceHandler.php

@@ -4,6 +4,7 @@
 
 namespace Light\Blog\Handler;
 
+use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Diactoros\Response\HtmlResponse;
 use Light\Blog\Repository\CategoryRepository;
 use Light\Blog\Repository\PostRepository;
@@ -58,7 +59,7 @@ private function notFound(?string $categorySlug): HtmlResponse
             $this->template->render('error::404', [
                 'categories' => $categories,
             ]),
-            404
+            StatusCodeInterface::STATUS_NOT_FOUND
         );
     }
 }

src/Blog/src/Handler/GetPostResourceHandler.php

@@ -9,7 +9,6 @@
 use Light\Blog\Handler\GetCategoryResourceHandler;
 use Light\Blog\Handler\GetPostCollectionHandler;
 use Light\Blog\Handler\GetPostResourceHandler;
-use Light\Blog\Handler\GetStaticPageDataHandler;
 use Mezzio\Application;
 use Psr\Container\ContainerInterface;
 
@@ -26,8 +25,6 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
         $app->get('/categories/', [GetCategoryCollectionHandler::class], 'page::categories');
         $app->get('/author/{slug}/', [GetAuthorResourceHandler::class], 'page::author-resource');
         $app->get('/{categorySlug}/{slug}/', [GetPostResourceHandler::class], 'page::blog-resource');
-
-        $app->get('/{static-page}/', [GetStaticPageDataHandler::class], 'page::static-page');
         return $app;
     }
 }

src/Blog/src/Handler/GetStaticPageDataHandler.php

@@ -4,6 +4,8 @@
 
 namespace Light\Page\Factory;
 
+use Light\Blog\Repository\CategoryRepository;
+use Light\Blog\Repository\PostRepository;
 use Light\Page\Handler\GetPageViewHandler;
 use Mezzio\Template\TemplateRendererInterface;
 use Psr\Container\ContainerExceptionInterface;
@@ -21,9 +23,11 @@ class GetPageViewHandlerFactory
      */
     public function __invoke(ContainerInterface $container, string $requestedName): GetPageViewHandler
     {
-        $template = $container->get(TemplateRendererInterface::class);
+        $postRepository     = $container->get(PostRepository::class);
+        $categoryRepository = $container->get(CategoryRepository::class);
+        $template           = $container->get(TemplateRendererInterface::class);
         assert($template instanceof TemplateRendererInterface);
 
-        return new GetPageViewHandler($template);
+        return new GetPageViewHandler($template, $categoryRepository, $postRepository);
     }
 }

src/Blog/src/RoutesDelegator.php

@@ -5,6 +5,8 @@
 namespace Light\Page\Handler;
 
 use Laminas\Diactoros\Response\HtmlResponse;
+use Light\Blog\Repository\CategoryRepository;
+use Light\Blog\Repository\PostRepository;
 use Mezzio\Router\RouteResult;
 use Mezzio\Template\TemplateRendererInterface;
 use Psr\Http\Message\ResponseInterface;
@@ -15,15 +17,21 @@ class GetPageViewHandler implements RequestHandlerInterface
 {
     public function __construct(
         protected TemplateRendererInterface $template,
+        protected CategoryRepository $categoryRepository,
+        protected PostRepository $postRepository,
     ) {
     }
 
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $template = $request->getAttribute(RouteResult::class)->getMatchedRouteName();
-
+        $template   = $request->getAttribute(RouteResult::class)->getMatchedRouteName();
+        $posts      = $this->postRepository->getRecentPosts(3);
+        $categories = $this->categoryRepository->getCategories();
         return new HtmlResponse(
-            $this->template->render($template)
+            $this->template->render($template, [
+                'posts'      => $posts,
+                'categories' => $categories,
+            ])
         );
     }
 }