From 06b6ff26e1c91054e283986c39b6b5b9e3aed2ec Mon Sep 17 00:00:00 2001 From: Rachel Sloan Date: Thu, 15 Dec 2022 11:10:01 +0000 Subject: [PATCH 1/3] Add changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..8777788 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +## V2.1.0 + ++ Update outdated json error response + +## V2.0.0 + ++ Upgrade to Laravel 9 and update related dependencies \ No newline at end of file From 55d9a0673f1b8575f8e1300f7d9d4209ef614a21 Mon Sep 17 00:00:00 2001 From: Rachel Sloan Date: Thu, 15 Dec 2022 11:10:32 +0000 Subject: [PATCH 2/3] Update dependency versions --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index f9e437b..dc01bb6 100644 --- a/composer.json +++ b/composer.json @@ -17,11 +17,11 @@ "illuminate/support": "^9.0", "illuminate/session": "^9.0", "illuminate/pagination": "^9.0", - "mblsolutions/inspireddeck-php": "^1.5|^2.0" + "mblsolutions/inspireddeck-php": "^2.0" }, "require-dev": { "orchestra/testbench": "^7.0", - "phpunit/phpunit": "^9.0" + "phpunit/phpunit": "^9.5" }, "autoload": { "psr-4": { From 1657b8d1e9c4ac4491d41d25401737e2b986faa2 Mon Sep 17 00:00:00 2001 From: Rachel Sloan Date: Thu, 15 Dec 2022 11:11:41 +0000 Subject: [PATCH 3/3] Fix json response method to work with Laravel 9 --- src/InspiredDeckServiceProvider.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/InspiredDeckServiceProvider.php b/src/InspiredDeckServiceProvider.php index 24bf063..fc5f2d4 100644 --- a/src/InspiredDeckServiceProvider.php +++ b/src/InspiredDeckServiceProvider.php @@ -3,7 +3,6 @@ namespace MBLSolutions\InspiredDeckLaravel; use Illuminate\Contracts\Http\Kernel; -use Illuminate\Http\JsonResponse; use Illuminate\Http\RedirectResponse; use Illuminate\Support\ServiceProvider; use MBLSolutions\InspiredDeck\Exceptions\NotFoundException; @@ -12,6 +11,7 @@ use MBLSolutions\InspiredDeck\InspiredDeck; use MBLSolutions\InspiredDeckLaravel\Middleware\LoadInspiredDeckConfig; use Symfony\Component\HttpKernel\Exception\HttpException; +use Illuminate\Support\Facades\Response; class InspiredDeckServiceProvider extends ServiceProvider { @@ -64,13 +64,13 @@ public function registerMiddleware($middleware) * @param $request * @param $exception * @param callable|null $function - * @return JsonResponse|RedirectResponse + * @return \Illuminate\Http\JsonResponse|RedirectResponse */ public static function exceptionHandling($request, $exception, callable $function = null) { if (route_contains('async') || route_contains('api')) { if ($exception instanceof ValidationException) { - return JsonResponse::create([ + return Response::json([ 'message' => $exception->getMessage(), 'errors' => $exception->getValidationErrors() ], $exception->getCode()); @@ -98,4 +98,4 @@ public static function exceptionHandling($request, $exception, callable $functio return $function(); } -} \ No newline at end of file +}