fix by phpstan

fey · Mar 26, 2024 · c02c311 · c02c311
1 parent 64a4638
commit c02c311
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/app/Http/Controllers/Chapter/ChapterMemberController.php b/app/Http/Controllers/Chapter/ChapterMemberController.php
@@ -8,10 +8,11 @@
 use App\Models\User;
 use App\Services\ActivityService;
 use Flash;
+use Illuminate\Http\RedirectResponse;
 
 class ChapterMemberController extends Controller
 {
-    public function finish(Chapter $chapter, ActivityService $activityService)
+    public function finish(Chapter $chapter, ActivityService $activityService): RedirectResponse
     {
         $user = auth()->user();
         $currentChapterMember = $this->getMember($user, $chapter);
@@ -31,7 +32,7 @@ private function getMember(User $user, Chapter $chapter): ChapterMember
             ->members()
             ->whereUserId($user->id)
             ->firstOr(function () use ($chapter, $user): ChapterMember {
-                $chapterMember = ChapterMember::make([]);
+                $chapterMember = new ChapterMember([]);
 
                 $chapterMember->user()->associate($user);
                 $chapterMember->chapter()->associate($chapter);

diff --git a/app/Http/Controllers/ChapterController.php b/app/Http/Controllers/ChapterController.php
@@ -34,7 +34,7 @@ public function show(Chapter $chapter): View
         $currentChapterMember = $chapter
             ->members()
             ->whereUserId($authUser->id)->firstOr(function () use ($chapter, $authUser): ChapterMember {
-                $chapterMember = ChapterMember::make([]);
+                $chapterMember = new ChapterMember([]);
 
                 $chapterMember->user()->associate($authUser);
                 $chapterMember->chapter()->associate($chapter);

diff --git a/app/Models/ChapterMember.php b/app/Models/ChapterMember.php
@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use AllowDynamicProperties;
 use Database\Factories\ChapterMemberFactory;
 use Iben\Statable\Statable;
 use Illuminate\Database\Eloquent\Builder;
@@ -12,6 +13,7 @@
 
 /**
  * @method static ChapterMemberFactory factory(...$parameters)
+ * @property string $state
  */
 class ChapterMember extends Model
 {

diff --git a/database/factories/ReadChapterFactory.php b/database/factories/ReadChapterFactory.php
@@ -38,7 +38,6 @@ public function chapter(Chapter $chapter): self
     public function configure(): self
     {
         return $this->afterCreating(function (ChapterMember $chapterMember) {
-            /** @var ActivityService $service */
             // TODO: add logging
             // $service = app()->make(ActivityService::class);
             // $service->logChangedUserChapters(

diff --git a/phpstan.neon b/phpstan.neon
@@ -19,7 +19,6 @@ parameters:
         - vendor/*
         - app/Http/Controllers/Auth/*
     ignoreErrors:
-        - '/Parameter #1 \$value of function collect expects/'
         - '/PHPDoc type array of property App\\Models\\User::\$hidden is not covariant with PHPDoc type/'
         - '/PHPDoc type array of property App\\Models\\User::\$casts is not covariant with PHPDoc type/'
         - '/Unable to resolve the template type TKey in call to function collect/'