Merge pull request paysera#11 from Laurgrin/error-handling

Update exception handling

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.5.1]
+### Changed
+- Changed error handling signatures to work with new versions.
+
 ## [1.5.0]
 ### Changed
 - `psr/log` bumped to `^2.0`

src/Listener/RestExceptionListener.php

@@ -14,6 +14,7 @@
 use Psr\Log\LoggerInterface;
 use Exception;
 use Paysera\Bundle\ApiBundle\Service\ErrorBuilderInterface;
+use Throwable;
 
 /**
  * @internal
@@ -55,7 +56,11 @@ public function onKernelException($event)
             return;
         }
 
-        $exception = $event->getException();
+        if (method_exists($event, 'getException')) {
+            $exception = $event->getException();
+        } else {
+            $exception = $event->getThrowable();
+        }
         $error = $this->errorBuilder->createErrorFromException($exception);
         $normalizedError = $this->coreNormalizer->normalize($error);
 
@@ -69,7 +74,7 @@ public function onKernelException($event)
         $event->setResponse($response);
     }
 
-    private function logException(Response $response, Exception $exception)
+    private function logException(Response $response, Throwable $exception)
     {
         if ($response->getStatusCode() >= 500) {
             $level = LogLevel::ERROR;

src/Service/ErrorBuilder.php

@@ -18,7 +18,7 @@
 use Paysera\Bundle\ApiBundle\Exception\ApiException;
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Exception\AuthenticationException;
-use Exception;
+use Throwable;
 
 class ErrorBuilder implements ErrorBuilderInterface
 {
@@ -37,12 +37,12 @@ public function configureError(string $errorCode, int $statusCode, string $messa
         ];
     }
 
-    public function createErrorFromException(Exception $exception): Error
+    public function createErrorFromException(Throwable $exception): Error
     {
         return $this->fillErrorFields($this->buildErrorFromException($exception));
     }
 
-    private function buildErrorFromException(Exception $exception): Error
+    private function buildErrorFromException(Throwable $exception): Error
     {
         if ($exception instanceof ApiException) {
             return (new Error())

src/Service/ErrorBuilderInterface.php

@@ -3,10 +3,10 @@
 
 namespace Paysera\Bundle\ApiBundle\Service;
 
-use Exception;
 use Paysera\Bundle\ApiBundle\Entity\Error;
+use Throwable;
 
 interface ErrorBuilderInterface
 {
-    public function createErrorFromException(Exception $exception): Error;
+    public function createErrorFromException(Throwable $exception): Error;
 }