Merge pull request #8 from tyx/fix/handle-uncaught-exception

🚑 Reverse the handle of uncaught exception

Author: tyx

JsonExceptionHandler.php

@@ -26,7 +26,7 @@ public function onKernelException(GetResponseForExceptionEvent $event)
         $response = null;
 
         if (null !== $resolvedHttpCode) {
-            $response =new JsonResponse(['errors' => ['message' => $exception->getMessage()]], $resolvedHttpCode);
+            $response = new JsonResponse(['errors' => ['message' => $exception->getMessage()]], $resolvedHttpCode);
         }
 
         if ($exception instanceof InvalidCommandException) {
@@ -56,12 +56,9 @@ public function onKernelException(GetResponseForExceptionEvent $event)
             $response = new JsonResponse(['errors' => $violationsPayload], 400);
         }
 
-        if (null === $response) {
-            // If no support found, we let JsonExceptionController show it
-            throw $exception;
+        if (null !== $response) {
+            // Will stop the propagation according to symfony doc
+            $event->setResponse($response);
         }
-
-        // Will stop the propagation according to symfony doc
-        $event->setResponse($response);
     }
 }

tests/Units/JsonExceptionHandler.php

@@ -6,19 +6,21 @@
 
 class JsonExceptionHandler extends atoum\test
 {
-    public function test_uncaught_exception_should_be_thrown()
+    public function test_uncaught_exception_should_not_alter_event_response()
     {
         $this
             ->given(
                 $this->newTestedInstance(
                     new \Rezzza\SymfonyRestApiJson\ExceptionHttpCodeMap
                 )
             )
-            ->exception(function () {
-                $this->testedInstance->onKernelException($this->dispatchException(new \Exception('boum')));
-            })
-                ->hasMessage('boum')
-                ->isInstanceOf('Exception')
+            ->when(
+                $event = $this->dispatchException(new \Exception('boum')),
+                $this->testedInstance->onKernelException($event)
+            )
+            ->then
+                ->variable($event->getResponse())
+                    ->isNull()
         ;
     }