Merge pull request #19 from skwi/fix-exceptions

🐛 Fix Exception event subscriber for symfony 5.0+
novaway · Jan 26, 2021 · 3cf8fd6 · 3cf8fd6
2 parents ad6d45c + 4c20c10
commit 3cf8fd6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
     "php": "^7.1",
     "elasticsearch/elasticsearch": "^5.2 || ^6.0",
     "ruflin/elastica": "^6.0 || ^7.0",
-    "symfony/http-kernel": "^3.4 || ^4.1 || >=5.1.5",
+    "symfony/http-kernel": "^4.3 || >=5.1.5",
     "symfony/dependency-injection": "^4.2 || ^5.0",
     "symfony/web-profiler-bundle": "^4.2 || ^5.0",
     "symfony/config": "^4.2 || ^5.0",

diff --git a/src/EventSubscriber/ResponseExceptionSubscriber.php b/src/EventSubscriber/ResponseExceptionSubscriber.php
@@ -5,7 +5,7 @@
 
 use Elastica\Exception\ResponseException as ElasticaResponseException;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
-use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\Event\ExceptionEvent;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpFoundation\Response;
 use Novaway\ElasticsearchBundle\Exception\Response\ResponseException;
@@ -20,15 +20,13 @@ public static function getSubscribedEvents()
             ]
         ];
     }
-
-    public function process(GetResponseForExceptionEvent $event)
+    public function process(ExceptionEvent $event)
     {
-        $exception = $event->getException();
+        $exception = $event->getThrowable();
         if (!$exception instanceof ElasticaResponseException) {
             return;
         }
-
         $response = new ResponseException($exception->getRequest(), $exception->getResponse());
-        $event->setException($response);
+        $event->setThrowable($response);
     }
-}
+}