Remove deprecation from Symfony exception event listener

Author: Jean85

src/DependencyInjection/SentryExtension.php

@@ -15,12 +15,15 @@
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Exception\LogicException;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Reference;
 use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\HttpKernel\KernelEvents;
 
 /**
  * This is the class that loads and manages your bundle configuration
@@ -146,17 +149,37 @@ private function configureErrorListener(ContainerBuilder $container, array $proc
             return;
         }
 
+        $this->tagExceptionListener($container);
         $this->tagConsoleErrorListener($container);
     }
 
+    /**
+     * BC layer for Symfony < 4.3
+     */
+    private function tagExceptionListener(ContainerBuilder $container): void
+    {
+        $listener = $container->getDefinition(ErrorListener::class);
+        $method = class_exists(ExceptionEvent::class)
+            ? 'onException'
+            : 'onKernelException';
+
+        $tagAttributes = [
+            'event' => KernelEvents::EXCEPTION,
+            'method' => $method,
+            'priority' => '%sentry.listener_priorities.console_error%',
+        ];
+
+        $listener->addTag('kernel.event_listener', $tagAttributes);
+    }
+
     /**
      * BC layer for Symfony < 3.3; see https://symfony.com/blog/new-in-symfony-3-3-better-handling-of-command-exceptions
      */
     private function tagConsoleErrorListener(ContainerBuilder $container): void
     {
         $listener = $container->getDefinition(ErrorListener::class);
 
-        if (class_exists('Symfony\Component\Console\Event\ConsoleErrorEvent')) {
+        if (class_exists(ConsoleErrorEvent::class)) {
             $tagAttributes = [
                 'event' => ConsoleEvents::ERROR,
                 'method' => 'onConsoleError',

src/EventListener/ErrorListener.php

@@ -5,6 +5,7 @@
 use Sentry\State\HubInterface;
 use Symfony\Component\Console\Event\ConsoleErrorEvent;
 use Symfony\Component\Console\Event\ConsoleExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
 
 final class ErrorListener
@@ -21,6 +22,14 @@ public function __construct(HubInterface $hub)
         $this->hub = $hub; // not used, needed to trigger instantiation
     }
 
+    public function onException(ExceptionEvent $event): void
+    {
+        \Sentry\captureException($event->getThrowable());
+    }
+
+    /**
+     * BC layer for Symfony < 4.3
+     */
     public function onKernelException(GetResponseForExceptionEvent $event): void
     {
         \Sentry\captureException($event->getException());

src/Resources/config/services.xml

@@ -32,7 +32,8 @@
 
         <service id="Sentry\SentryBundle\EventListener\ErrorListener" class="Sentry\SentryBundle\EventListener\ErrorListener" public="false">
             <argument type="service" id="Sentry\State\HubInterface" />
-            <tag name="kernel.event_listener" event="kernel.exception" method="onKernelException" priority="%sentry.listener_priorities.request_error%" />
+            <!-- The following tag is done manually in PHP for BC with Symfony < 4.3,  -->
+<!--            <tag name="kernel.event_listener" event="kernel.exception" method="onException" priority="%sentry.listener_priorities.request_error%" />-->
             <!-- The following tag is done manually in PHP for BC with Symfony < 3.3 -->
 <!--            <tag name="kernel.event_listener" event="console.error" method="onConsoleError" priority="%sentry.listener_priorities.console_error%" />-->
         </service>