Merge pull request #32 from esbenp/laravel-7

Laravel 7
esbenp · Oct 31, 2020 · 04bf9b3 · 04bf9b3
2 parents a3cf312 + 8a17a1f
commit 04bf9b3
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 26 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
         ]
     },
     "require": {
-        "laravel/framework": "~6.0"
+        "laravel/framework": "~7.0"
     },
     "require-dev": {
         "mockery/mockery": "1.3.*",

diff --git a/src/ExceptionHandler.php b/src/ExceptionHandler.php
@@ -2,7 +2,7 @@
 
 namespace Optimus\Heimdal;
 
-use Exception;
+use Throwable;
 use ReflectionClass;
 use InvalidArgumentException;
 use Asm89\Stack\CorsService;
@@ -40,7 +40,7 @@ public function __construct(Container $container)
      * @throws Exception
      * @returns void
      */
-    public function report(Exception $e)
+    public function report(Throwable $e)
     {
         parent::report($e);
 
@@ -86,7 +86,7 @@ public function report(Exception $e)
      * @param Exception $e
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)
     {
         $response = $this->generateExceptionResponse($request, $e);
 
@@ -112,7 +112,7 @@ public function render($request, Exception $e)
      * @param Exception $e
      * @return mixed
      */
-    private function generateExceptionResponse($request, Exception $e)
+    private function generateExceptionResponse($request, Throwable $e)
     {
         $formatters = $this->config['formatters'];
 

diff --git a/src/Formatters/BaseFormatter.php b/src/Formatters/BaseFormatter.php
@@ -2,7 +2,7 @@
 
 namespace Optimus\Heimdal\Formatters;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\JsonResponse;
 
 abstract class BaseFormatter
@@ -17,5 +17,5 @@ public function __construct(array $config, $debug)
         $this->config = $config;
     }
 
-    abstract protected function format(JsonResponse $response, Exception $e, array $reporterResponses);
+    abstract protected function format(JsonResponse $response, Throwable $e, array $reporterResponses);
 }
diff --git a/src/Formatters/ExceptionFormatter.php b/src/Formatters/ExceptionFormatter.php
@@ -2,13 +2,13 @@
 
 namespace Optimus\Heimdal\Formatters;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\JsonResponse;
 use Optimus\Heimdal\Formatters\BaseFormatter;
 
 class ExceptionFormatter extends BaseFormatter
 {
-    public function format(JsonResponse $response, Exception $e, array $reporterResponses)
+    public function format(JsonResponse $response, Throwable $e, array $reporterResponses)
     {
         $response->setStatusCode(500);
         $data = $response->getData(true);

diff --git a/src/Formatters/HttpExceptionFormatter.php b/src/Formatters/HttpExceptionFormatter.php
@@ -2,16 +2,16 @@
 
 namespace Optimus\Heimdal\Formatters;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\JsonResponse;
 use Optimus\Heimdal\Formatters\ExceptionFormatter;
 
 class HttpExceptionFormatter extends ExceptionFormatter
 {
-    public function format(JsonResponse $response, Exception $e, array $reporterResponses)
+    public function format(JsonResponse $response, Throwable $e, array $reporterResponses)
     {
         parent::format($response, $e, $reporterResponses);
-        
+
         if (count($headers = $e->getHeaders())) {
             $response->headers->add($headers);
         }

diff --git a/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php b/src/Formatters/UnprocessableEntityHttpExceptionFormatter.php
@@ -2,16 +2,16 @@
 
 namespace Optimus\Heimdal\Formatters;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\JsonResponse;
 use Optimus\Heimdal\Formatters\BaseFormatter;
 
 class UnprocessableEntityHttpExceptionFormatter extends BaseFormatter
 {
-    public function format(JsonResponse $response, Exception $e, array $reporterResponses)
+    public function format(JsonResponse $response, Throwable $e, array $reporterResponses)
     {
         $response->setStatusCode(422);
-        
+
         // Laravel validation errors will return JSON string
         $decoded = json_decode($e->getMessage(), true);
         // Message was not valid JSON

diff --git a/src/Reporters/BugsnagReporter.php b/src/Reporters/BugsnagReporter.php
@@ -2,7 +2,7 @@
 
 namespace Optimus\Heimdal\Reporters;
 
-use Exception;
+use Throwable;
 use Bugsnag\Client;
 use InvalidArgumentException;
 
@@ -29,7 +29,7 @@ public function __construct(array $config)
      *
      * @param Exception $exception
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         return $this->client->notifyException($exception);
     }

diff --git a/src/Reporters/ReporterInterface.php b/src/Reporters/ReporterInterface.php
@@ -2,9 +2,9 @@
 
 namespace Optimus\Heimdal\Reporters;
 
-use Exception;
+use Throwable;
 
 interface ReporterInterface
 {
-    public function report(Exception $e);
+    public function report(Throwable $e);
 }
diff --git a/src/Reporters/RollbarReporter.php b/src/Reporters/RollbarReporter.php
@@ -2,7 +2,7 @@
 
 namespace Optimus\Heimdal\Reporters;
 
-use Exception;
+use Throwable;
 use Rollbar;
 use InvalidArgumentException;
 
@@ -28,7 +28,7 @@ public function __construct(array $config)
      * @param Exception $exception
      * @return string|void
      */
-    public function report(Exception $exception)
+    public function report(Throwable $exception)
     {
         return Rollbar::report_exception($exception);
     }

diff --git a/src/Reporters/SentryReporter.php b/src/Reporters/SentryReporter.php
@@ -2,7 +2,7 @@
 
 namespace Optimus\Heimdal\Reporters;
 
-use Exception;
+use Throwable;
 use InvalidArgumentException;
 use Raven_Client;
 use Optimus\Heimdal\Reporters\ReporterInterface;
@@ -22,7 +22,7 @@ public function __construct(array $config)
         $this->config = $config;
     }
 
-    public function report(Exception $e)
+    public function report(Throwable $e)
     {
         $options = $this->config['sentry_options'];
 

diff --git a/src/ResponseFactory.php b/src/ResponseFactory.php
@@ -2,12 +2,12 @@
 
 namespace Optimus\Heimdal;
 
-use Exception;
+use Throwable;
 use Illuminate\Http\JsonResponse;
 
 class ResponseFactory
 {
-    public static function make(Exception $e)
+    public static function make(Throwable $e)
     {
         return new JsonResponse([
             'status' => 'error'

diff --git a/src/config/optimus.heimdal.php b/src/config/optimus.heimdal.php
@@ -10,7 +10,7 @@
     'formatters' => [
         SymfonyException\UnprocessableEntityHttpException::class => Formatters\UnprocessableEntityHttpExceptionFormatter::class,
         SymfonyException\HttpException::class => Formatters\HttpExceptionFormatter::class,
-        Exception::class => Formatters\ExceptionFormatter::class,
+        Throwable::class => Formatters\ExceptionFormatter::class,
     ],
 
     'response_factory' => \Optimus\Heimdal\ResponseFactory::class,