bugfixes

Author: oscarotero

src/ErrorFormatter/AbstractFormatter.php

@@ -6,6 +6,7 @@
 use Middlewares\Utils\Factory;
 use Middlewares\Utils\HttpErrorException;
 use Psr\Http\Message\ResponseFactoryInterface;
+use Psr\Http\Message\StreamFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Throwable;
@@ -15,13 +16,18 @@ abstract class AbstractFormatter implements FormatterInterface
     /** @var ResponseFactoryInterface */
     protected $responseFactory;
 
+    /** @var StreamFactoryInterface */
+    protected $streamFactory;
+
     /** @var string[] */
     protected $contentTypes = [];
 
     public function __construct(
-        ResponseFactoryInterface $responseFactory = null
+        ResponseFactoryInterface $responseFactory = null,
+        StreamFactoryInterface $streamFactory = null
     ) {
         $this->responseFactory = $responseFactory ?? Factory::getResponseFactory();
+        $this->streamFactory = $streamFactory ?? Factory::getStreamFactory();
     }
 
     public function isValid(Throwable $error, ServerRequestInterface $request): bool
@@ -34,21 +40,22 @@ abstract protected function format(Throwable $error): string;
     public function handle(Throwable $error, ServerRequestInterface $request): ResponseInterface
     {
         $response = $this->responseFactory->createResponse($this->errorStatus($error));
-        $response->getBody()->write($this->format($error));
+        $body = $this->streamFactory->createStream($this->format($error));
+        $response = $response->withBody($body);
 
         $contentType = $this->getContentType($request);
 
         return $response->withHeader('Content-Type', $contentType ? $contentType : $this->contentTypes[0]);
     }
 
-    protected function errorStatus(Throwable $e): int
+    protected function errorStatus(Throwable $error): int
     {
-        if ($e instanceof HttpErrorException) {
-            return $e->getCode();
+        if ($error instanceof HttpErrorException) {
+            return $error->getCode();
         }
 
-        if (method_exists($e, 'getStatusCode')) {
-            return $e->getStatusCode();
+        if (method_exists($error, 'getStatusCode')) {
+            return $error->getStatusCode();
         }
 
         return 500;

src/ErrorHandler.php

@@ -17,7 +17,7 @@ class ErrorHandler implements MiddlewareInterface
     private $formatters = [];
 
     /** @var FormatterInterface */
-    private $defaultFormatter = [];
+    private $defaultFormatter;
 
     /**
      * Configure the error formatters

src/HttpErrorException.php

@@ -6,7 +6,7 @@
 use Exception;
 use Middlewares\ErrorFormatter;
 use Middlewares\ErrorHandler;
-use Middlewares\HttpErrorException;
+use Middlewares\Utils\HttpErrorException;
 use Middlewares\Utils\Dispatcher;
 use Middlewares\Utils\Factory;
 use PHPUnit\Framework\TestCase;