Quality enhancement in ErrorController

Author: dunglas

Controller/ExceptionController.php

@@ -11,13 +11,16 @@
 
 namespace Dunglas\ApiBundle\Controller;
 
+use Dunglas\ApiBundle\Exception\DeserializationException;
 use Dunglas\ApiBundle\JsonLd\Response;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\Debug\Exception\FlattenException;
 
 /**
  * Generates a Hydra API documentation.
  *
  * @author Kévin Dunglas <[email protected]>
+ * @author Baptiste Meyer <[email protected]>
  */
 class HydraController extends Controller
 {
@@ -30,4 +33,25 @@ public function docAction()
     {
         return new Response($this->get('api.hydra.documentation_builder')->getApiDocumentation());
     }
+
+    /**
+     * Converts a {@see \Symfony\Component\Debug\Exception\FlattenException}
+     * to a {@see \Dunglas\ApiBundle\JsonLd\Response}.
+     *
+     * @param FlattenException $exception
+     *
+     * @return Response
+     */
+    public function exceptionAction(FlattenException $exception)
+    {
+        if (is_a($exception->getClass(), DeserializationException::class, true)) {
+            $exception->setStatusCode(Response::HTTP_BAD_REQUEST);
+        }
+
+        return new Response(
+            $this->get('serializer')->normalize($exception, 'hydra-error'),
+            $exception->getStatusCode(),
+            $exception->getHeaders()
+        );
+    }
 }

Controller/HydraController.php

@@ -14,12 +14,6 @@
             <argument>%api.description%</argument>
         </service>
 
-        <!-- Controllers -->
-
-        <service id="api.hydra.controller.exception" class="Dunglas\ApiBundle\Controller\ExceptionController">
-            <argument type="service" id="api.hydra.normalizer.error" />
-        </service>
-
         <!-- Event listeners -->
 
         <service id="api.hydra.listener.link_header_response" class="Dunglas\ApiBundle\Hydra\EventListener\LinkHeaderResponseListener">
@@ -29,7 +23,7 @@
         </service>
 
         <service id="api.hydra.listener.request_exception" class="Dunglas\ApiBundle\Hydra\EventListener\RequestExceptionListener">
-            <argument type="string">api.hydra.controller.exception:showAction</argument>
+            <argument type="string">DunglasApiBundle:Hydra:exception</argument>
             <argument type="service" id="logger" on-invalid="null" />
 
             <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-96" />

Resources/config/hydra.xml

@@ -174,7 +174,6 @@ private function getContainerBuilderProphecy($withDoctrine = true)
         $containerBuilderProphecy->setDefinition('api.json_ld.normalizer.datetime', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.json_ld.encoder', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.documentation_builder', $definitionArgument)->shouldBeCalled();
-        $containerBuilderProphecy->setDefinition('api.hydra.controller.exception', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.listener.link_header_response', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.listener.request_exception', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.normalizer.collection', $definitionArgument)->shouldBeCalled();