✨ exception handler now aware of request

src/App.php

@@ -198,7 +198,7 @@ public function dispatch(ServerRequest $request = null, $catchesExceptions = tru
             }
 
             $handler = $this->exceptionHandler;
-            $response = $handler($e);
+            $response = $handler($e, $request);
 
             if (!$response instanceof \Psr\Http\Message\ResponseInterface) {
                 throw new InvalidHandlerResponseException('The exception handler ['.get_class($handler).'] did not return a valid response.');

src/ErrorHandlers/DefaultExceptionHandler.php

@@ -18,6 +18,13 @@ class DefaultExceptionHandler implements ExceptionHandler
      */
     protected $ignore = [];
 
+    /**
+     * @param string $class
+     */
+    public function addIgnored($class) {
+        array_push($this->ignore, $class);
+    }
+
     /**
      * @param Exception|RouteNotFoundException|ContainerNotFoundException $e
      * @param RequestInterface $request

src/ErrorHandlers/ExceptionHandler.php

@@ -2,12 +2,15 @@
 
 namespace Photogabble\Tuppence\ErrorHandlers;
 
+use Psr\Http\Message\RequestInterface;
+
 interface ExceptionHandler
 {
     /**
      * @param \Exception $e
+     * @param RequestInterface $request
      * @return \Psr\Http\Message\ResponseInterface
      */
-    public function __invoke(\Exception $e);
+    public function __invoke(\Exception $e, RequestInterface $request);
 }
 

tests/Unit/AppTest.php

@@ -10,6 +10,7 @@
 use Photogabble\Tuppence\ErrorHandlers\DefaultExceptionHandler;
 use Photogabble\Tuppence\ErrorHandlers\InvalidHandlerException;
 use Photogabble\Tuppence\ErrorHandlers\InvalidHandlerResponseException;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Photogabble\Tuppence\Tests\TestEmitter;
@@ -126,7 +127,10 @@ public function testExceptionHandlerFailsWhenNotValidResponse()
         $exceptionMock = $this->createMock(DefaultExceptionHandler::class);
         $exceptionMock->expects($this->once())
             ->method('__invoke')
-            ->with($this->isInstanceOf(\League\Route\Http\Exception\NotFoundException::class));
+            ->with(
+                $this->isInstanceOf(\League\Route\Http\Exception\NotFoundException::class),
+                $this->isInstanceOf(RequestInterface::class)
+            );
 
         $emitter = new TestEmitter();
         $app = new App($emitter);
@@ -148,7 +152,10 @@ public function testExceptionHandler()
 
         $exceptionMock->expects($this->once())
             ->method('__invoke')
-            ->with($this->isInstanceOf(\League\Route\Http\Exception\NotFoundException::class));
+            ->with(
+                $this->isInstanceOf(\League\Route\Http\Exception\NotFoundException::class),
+                $this->isInstanceOf(RequestInterface::class)
+            );
 
         $emitter = new TestEmitter();
         $app = new App($emitter);

tests/Unit/DefaultExceptionHandlerTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Photogabble\Tuppence\Tests\Unit;
+
+use \Exception;
+use Photogabble\Tuppence\ErrorHandlers\DefaultExceptionHandler;
+use Zend\Diactoros\Response\JsonResponse;
+use Zend\Diactoros\ServerRequestFactory;
+
+class DefaultExceptionHandlerTest extends \PHPUnit_Framework_TestCase
+{
+    public function testResponse()
+    {
+        $handler = new DefaultExceptionHandler();
+        $exception = new Exception('Test');
+
+        $response = $handler($exception, ServerRequestFactory::fromGlobals());
+        $this->assertInstanceOf(JsonResponse::class, $response);
+
+        $jsonDecode = json_decode((string) $response->getBody()->getContents(), true);
+
+        $this->assertEquals('Test', $jsonDecode['message']);
+
+    }
+
+    public function testIgnoreFunctionality()
+    {
+        $handler = new DefaultExceptionHandler();
+        $handler->addIgnored(Exception::class);
+        $exception = new Exception('Test');
+
+        try {
+            $handler($exception, ServerRequestFactory::fromGlobals());
+        } catch (Exception $e) {
+            $this->assertSame($exception, $e);
+        }
+    }
+}