Fix stop swallowing exceptions

Author: ogizanagi

Controller/ExceptionController.php

@@ -11,6 +11,7 @@
 
 namespace Dunglas\ApiBundle\Controller;
 
+use Dunglas\ApiBundle\Exception\DeserializationException;
 use Dunglas\ApiBundle\JsonLd\Response;
 use Symfony\Component\Debug\Exception\FlattenException;
 use Symfony\Component\HttpFoundation\Request;
@@ -50,8 +51,8 @@ public function __construct(NormalizerInterface $normalizer)
     public function showAction(Request $request, FlattenException $exception, DebugLoggerInterface $logger = null)
     {
         if (
-            'Dunglas\ApiBundle\Exception\DeserializationException' === $exception->getClass()
-            || is_subclass_of($exception->getClass(), 'Dunglas\ApiBundle\Exception\DeserializationException')
+            DeserializationException::class === $exception->getClass() ||
+            is_subclass_of($exception->getClass(), DeserializationException::class)
         ) {
             $exception->setStatusCode(Response::HTTP_BAD_REQUEST);
         }

DependencyInjection/Compiler/TwigExceptionListenerPass.php

@@ -13,7 +13,6 @@
 
 use Dunglas\ApiBundle\DependencyInjection\Compiler\DataProviderPass;
 use Dunglas\ApiBundle\DependencyInjection\Compiler\ResourcePass;
-use Dunglas\ApiBundle\DependencyInjection\Compiler\TwigExceptionListenerPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -33,6 +32,5 @@ public function build(ContainerBuilder $container)
 
         $container->addCompilerPass(new ResourcePass());
         $container->addCompilerPass(new DataProviderPass());
-        $container->addCompilerPass(new TwigExceptionListenerPass());
     }
 }

DunglasApiBundle.php

@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the DunglasApiBundle package.
+ *
+ * (c) Kévin Dunglas <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Dunglas\ApiBundle\Hydra\EventListener;
+
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\EventListener\ExceptionListener;
+
+/**
+ * Handle requests errors.
+ *
+ * @author Samuel ROZE <[email protected]>
+ * @author Kévin Dunglas <[email protected]>
+ */
+class RequestExceptionListener extends ExceptionListener
+{
+    /**
+     * @param GetResponseForExceptionEvent $event
+     */
+    public function onKernelException(GetResponseForExceptionEvent $event)
+    {
+        // Normalize exceptions with hydra errors only for resources
+        if (!$event->getRequest()->attributes->has('_resource')) {
+            return;
+        }
+
+        parent::onKernelException($event);
+    }
+}

Hydra/EventListener/RequestExceptionListener.php

@@ -28,11 +28,11 @@
             <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" />
         </service>
 
-        <service id="api.hydra.listener.exception" class="Symfony\Component\HttpKernel\EventListener\ExceptionListener">
-            <argument>api.hydra.controller.exception:showAction</argument>
+        <service id="api.hydra.listener.request_exception" class="Dunglas\ApiBundle\Hydra\EventListener\RequestExceptionListener">
+            <argument type="string">api.hydra.controller.exception:showAction</argument>
             <argument type="service" id="logger" on-invalid="null" />
 
-            <tag name="kernel.event_subscriber" />
+            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="-96" />
             <tag name="monolog.logger" channel="request" />
         </service>
 

Resources/config/hydra.xml

@@ -176,7 +176,7 @@ private function getContainerBuilderProphecy($withDoctrine = true)
         $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.exception', $definitionArgument)->shouldBeCalled();
+        $containerBuilderProphecy->setDefinition('api.hydra.listener.request_exception', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.normalizer.collection', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.normalizer.constraint_violation_list', $definitionArgument)->shouldBeCalled();
         $containerBuilderProphecy->setDefinition('api.hydra.normalizer.error', $definitionArgument)->shouldBeCalled();