(feat): Added Laravel 11 support

rickgoemans · Mar 13, 2024 · 3d4f5d3 · 3d4f5d3
1 parent 6c97e87
commit 3d4f5d3
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 52 deletions.
diff --git a/composer.json b/composer.json
@@ -16,19 +16,19 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "illuminate/contracts": "^10.0",
-        "spatie/laravel-data": "^3.5",
+        "php": "^8.2",
+        "illuminate/contracts": "^11.0",
+        "spatie/laravel-data": "^4.1.0",
         "spatie/laravel-package-tools": "^1.14.0"
     },
     "require-dev": {
-        "larastan/larastan": "^2.0",
-        "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.8",
-        "orchestra/testbench": "^8.8",
-        "pestphp/pest": "^2.20",
-        "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "laravel/pint": "^1.13",
+        "nunomaduro/collision": "^8.1",
+        "larastan/larastan": "^2.8",
+        "orchestra/testbench": "^9.0",
+        "pestphp/pest": "^2.34",
+        "pestphp/pest-plugin-arch": "^2.5",
+        "pestphp/pest-plugin-laravel": "^2.3",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0"

diff --git a/src/Commands/LaravelUserSettingsCommand.php b/src/Commands/LaravelUserSettingsCommand.php
diff --git a/src/Concerns/ScopesUser.php b/src/Concerns/ScopesUser.php
@@ -20,12 +20,12 @@ public static function bootScopesUser(): void
             $query->where('user_id', $user->getKey());
         });
 
-        static::saving(function (Model $model) use ($user) {
+        static::saving(function (Model $model) use ($user): void {
             if (! $user instanceof Model) {
                 return;
             }
 
-            $model->user_id = $user->getKey();
+            $model->user_id = $user->getKey(); /** @phpstan-ignore-line */
         });
     }
 }
diff --git a/src/DataTransferObjects/UserSettingData.php b/src/DataTransferObjects/UserSettingData.php
@@ -12,6 +12,7 @@ public function __construct(
         public UserSettingType $type,
         public string $group,
         public string $key,
+        public ?int $id = null,
         public ?int $user_id = null,
         public mixed $value = null,
         public mixed $defaultValue = null,

diff --git a/src/LaravelUserSettingsServiceProvider.php b/src/LaravelUserSettingsServiceProvider.php
@@ -2,7 +2,7 @@
 
 namespace Rickgoemans\LaravelUserSettings;
 
-use Rickgoemans\LaravelUserSettings\Commands\LaravelUserSettingsCommand;
+use Illuminate\Contracts\Foundation\Application;
 use Rickgoemans\LaravelUserSettings\Services\UserSettingService;
 use Spatie\LaravelPackageTools\Package;
 use Spatie\LaravelPackageTools\PackageServiceProvider;
@@ -18,15 +18,14 @@ public function configurePackage(Package $package): void
          */
         $package
             ->name('laravel-user-settings')
-            ->hasConfigFile()
-            ->hasMigration('create_user_settings_table')
-            ->hasCommand(LaravelUserSettingsCommand::class);
+            ->hasConfigFile('user-settings')
+            ->hasMigration('create_user_settings_table');
     }
 
     public function registeringPackage(): void
     {
         parent::registeringPackage();
 
-        app()->singleton(UserSettingService::class, UserSettingService::class);
+        $this->app->singleton(UserSettingService::class, fn (Application $app): UserSettingService => new UserSettingService());
     }
 }
diff --git a/src/Models/UserSetting.php b/src/Models/UserSetting.php
@@ -36,25 +36,19 @@ class UserSetting extends Model
 
     protected $dataClass = UserSettingData::class;
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function newEloquentBuilder($query): UserSettingQueryBuilder
     {
         return new UserSettingQueryBuilder($query);
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public static function newFactory(): UserSettingFactory
     {
         return UserSettingFactory::new();
     }
 
-    /**
-     * {@inheritdoc}
-     */
+    /** {@inheritdoc} */
     public function newCollection(array $models = []): UserSettingCollection
     {
         return new UserSettingCollection($models);

diff --git a/src/Services/UserSettingService.php b/src/Services/UserSettingService.php
@@ -6,6 +6,7 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
+use Rickgoemans\LaravelUserSettings\Collections\UserSettingCollection;
 use Rickgoemans\LaravelUserSettings\DataTransferObjects\UserSettingData;
 use Rickgoemans\LaravelUserSettings\Models\UserSetting;
 
@@ -46,13 +47,16 @@ public function set(string $group, string $key, mixed $payload): ?UserSetting
             return null;
         }
 
-        return UserSetting::updateOrCreate([
+        /** @var UserSetting $userSetting */
+        $userSetting = UserSetting::updateOrCreate([
             'group' => $group,
             'key' => $key,
         ], [
             ...$setting->except('created_at', 'updated_at')->all(),
             'value' => $payload,
         ]);
+
+        return $userSetting;
     }
 
     public function migrate(): void
@@ -64,17 +68,18 @@ public function migrate(): void
         }
 
         Cache::remember("user-settings.{$user->getKey()}", 60 * 60, function () use ($user) {
+            /** @var UserSettingCollection $userSettings */
             $userSettings = UserSetting::query()
                 ->forUser($user->getKey())
                 ->get();
 
             $this->registeredSettings
                 ->each(function (UserSettingData $data) use ($userSettings) {
-                    $dbSetting = $userSettings->first(fn (UserSetting $setting) => $setting->group == $data->group
-                        && $setting->key == $data->key);
-
+                    $dbSetting = $userSettings->first(fn (UserSetting $setting): bool => $setting->group === $data->group && $setting->key === $data->key); /** @phpstan-ignore-line */
                     if (! $dbSetting) {
-                        UserSetting::create($data->except('defaultValue', 'created_at', 'updated_at')->all());
+                        $userSetting = new UserSetting();
+                        $userSetting->fill($data->except('defaultValue', 'created_at', 'updated_at')->all());
+                        $userSetting->save();
                     }
                 });
         });

diff --git a/tests/ArchTest.php b/tests/ArchTest.php
@@ -2,4 +2,4 @@
 
 arch('it will not use debugging functions')
     ->expect(['dd', 'dump', 'ray'])
-    ->each->not->toBeUsed();
+    ->each->not->toBeUsed();
diff --git a/workbench/app/Providers/WorkbenchServiceProvider.php b/workbench/app/Providers/WorkbenchServiceProvider.php
@@ -22,4 +22,4 @@ public function boot(): void
     {
         Route::view('/', 'welcome');
     }
-}
+}