Minor code improvements

DOCKER.md

@@ -1,8 +1,8 @@
 # Docker
 
-This project relies in the following 3 application images:
+This project relies on the following 3 application images:
 
-* [php.package.health/nginx](docker/nginx.Dockerfile): Serves static assets (css, fonts etc) and routes dynamic traffic to php-fpm;
+* [php.package.health/nginx](docker/nginx.Dockerfile): Serves static assets (css, fonts etc.) and routes dynamic traffic to php-fpm;
 * [php.package.health/php-fpm](docker/php.Dockerfile): Serves dynamic traffic based in the application code;
 * [php.package.health/php-cli](docker/php.Dockerfile): Used to perform maintenance tasks, such as database migration.
 
@@ -18,7 +18,7 @@ docker build --file docker/php.Dockerfile --target cli --tag php.package.health/
 
 ## Creating a network
 
-The network will be shared by the containers so they can communicate without exposing ports to the host machine.
+The network will be shared by the containers, so they can communicate without exposing ports to the host machine.
 
 ```bash
 docker network create php-package-health-network

app/console.php

@@ -0,0 +1,18 @@
+<?php
+declare(strict_types = 1);
+
+use App\Application\Console\Package\GetDataCommand;
+use App\Application\Console\Package\GetListCommand;
+use App\Application\Console\Package\GetUpdatesCommand;
+use App\Application\Console\Package\MassImportCommand;
+use DI\ContainerBuilder;
+use function DI\autowire;
+
+return static function (ContainerBuilder $containerBuilder): void {
+  $containerBuilder->addDefinitions([
+    GetDataCommand::class    => autowire(GetDataCommand::class),
+    GetListCommand::class    => autowire(GetListCommand::class),
+    GetUpdatesCommand::class => autowire(GetUpdatesCommand::class),
+    MassImportCommand::class  => autowire(MassImportCommand::class)
+  ]);
+};

app/dependencies.php

@@ -19,8 +19,9 @@
 use PUGX\Poser\Render\SvgPlasticRender;
 use Slim\HttpCache\CacheProvider;
 use Slim\Views\Twig;
+use function DI\autowire;
 
-return function (ContainerBuilder $containerBuilder): void {
+return static function (ContainerBuilder $containerBuilder): void {
   $containerBuilder->addDefinitions(
     [
       Browser::class => function (ContainerInterface $container): Browser {
@@ -29,8 +30,8 @@
           new Psr17Factory()
         );
       },
-      CacheProvider::class => \DI\autowire(CacheProvider::class),
-      EventEmitter::class => \DI\autowire(EventEmitter::class),
+      CacheProvider::class => autowire(CacheProvider::class),
+      EventEmitter::class => autowire(EventEmitter::class),
       LoggerInterface::class => function (ContainerInterface $container): LoggerInterface {
         $settings = $container->get(SettingsInterface::class);
 
@@ -74,10 +75,10 @@
           ]
         );
       },
-      SvgFlatRender::class => \DI\autowire(SvgFlatRender::class),
-      SvgFlatSquareRender::class => \DI\autowire(SvgFlatSquareRender::class),
-      SvgPlasticRender::class => \DI\autowire(SvgPlasticRender::class),
-      VersionParser::class => \DI\autowire(VersionParser::class),
+      SvgFlatRender::class => autowire(SvgFlatRender::class),
+      SvgFlatSquareRender::class => autowire(SvgFlatSquareRender::class),
+      SvgPlasticRender::class => autowire(SvgPlasticRender::class),
+      VersionParser::class => autowire(VersionParser::class),
       Twig::class => function (ContainerInterface $container): Twig {
         $settings = $container->get(SettingsInterface::class);
         $cache = false;

app/events.php

@@ -12,7 +12,7 @@
 use Evenement\EventEmitter;
 use Psr\Container\ContainerInterface;
 
-return function (ContainerInterface $container): void {
+return static function (ContainerInterface $container): void {
   $eventEmitter = $container->get(EventEmitter::class);
 
   /* DEPENDENCY EVENTS */

app/listeners.php

@@ -6,12 +6,13 @@
 use App\Application\Listeners\StatsListener;
 use App\Application\Listeners\VersionListener;
 use DI\ContainerBuilder;
+use function DI\autowire;
 
-return function (ContainerBuilder $containerBuilder): void {
+return static function (ContainerBuilder $containerBuilder): void {
   $containerBuilder->addDefinitions([
-    DependencyListener::class => \DI\autowire(DependencyListener::class),
-    PackageListener::class    => \DI\autowire(PackageListener::class),
-    StatsListener::class      => \DI\autowire(StatsListener::class),
-    VersionListener::class    => \DI\autowire(VersionListener::class)
+    DependencyListener::class => autowire(DependencyListener::class),
+    PackageListener::class    => autowire(PackageListener::class),
+    StatsListener::class      => autowire(StatsListener::class),
+    VersionListener::class    => autowire(VersionListener::class)
   ]);
 };

app/middleware.php

@@ -7,7 +7,7 @@
 use Slim\Views\Twig;
 use Slim\Views\TwigMiddleware;
 
-return function (App $app): void {
+return static function (App $app): void {
   $container = $app->getContainer();
 
   $app->add(new ContentLengthMiddleware());

app/repositories.php

@@ -5,17 +5,18 @@
 use App\Domain\Package\PackageRepositoryInterface;
 use App\Domain\Stats\StatsRepositoryInterface;
 use App\Domain\Version\VersionRepositoryInterface;
-use App\Infrastructure\Persistence\Dependency\SqlDependencyRepository;
-use App\Infrastructure\Persistence\Package\SqlPackageRepository;
-use App\Infrastructure\Persistence\Stats\SqlStatsRepository;
-use App\Infrastructure\Persistence\Version\SqlVersionRepository;
+use App\Infrastructure\Persistence\Dependency\PdoDependencyRepository;
+use App\Infrastructure\Persistence\Package\PdoPackageRepository;
+use App\Infrastructure\Persistence\Stats\PdoStatsRepository;
+use App\Infrastructure\Persistence\Version\PdoVersionRepository;
 use DI\ContainerBuilder;
+use function DI\autowire;
 
-return function (ContainerBuilder $containerBuilder): void {
+return static function (ContainerBuilder $containerBuilder): void {
   $containerBuilder->addDefinitions([
-    DependencyRepositoryInterface::class => \DI\autowire(SqlDependencyRepository::class),
-    PackageRepositoryInterface::class    => \DI\autowire(SqlPackageRepository::class),
-    StatsRepositoryInterface::class      => \DI\autowire(SqlStatsRepository::class),
-    VersionRepositoryInterface::class    => \DI\autowire(SqlVersionRepository::class)
+    DependencyRepositoryInterface::class => autowire(PdoDependencyRepository::class),
+    PackageRepositoryInterface::class    => autowire(PdoPackageRepository::class),
+    StatsRepositoryInterface::class      => autowire(PdoStatsRepository::class),
+    VersionRepositoryInterface::class    => autowire(PdoVersionRepository::class)
   ]);
 };

app/routes.php

@@ -1,19 +1,19 @@
 <?php
 declare(strict_types = 1);
 
+use App\Application\Actions\Maintenance\HealthAction;
 use App\Application\Actions\Package\ListPackagesAction;
 use App\Application\Actions\Package\RedirectListPackagesAction;
 use App\Application\Actions\Package\RedirectPackageAction;
 use App\Application\Actions\Package\RedirectPackageBadgeAction;
 use App\Application\Actions\Package\ViewPackageAction;
 use App\Application\Actions\Package\ViewPackageBadgeAction;
-use App\Application\Actions\Maintenance\HealthAction;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\App;
 use Slim\Interfaces\RouteCollectorProxyInterface as Group;
 
-return function (App $app): void {
+return static function (App $app): void {
   $app->options('/{routes:.*}', function (ServerRequestInterface $request, ResponseInterface $response) {
     // CORS Pre-Flight OPTIONS Request Handler
     return $response;

app/settings.php

@@ -6,7 +6,7 @@
 use DI\ContainerBuilder;
 use Monolog\Logger;
 
-return function (ContainerBuilder $containerBuilder): void {
+return static function (ContainerBuilder $containerBuilder): void {
   // Global Settings Object
   $containerBuilder->addDefinitions([
     SettingsInterface::class => function () {

bin/console.php

@@ -14,7 +14,6 @@
 use App\Application\Console\Package\GetListCommand;
 use App\Application\Console\Package\GetUpdatesCommand;
 use App\Application\Console\Package\MassImportCommand;
-use App\Application\Settings\SettingsInterface;
 use DI\ContainerBuilder;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\CommandLoader\FactoryCommandLoader;
@@ -30,7 +29,7 @@
 
 if (isset($_ENV['PHP_ENV']) && $_ENV['PHP_ENV'] === 'production') {
   // workaround for https://github.com/PHP-DI/PHP-DI/issues/791
-  if (version_compare(PHP_VERSION, '8.1.0', '<')) {
+  if (PHP_VERSION_ID < 80100) {
     $containerBuilder->enableCompilation(__DIR__ . '/../var/cache');
   }
 }
@@ -47,9 +46,9 @@
 $repositories = require __DIR__ . '/../app/repositories.php';
 $repositories($containerBuilder);
 
-// Set up commands
-$commands = require __DIR__ . '/../app/commands.php';
-$commands($containerBuilder);
+// Set up console commands
+$console = require __DIR__ . '/../app/console.php';
+$console($containerBuilder);
 
 // Set up listeners
 $listeners = require __DIR__ . '/../app/listeners.php';
@@ -66,16 +65,16 @@
 
 $commandLoader = new FactoryCommandLoader(
   [
-    GetDataCommand::getDefaultName() => function () use ($container): GetDataCommand {
+    GetDataCommand::getDefaultName() => static function () use ($container): GetDataCommand {
       return $container->get(GetDataCommand::class);
     },
-    GetListCommand::getDefaultName() => function () use ($container): GetListCommand {
+    GetListCommand::getDefaultName() => static function () use ($container): GetListCommand {
       return $container->get(GetListCommand::class);
     },
-    GetUpdatesCommand::getDefaultName() => function () use ($container): GetUpdatesCommand {
+    GetUpdatesCommand::getDefaultName() => static function () use ($container): GetUpdatesCommand {
       return $container->get(GetUpdatesCommand::class);
     },
-    MassImportCommand::getDefaultName() => function () use ($container): MassImportCommand {
+    MassImportCommand::getDefaultName() => static function () use ($container): MassImportCommand {
       return $container->get(MassImportCommand::class);
     }
   ]

composer.json

@@ -30,7 +30,9 @@
   "minimum-stability": "dev",
   "prefer-stable": true,
   "require": {
-    "php": ">=8.0",
+    "php": ">=8.1",
+    "ext-pdo": "*",
+    "ext-posix": "*",
     "badges/poser": "^2.3",
     "composer/metadata-minifier": "^1.0",
     "composer/semver": "^3.2",

public/index.php

@@ -21,7 +21,7 @@
 
 if (isset($_ENV['PHP_ENV']) && $_ENV['PHP_ENV'] === 'production') {
   // workaround for https://github.com/PHP-DI/PHP-DI/issues/791
-  if (version_compare(PHP_VERSION, '8.1.0', '<')) {
+  if (PHP_VERSION_ID < 80100) {
     $containerBuilder->enableCompilation(__DIR__ . '/../var/cache');
   }
 }

resources/views/index.twig

@@ -22,7 +22,7 @@
         <tr>
           <td><a href="{{ url_for('redirectPackage', {vendor: package.vendor, project: package.project}) }}">{{ package.name }}</a></td>
           <td class="has-text-grey">{{ package.description }}</td>
-          <td class="has-text-right"><img src="{{ url_for('redirectPackageBadge', {vendor: package.vendor, project: package.project}) }}"></td>
+          <td class="has-text-right"><img src="{{ url_for('redirectPackageBadge', {vendor: package.vendor, project: package.project}) }}" alt="Dependency Badge"></td>
         </tr>
       {% endfor %}
     </tbody>

resources/views/package.twig

@@ -6,12 +6,12 @@
 
 {% block hero_title %}<a href="{{ package.url }}"><span class="icon-text"><span class="icon"><i class="cib-github" alt="GitHub"></i></span>&nbsp;<span>{{ package.name }} {{ version.number }}</span></span></a>{% endblock %}
 
-{% block hero_subtitle %}<img src="{{ url_for('viewPackageBadge', {vendor: package.vendor, project: package.project, version: version.number}) }}">{% endblock %}
+{% block hero_subtitle %}<img src="{{ url_for('viewPackageBadge', {vendor: package.vendor, project: package.project, version: version.number}) }}" alt="Dependency Badge">{% endblock %}
 
 {% block hero_footer %}[![dependency status]({{ full_url_for('viewPackageBadge', {vendor: package.vendor, project: package.project, version: version.number}) }})]({{ full_url_for('viewPackage', {vendor: package.vendor, project: package.project, version: version.number}) }}){% endblock %}
 
 {% block content %}
-  {% if notification %}
+  {% if notification is defined %}
     <div class="notification {{ notification.type }}">
       <p>{{ notification.message }}</p>
     </div>

resources/views/template.twig

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html lang="en-US">
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">

src/Application/Actions/AbstractAction.php

@@ -3,7 +3,7 @@
 
 namespace App\Application\Actions;
 
-use App\Domain\DomainException\DomainRecordNotFoundException;
+use App\Domain\Exception\DomainRecordNotFoundException;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
@@ -31,7 +31,11 @@ public function __construct(LoggerInterface $logger, CacheProvider $cacheProvide
    * @throws \Slim\Exception\HttpNotFoundException
    * @throws \Slim\Exception\HttpBadRequestException
    */
-  public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $args): ResponseInterface {
+  public function __invoke(
+    ServerRequestInterface $request,
+    ResponseInterface $response,
+    array $args
+  ): ResponseInterface {
     $this->request  = $request;
     $this->response = $response;
     $this->args     = $args;
@@ -63,7 +67,7 @@ protected function getFormData() {
    */
   protected function resolveArg(string $name) {
     if (!isset($this->args[$name])) {
-      throw new HttpBadRequestException($this->request, "Could not resolve argument '{$name}'.");
+      throw new HttpBadRequestException($this->request, "Could not resolve argument '${name}'.");
     }
 
     return $this->args[$name];
@@ -82,7 +86,7 @@ protected function respondWithHtml(string $content, int $statusCode = 200): Resp
   }
 
   protected function respondWithJson(array $content, int $statusCode = 200): ResponseInterface {
-    return $this->respondWith('application/json', json_encode($content), $statusCode);
+    return $this->respondWith('application/json', json_encode($content, JSON_THROW_ON_ERROR), $statusCode);
   }
 
   protected function respondWithRedirect(string $url, int $statusCode = 302): ResponseInterface {
@@ -94,14 +98,14 @@ protected function respondWithRedirect(string $url, int $statusCode = 302): Resp
   /**
    * @param array|object|null $data
    */
-  protected function respondWithData($data = null, int $statusCode = 200): ResponseInterface {
+  protected function respondWithData(mixed $data = null, int $statusCode = 200): ResponseInterface {
     $payload = new ActionPayload($statusCode, $data);
 
     return $this->respond($payload);
   }
 
   protected function respond(ActionPayload $payload): ResponseInterface {
-    $json = json_encode($payload, JSON_PRETTY_PRINT);
+    $json = json_encode($payload, JSON_THROW_ON_ERROR | JSON_PRETTY_PRINT);
     $this->response->getBody()->write($json);
 
     return $this->response

src/Application/Actions/Package/ListPackagesAction.php

@@ -3,7 +3,6 @@
 
 namespace App\Application\Actions\Package;
 
-use App\Domain\Package\Package;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Views\Twig;
 

src/Application/Actions/Package/RedirectPackageBadgeAction.php

@@ -3,7 +3,6 @@
 
 namespace App\Application\Actions\Package;
 
-use App\Domain\Package\Package;
 use Psr\Http\Message\ResponseInterface;
 use Slim\Routing\RouteContext;