Merge pull request #18 from equip/feature/http-status-exceptions

Modify ExceptionHandler to support getHttpStatus
equip · Feb 29, 2016 · 9cc5525 · 9cc5525
2 parents 35fe673 + e701702
commit 9cc5525
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/Handler/ExceptionHandler.php b/src/Handler/ExceptionHandler.php
@@ -71,7 +71,12 @@ public function __invoke(
             $response = $response->withHeader('Content-Type', $type);
 
             try {
-                $response = $response->withStatus($e->getCode());
+                if (method_exists($e, 'getHttpStatus')) {
+                    $code = $e->getHttpStatus();
+                } else {
+                    $code = $e->getCode();
+                }
+                $response = $response->withStatus($code);
             } catch (InvalidArgumentException $_) {
                 // Exception did not contain a valid code
                 $response = $response->withStatus(500);

diff --git a/tests/Handler/ExceptionHandlerTest.php b/tests/Handler/ExceptionHandlerTest.php
@@ -63,6 +63,17 @@ public function testHandle($mime)
         $this->assertEquals($mime, $response->getHeaderLine('Content-Type'));
     }
 
+    public function testHandleWithHttpStatusCode()
+    {
+        $request = new ServerRequest;
+
+        $response = $this->execute(function ($request, $response) {
+            throw new ExceptionWithHttpStatusCode('foo');
+        }, $request);
+
+        $this->assertEquals(400, $response->getStatusCode());
+    }
+
     public function testNotFound()
     {
         $response = $this->execute(function ($request, $response) {
@@ -82,3 +93,11 @@ public function testMethodNotAllowed()
         $this->assertEquals('GET,PUT', $response->getHeaderLine('Allow'));
     }
 }
+
+class ExceptionWithHttpStatusCode extends \Exception
+{
+    public function getHttpStatus()
+    {
+        return 400;
+    }
+}