Skip to content

Commit 6909ec5

Browse files
committed
Added typehinting to custom collection. Fixed mass assignment error on id field.
1 parent eb446a1 commit 6909ec5

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/Collections/UserSettingCollection.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
namespace Rickgoemans\LaravelUserSettings\Collections;
44

55
use Illuminate\Database\Eloquent\Collection;
6+
use Rickgoemans\LaravelUserSettings\Models\UserSetting;
67

8+
/** @extends Collection<int, UserSetting> */
79
class UserSettingCollection extends Collection
810
{
911
}

src/Services/UserSettingService.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public function all(): Collection
3535
public function get(string $group, string $key): ?UserSettingData
3636
{
3737
return $this->registeredSettings
38-
->first(fn (UserSettingData $data) => $data->group === $group
38+
->first(fn (UserSettingData $data): bool => $data->group === $group
3939
&& $data->key === $key);
4040
}
4141

@@ -78,7 +78,7 @@ public function migrate(): void
7878
$dbSetting = $userSettings->first(fn (UserSetting $setting): bool => $setting->group === $data->group && $setting->key === $data->key); /** @phpstan-ignore-line */
7979
if (! $dbSetting) {
8080
$userSetting = new UserSetting();
81-
$userSetting->fill($data->except('defaultValue', 'created_at', 'updated_at')->all());
81+
$userSetting->fill($data->except('id', 'defaultValue', 'created_at', 'updated_at')->all());
8282
$userSetting->save();
8383
}
8484
});

0 commit comments

Comments
 (0)