Merge pull request #26 from etsvThor/bugfix/laravel-data-upgrade

follow upgrade guide laravel data v3 to v4
etsvThor · Apr 18, 2024 · 448854e · 448854e
2 parents 4b46984 + 5a9731f
commit 448854e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
 # Changelog
+## 1.0.1
+- Follow upgrade guide for laravel-data
+- Drop support for laravel 9
+- Drop support for `spatie/laravel-data` v3
 
 ## 1.0.0
 - Support laravel 11

diff --git a/composer.json b/composer.json
@@ -15,9 +15,9 @@
     "require": {
         "php": "~8.1.0 | ~8.2.0 | ~8.3.0",
         "spatie/laravel-permission": "^4.0 | ^5.0 | ^6.0",
-        "laravel/framework": "^9.0 | ^10.0 | ^11.0",
+        "laravel/framework": "^10.0 | ^11.0",
         "laravel/socialite": "^5.1",
-        "spatie/laravel-data": "^3.9 | ^4.0"
+        "spatie/laravel-data": "^4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Http/Controllers/WebhookController.php b/src/Http/Controllers/WebhookController.php
@@ -6,6 +6,7 @@
 use EtsvThor\BifrostBridge\Jobs\ProcessWebhookBifrost;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Spatie\LaravelData\DataCollection;
 
 class WebhookController
 {
@@ -32,7 +33,7 @@ public function bifrost(Request $request): JsonResponse
         }
 
         ProcessWebhookBifrost::dispatch(
-            BifrostRoleData::collection($request->get('roles')),
+            BifrostRoleData::collect($request->get('roles'), DataCollection::class),
         );
 
         return response()->json(['success' => true]);