Fixed conflicts

Signed-off-by: alexmerlin <[email protected]>

Author: alexmerlin

.laminas-ci/pre-run.sh

@@ -5,10 +5,5 @@ COMMAND=$(echo "${JOB}" | jq -r '.command')
 echo "Running pre-run $COMMAND"
 
 if [[ ${COMMAND} =~ phpunit ]];then
-
   apt-get install php"${PHP_VERSION}"-sqlite3
-
-  cp config/autoload/local.php.dist config/autoload/local.php
-  cp config/autoload/local.test.php.dist config/autoload/local.test.php
-
 fi

config/autoload/local.php.dist

@@ -21,10 +21,10 @@ $databases = [
 return [
     'application'         => [
         'name'       => 'Dotkernel API',
-        'version'    => 6,
+        'version'    => 6.0,
         'url'        => $baseUrl,
         'versioning' => [
-            'documentation_url' => 'https://docs.dotkernel.org/api-documentation/v5/core-features/versioning',
+            'documentation_url' => 'https://docs.dotkernel.org/api-documentation/v6/core-features/versioning',
         ],
     ],
     'authentication'      => [

config/pipeline.php

@@ -8,8 +8,6 @@
 use Api\App\Middleware\ContentNegotiationMiddleware;
 use Api\App\Middleware\DeprecationMiddleware;
 use Api\App\Middleware\ResourceProviderMiddleware;
-use Api\App\Middleware\ResponseMiddleware;
-use Dot\ErrorHandler\ErrorHandlerInterface;
 use Dot\ResponseHeader\Middleware\ResponseHeaderMiddleware;
 use Mezzio\Application;
 use Mezzio\Cors\Middleware\CorsMiddleware;
@@ -25,9 +23,9 @@
 use Mezzio\Router\Middleware\RouteMiddleware;
 
 return function (Application $app): void {
-    // The error handler should be the first (most outer) middleware to catch
-    // all Exceptions.
-    $app->pipe(ErrorHandlerInterface::class);
+    // This middleware must be the outest layer because - on error occurrence - it will:
+    // - call \Dot\ErrorHandler\ErrorHandlerInterface::class
+    // - return ProblemDetails response
     $app->pipe(ProblemDetailsMiddleware::class);
 
     $app->pipe(BodyParamsMiddleware::class);
@@ -39,15 +37,14 @@
     // - pre-conditions
     // - modifications to outgoing responses
     //
-    // Piped Middleware may be either callables or service names. Middleware may
-    // also be passed as an array; each item in the array must resolve to
-    // middleware eventually (i.e., callable or service name).
+    // Piped Middleware may be either callables or service names.
+    // Middleware may also be passed as an array; each item in the array must resolve to middleware eventually
+    // (i.e., callable or service name).
     //
-    // Middleware can be attached to specific paths, allowing you to mix and match
-    // applications under a common domain.  The handlers in each middleware
-    // attached this way will see a URI with the matched path segment removed.
+    // Middleware can be attached to specific paths, allowing you to mix and match applications under a common domain.
+    // The handlers in each middleware attached this way will see a URI with the matched path segment removed.
     //
-    // i.e., path of "/api/member/profile" only passes "/member/profile" to $apiMiddleware
+    // For example, the path of "/api/member/profile" only passes "/member/profile" to $apiMiddleware
     // - $app->pipe('/api', $apiMiddleware);
     // - $app->pipe('/docs', $apiDocMiddleware);
     // - $app->pipe('/files', $filesMiddleware);
@@ -84,7 +81,6 @@
     // - route-based validation
     // - etc.
 
-    $app->pipe(ResponseMiddleware::class);
     $app->pipe(ResourceProviderMiddleware::class);
 
     // Register the dispatch middleware in the middleware pipeline

src/App/src/ConfigProvider.php

@@ -6,6 +6,7 @@
 
 use Api\App\Command\TokenGenerateCommand;
 use Api\App\Factory\HandlerDelegatorFactory;
+use Api\App\Factory\ProblemDetailsDelegatorFactory;
 use Api\App\Handler\GetIndexResourceHandler;
 use Api\App\Handler\PostErrorReportResourceHandler;
 use Api\App\Middleware\AuthenticationMiddleware;
@@ -14,7 +15,6 @@
 use Api\App\Middleware\DeprecationMiddleware;
 use Api\App\Middleware\ErrorReportPermissionMiddleware;
 use Api\App\Middleware\ResourceProviderMiddleware;
-use Api\App\Middleware\ResponseMiddleware;
 use Api\App\Service\ErrorReportService;
 use Api\App\Service\ErrorReportServiceInterface;
 use Dot\DependencyInjection\Factory\AttributedServiceFactory;
@@ -24,6 +24,7 @@
 use Mezzio\Authentication\OAuth2\OAuth2Adapter;
 use Mezzio\Hal\Metadata\RouteBasedCollectionMetadata;
 use Mezzio\Hal\Metadata\RouteBasedResourceMetadata;
+use Mezzio\ProblemDetails\ProblemDetailsMiddleware;
 use Mezzio\Template\TemplateRendererInterface;
 use Mezzio\Twig\TwigEnvironmentFactory;
 use Mezzio\Twig\TwigExtension;
@@ -48,6 +49,7 @@ private function getDependencies(): array
                 Application::class                    => [RoutesDelegator::class],
                 GetIndexResourceHandler::class        => [HandlerDelegatorFactory::class],
                 PostErrorReportResourceHandler::class => [HandlerDelegatorFactory::class],
+                ProblemDetailsMiddleware::class       => [ProblemDetailsDelegatorFactory::class],
             ],
             'factories'  => [
                 AuthenticationMiddleware::class        => AttributedServiceFactory::class,
@@ -56,7 +58,6 @@ private function getDependencies(): array
                 DeprecationMiddleware::class           => AttributedServiceFactory::class,
                 ErrorReportPermissionMiddleware::class => AttributedServiceFactory::class,
                 ResourceProviderMiddleware::class      => AttributedServiceFactory::class,
-                ResponseMiddleware::class              => AttributedServiceFactory::class,
                 GetIndexResourceHandler::class         => AttributedServiceFactory::class,
                 PostErrorReportResourceHandler::class  => AttributedServiceFactory::class,
                 ErrorReportService::class              => AttributedServiceFactory::class,

src/App/src/Factory/ProblemDetailsDelegatorFactory.php

@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Api\App\Factory;
+
+use Api\App\Exception\RuntimeException;
+use Core\App\Message;
+use Dot\ErrorHandler\ErrorHandlerInterface;
+use Dot\ErrorHandler\LogErrorHandler;
+use Mezzio\ProblemDetails\ProblemDetailsMiddleware;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
+use Psr\Http\Message\RequestInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Throwable;
+
+use function assert;
+
+class ProblemDetailsDelegatorFactory
+{
+    /**
+     * @param class-string $name
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
+     * @throws RuntimeException
+     */
+    public function __invoke(
+        ContainerInterface $container,
+        string $name,
+        callable $callback
+    ): ProblemDetailsMiddleware {
+        if (! $container->has(ErrorHandlerInterface::class)) {
+            throw RuntimeException::create(Message::serviceNotFound(ErrorHandlerInterface::class));
+        }
+
+        $problemDetailsMiddleware = $callback();
+        assert($problemDetailsMiddleware instanceof ProblemDetailsMiddleware);
+
+        $errorHandler = $container->get(ErrorHandlerInterface::class);
+        assert($errorHandler instanceof LogErrorHandler);
+
+        $listener = function (Throwable $throwable, RequestInterface $request) use ($errorHandler) {
+            assert($request instanceof ServerRequestInterface);
+            $errorHandler->handleThrowable($throwable, $request);
+        };
+
+        $problemDetailsMiddleware->attachListener($listener);
+
+        return $problemDetailsMiddleware;
+    }
+}

src/App/src/Handler/GetIndexResourceHandler.php

@@ -29,7 +29,7 @@ public function __construct(
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         return $this->jsonResponse([
-            'message' => sprintf('%s version %s', $this->config['name'], $this->config['version']),
+            'message' => sprintf('%s version %s', $this->config['name'], $this->config['version'] ?? 'X'),
         ]);
     }
 }