Adds unit tests for #55

Adds two new test cases for #55, one each for testing exceptions and
throwables (the latter depends on PHP 7.0).

Author: weierophinney

src/Listener/RenderErrorListener.php

@@ -6,6 +6,8 @@
 
 namespace ZF\ApiProblem\Listener;
 
+use Exception;
+use Throwable;
 use Zend\EventManager\EventManagerInterface;
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\Mvc\MvcEvent;
@@ -64,7 +66,7 @@ public function onRenderError(MvcEvent $e)
         $details = false;
 
         $exception = $e->getParam('exception');
-        if (($exception instanceof \Exception || $exception instanceof \Throwable)
+        if (($exception instanceof Throwable || $exception instanceof Exception)
             && ! $exception instanceof ViewExceptionInterface
         ) {
             $code = $exception->getCode();

test/Listener/RenderErrorListenerTest.php

@@ -7,6 +7,8 @@
 namespace ZFTest\ApiProblem\Listener;
 
 use PHPUnit_Framework_TestCase as TestCase;
+use RuntimeException;
+use TypeError;
 use Zend\Http\Request;
 use Zend\Http\Response;
 use Zend\Mvc\Application;
@@ -56,4 +58,93 @@ public function testOnRenderErrorCreatesAnApiProblemResponse()
         $this->assertContains('www.w3.org', $content['describedBy']);
         $this->assertContains('accept', $content['detail']);
     }
+
+    public function testOnRenderErrorCreatesAnApiProblemResponseFromException()
+    {
+        $response = new Response();
+        $request = new Request();
+        $request->getHeaders()->addHeaderLine('Accept', 'application/json');
+
+        $event = new MvcEvent();
+        $event->setError(Application::ERROR_EXCEPTION);
+        $event->setParam('exception', new RuntimeException('exception', 400));
+        $event->setRequest($request);
+        $event->setResponse($response);
+
+        $this->listener->setDisplayExceptions(true);
+        $this->listener->onRenderError($event);
+
+        $this->assertTrue($event->propagationIsStopped());
+        $this->assertSame($response, $event->getResponse());
+
+        $this->assertEquals(400, $response->getStatusCode());
+        $headers = $response->getHeaders();
+        $this->assertTrue($headers->has('Content-Type'));
+        $this->assertEquals(ApiProblem::CONTENT_TYPE, $headers->get('content-type')->getFieldValue());
+        $content = json_decode($response->getContent(), true);
+        $this->assertArrayHasKey('status', $content);
+        $this->assertArrayHasKey('title', $content);
+        $this->assertArrayHasKey('describedBy', $content);
+        $this->assertArrayHasKey('detail', $content);
+        $this->assertArrayHasKey('details', $content);
+
+        $this->assertEquals(400, $content['status']);
+        $this->assertEquals('Unexpected error', $content['title']);
+        $this->assertContains('www.w3.org', $content['describedBy']);
+        $this->assertEquals('exception', $content['detail']);
+
+        $this->assertInternalType('array', $content['details']);
+        $details = $content['details'];
+        $this->assertArrayHasKey('code', $details);
+        $this->assertArrayHasKey('message', $details);
+        $this->assertArrayHasKey('trace', $details);
+        $this->assertEquals(400, $details['code']);
+        $this->assertEquals('exception', $details['message']);
+    }
+
+    /**
+     * @requires PHP 7.0
+     */
+    public function testOnRenderErrorCreatesAnApiProblemResponseFromThrowable()
+    {
+        $response = new Response();
+        $request = new Request();
+        $request->getHeaders()->addHeaderLine('Accept', 'application/json');
+
+        $event = new MvcEvent();
+        $event->setError(Application::ERROR_EXCEPTION);
+        $event->setParam('exception', new TypeError('throwable', 400));
+        $event->setRequest($request);
+        $event->setResponse($response);
+
+        $this->listener->setDisplayExceptions(true);
+        $this->listener->onRenderError($event);
+
+        $this->assertTrue($event->propagationIsStopped());
+        $this->assertSame($response, $event->getResponse());
+
+        $this->assertEquals(400, $response->getStatusCode());
+        $headers = $response->getHeaders();
+        $this->assertTrue($headers->has('Content-Type'));
+        $this->assertEquals(ApiProblem::CONTENT_TYPE, $headers->get('content-type')->getFieldValue());
+        $content = json_decode($response->getContent(), true);
+        $this->assertArrayHasKey('status', $content);
+        $this->assertArrayHasKey('title', $content);
+        $this->assertArrayHasKey('describedBy', $content);
+        $this->assertArrayHasKey('detail', $content);
+        $this->assertArrayHasKey('details', $content);
+
+        $this->assertEquals(400, $content['status']);
+        $this->assertEquals('Unexpected error', $content['title']);
+        $this->assertContains('www.w3.org', $content['describedBy']);
+        $this->assertEquals('throwable', $content['detail']);
+
+        $this->assertInternalType('array', $content['details']);
+        $details = $content['details'];
+        $this->assertArrayHasKey('code', $details);
+        $this->assertArrayHasKey('message', $details);
+        $this->assertArrayHasKey('trace', $details);
+        $this->assertEquals(400, $details['code']);
+        $this->assertEquals('throwable', $details['message']);
+    }
 }