Merge pull request #16 from martin-schilling/feature/zend-problem-det…

…ails

Removed the ErrorResponseGenerator in favor of zend-problem-details

composer.json

@@ -29,7 +29,8 @@
     "nikic/fast-route": "^1.0",
     "psr/log": "^1.0",
     "monolog/monolog": "^1.21",
-    "psr/http-server-middleware": "^1.0"
+    "psr/http-server-middleware": "^1.0",
+    "zendframework/zend-problem-details": "^1.0"
   },
   "require-dev": {
     "phpunit/phpunit": "^6.0"

public/index.php

@@ -18,7 +18,7 @@
 
 $app = new \Zend\Stratigility\MiddlewarePipe();
 
-$app->pipe($container->get(\Zend\Stratigility\Middleware\ErrorHandler::class));
+$app->pipe($container->get(\Zend\ProblemDetails\ProblemDetailsMiddleware::class));
 
 $app->pipe(new \Zend\Expressive\Helper\BodyParams\BodyParamsMiddleware());
 

src/Service/ServiceFactory.php

@@ -30,11 +30,15 @@
 use Prooph\EventStore\Pdo\Projection\PostgresProjectionManager;
 use Prooph\EventStore\Projection\ProjectionManager;
 use Prooph\EventStore\TransactionalActionEventEmitterEventStore;
+use Prooph\ServiceBus\Exception\MessageDispatchException;
 use Prooph\ServiceBus\Message\HumusAmqp\AmqpMessageProducer;
 use Psr\Container\ContainerInterface;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Psr\Log\LoggerInterface;
 use Zend\Diactoros\Response;
-use Zend\Stratigility\Middleware\ErrorHandler;
+use Zend\ProblemDetails\ProblemDetailsMiddleware;
+use Zend\ProblemDetails\ProblemDetailsResponseFactory;
 
 final class ServiceFactory
 {
@@ -215,16 +219,30 @@ public function __invoke(Message $event): void
         });
     }
 
-    public function httpErrorHandler($environment = 'prod'): ErrorHandler
+    public function problemDetailsMiddleware(): ProblemDetailsMiddleware
     {
-        return $this->makeSingleton(ErrorHandler::class, function () {
-            $errorHandler = new ErrorHandler(
-                function () {
+        return $this->makeSingleton(ProblemDetailsMiddleware::class, function() {
+            $isDevEnvironment = $this->config->stringValue('environment', 'prod') === 'dev';
+
+            $problemDetailsResponseFactory = new class(
+                function() {
                     return new Response();
                 },
-                new ErrorResponseGenerator($this->config->stringValue('environment', 'prod') === 'dev')
-            );
+                $isDevEnvironment
+            ) extends ProblemDetailsResponseFactory {
+                public function createResponseFromThrowable(
+                    ServerRequestInterface $request,
+                    \Throwable $e
+                ) : ResponseInterface {
+                    if($e instanceof MessageDispatchException) {
+                        $e = $e->getPrevious();
+                    }
+
+                    return parent::createResponseFromThrowable($request, $e);
+                }
+            };
 
+            $errorHandler = new ProblemDetailsMiddleware($problemDetailsResponseFactory);
             $errorHandler->attachListener(new PsrErrorLogger($this->logger()));
 
             return $errorHandler;