Merge pull request #144 from bearsunday/throwable-handler

Add Throwable handler

psalm.xml

@@ -7,12 +7,12 @@
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
 >
     <projectFiles>
-        <directory name="src" />
+        <directory name="src"/>
         <ignoreFiles>
-            <directory name="vendor" />
+            <directory name="vendor"/>
         </ignoreFiles>
     </projectFiles>
     <issueHandlers>
-        <MissingConstructor errorLevel="suppress" />
+        <MissingConstructor errorLevel="suppress"/>
     </issueHandlers>
 </psalm>

src/Extension/Error/ThrowableHandlerInterface.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BEAR\Sunday\Extension\Error;
+
+use BEAR\Sunday\Extension\Router\RouterMatch as Request;
+use Throwable;
+
+interface ThrowableHandlerInterface
+{
+    /**
+     * Handle Throwable
+     */
+    public function handle(Throwable $e, Request $request) : self;
+
+    /**
+     * Transfer error page
+     */
+    public function transfer() : void;
+}

src/Provide/Error/ErrorModule.php

@@ -5,6 +5,7 @@
 namespace BEAR\Sunday\Provide\Error;
 
 use BEAR\Sunday\Extension\Error\ErrorInterface;
+use BEAR\Sunday\Extension\Error\ThrowableHandlerInterface;
 use Ray\Di\AbstractModule;
 
 class ErrorModule extends AbstractModule
@@ -15,5 +16,6 @@ class ErrorModule extends AbstractModule
     protected function configure() : void
     {
         $this->bind(ErrorInterface::class)->to(VndError::class);
+        $this->bind(ThrowableHandlerInterface::class)->to(ThrowableHandler::class);
     }
 }

src/Provide/Error/ThrowableHandler.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BEAR\Sunday\Provide\Error;
+
+use BEAR\Sunday\Extension\Error\ErrorInterface;
+use BEAR\Sunday\Extension\Error\ThrowableHandlerInterface;
+use BEAR\Sunday\Extension\Router\RouterMatch as Request;
+use const E_ERROR;
+use Error;
+use ErrorException;
+use Exception;
+use Throwable;
+
+final class ThrowableHandler implements ThrowableHandlerInterface
+{
+    /**
+     * @var ErrorInterface
+     */
+    private $error;
+
+    public function __construct(ErrorInterface $error)
+    {
+        $this->error = $error;
+    }
+
+    public function handle(Throwable $e, Request $request) : ThrowableHandlerInterface
+    {
+        $e = $e instanceof Error ? new ErrorException($e->getMessage(), (int) $e->getCode(), E_ERROR, $e->getFile(), $e->getLine()) : $e;
+        assert($e instanceof Exception);
+        $this->error->handle($e, $request);
+
+        return $this;
+    }
+
+    public function transfer() : void
+    {
+        $this->error->transfer();
+    }
+}

src/Provide/Transfer/HttpResponder.php

@@ -52,6 +52,7 @@ public function __invoke(ResourceObject $ro, array $server) : void
     private function getOutput(ResourceObject $ro, array $server) : Output
     {
         $ro->toString(); // render and set headers
+
         return new Output($ro->code, ($this->header)($ro, $server), $ro->view ?: $ro->toString());
     }
 }

tests/Provide/Error/ThrowableHandlerTest.php

@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+namespace BEAR\Sunday\Provide\Error;
+
+use BEAR\Resource\Exception\ResourceNotFoundException;
+use BEAR\Sunday\Extension\Router\RouterMatch;
+use BEAR\Sunday\Provide\Transfer\ConditionalResponse;
+use BEAR\Sunday\Provide\Transfer\FakeHttpResponder;
+use BEAR\Sunday\Provide\Transfer\Header;
+use Exception;
+use PHPUnit\Framework\TestCase;
+
+class ThrowableHandlerTest extends TestCase
+{
+    /**
+     * @var int
+     */
+    public static $code;
+
+    /**
+     * @var ThrowableHandler
+     */
+    private $throableHandler;
+
+    protected function setUp() : void
+    {
+        FakeHttpResponder::reset();
+        $this->throableHandler = new ThrowableHandler(new VndError(new FakeHttpResponder(new Header, new ConditionalResponse)));
+        ini_set('error_log', '/dev/null');
+    }
+
+    public function testException() : void
+    {
+        $e = new ResourceNotFoundException('', 404);
+        $this->throableHandler->handle($e, new RouterMatch)->transfer();
+        $this->assertSame(404, FakeHttpResponder::$code);
+        $this->assertSame([['Content-Type: application/vnd.error+json', false]], FakeHttpResponder::$headers);
+        $this->assertSame('{"message":"Not Found"}', FakeHttpResponder::$body);
+    }
+
+    public function testError() : void
+    {
+        try {
+            1 / 0; // @phpstan-ignore-line
+        } catch (Exception $e) {
+        }
+        $this->throableHandler->handle($e, new RouterMatch)->transfer(); // @phpstan-ignore-line
+        $this->assertSame(500, FakeHttpResponder::$code);
+        $this->assertSame([['Content-Type: application/vnd.error+json', false]], FakeHttpResponder::$headers);
+        $this->assertSame('{"message":"500 Server Error"}', FakeHttpResponder::$body);
+    }
+}