refactor code style and code review

app/Actions/Fortify/UpdateUserProfileInformation.php

@@ -4,10 +4,10 @@ namespace App\Actions\Fortify;
 
 use App\Models\User;
 use Illuminate\Contracts\Auth\MustVerifyEmail;
+use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Validator;
 use Illuminate\Validation\Rule;
 use Laravel\Fortify\Contracts\UpdatesUserProfileInformation;
-use Illuminate\Http\UploadedFile;
 
 class UpdateUserProfileInformation implements UpdatesUserProfileInformation
 {

app/Livewire/Chat/LastUsers.php

@@ -2,9 +2,9 @@
 
 namespace App\Livewire\Chat;
 
-use Livewire\Component;
-use Illuminate\View\View;
 use Illuminate\Support\Collection;
+use Illuminate\View\View;
+use Livewire\Component;
 
 class LastUsers extends Component
 {

app/Livewire/Chat/MessageWindow.php

@@ -5,9 +5,9 @@ namespace App\Livewire\Chat;
 use App\Events\ChatMessageUpdated;
 use App\Models\Chat;
 use App\Models\User;
-use Livewire\Component;
-use Illuminate\View\View;
 use Illuminate\Support\Collection;
+use Illuminate\View\View;
+use Livewire\Component;
 
 class MessageWindow extends Component
 {
@@ -21,7 +21,7 @@ class MessageWindow extends Component
 
     public User|null $recipientUser = null;
 
-    public  string $chanId;
+    public string $chanId;
 
     public User $curUser;
 
@@ -43,7 +43,7 @@ class MessageWindow extends Component
             ->prepend($message);
     }
 
-    public function updateRecipientId(int $id = null): void
+    public function updateRecipientId(?int $id = null): void
     {
     }
 
@@ -60,7 +60,7 @@ class MessageWindow extends Component
     }
 
     // FIXME
-    public function mount(int $recipientUserId = null): void
+    public function mount(?int $recipientUserId = null): void
     {
         $this->recipientUserId = $recipientUserId;
         $this->recipientUser = User::find($recipientUserId);

app/Livewire/Chat/Tracker.php

@@ -2,8 +2,8 @@
 
 namespace App\Livewire\Chat;
 
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class Tracker extends Component
 {
@@ -11,11 +11,6 @@ class Tracker extends Component
 
     public array $myMessages = [];
 
-    protected function getListeners(): array
-    {
-        return ['echo:direct-chat,ChatMessageUpdated' => 'notifyNewMessage'];
-    }
-
     public function notifyNewMessage(string $payload): void
     {
         $this->myMessages[] = $payload;
@@ -26,4 +21,9 @@ class Tracker extends Component
     {
         return view('livewire.chat.tracker');
     }
+
+    protected function getListeners(): array
+    {
+        return ['echo:direct-chat,ChatMessageUpdated' => 'notifyNewMessage'];
+    }
 }

app/Livewire/Consultant/ListConsultants.php

@@ -3,8 +3,8 @@
 namespace App\Livewire\Consultant;
 
 use App\Models\ConsultantEducation;
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class ListConsultants extends Component
 {

app/Livewire/Counter.php

@@ -2,8 +2,8 @@
 
 namespace App\Livewire;
 
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class Counter extends Component
 {

app/Livewire/Diary/ConsultantCommentsEdit.php

@@ -4,8 +4,8 @@ namespace App\Livewire\Diary;
 
 use App\Models\ConsultantDiaryComment;
 use App\Models\Diary;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\View\View;
 use Livewire\Component;
 

app/Livewire/Diary/MealPhotos.php

@@ -5,9 +5,9 @@ namespace App\Livewire\Diary;
 use App\Models\Meal;
 use App\Models\UserAttachment;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\View\View;
 use Livewire\Component;
 use Livewire\WithFileUploads;
-use Illuminate\View\View;
 
 class MealPhotos extends Component
 {

app/Livewire/Feed/Index.php

@@ -2,8 +2,8 @@
 
 namespace App\Livewire\Feed;
 
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class Index extends Component
 {

app/Livewire/MealForm.php

@@ -5,8 +5,8 @@ namespace App\Livewire;
 use App\Models\Diary;
 use App\Models\Meal;
 use App\Models\Portion;
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class MealForm extends Component
 {
@@ -42,11 +42,6 @@ class MealForm extends Component
         'portion' => 'required|min:1',
     ];
 
-    protected function getListeners(): array
-    {
-        return ['food-intake-updated' => '$refresh'];
-    }
-
     public function mount(): void
     {
         $this->diary = Diary::find($this->diaryId);
@@ -190,6 +185,11 @@ class MealForm extends Component
         $this->portions = array_values($filtered);
     }
 
+    protected function getListeners(): array
+    {
+        return ['food-intake-updated' => '$refresh'];
+    }
+
     private function addPortionIfItFilled(): void
     {
         if (mb_strlen($this->product_name) && $this->quantity && mb_strlen($this->portion)) {

app/Livewire/PortionShow.php

@@ -2,8 +2,8 @@
 
 namespace App\Livewire;
 
-use Livewire\Component;
 use Illuminate\View\View;
+use Livewire\Component;
 
 class PortionShow extends Component
 {

app/Livewire/TagsComponent.php

@@ -3,13 +3,12 @@
 namespace App\Livewire;
 
 // use App\Models\BlogPost;
+use App\Models\BlogPost;
+use App\Models\Recipe;
 use App\Models\Tag;
 use Illuminate\View\View;
 use Livewire\Attributes\On;
 use Livewire\Component;
-use Illuminate\Database\Eloquent\Model;
-use App\Models\Recipe;
-use App\Models\BlogPost;
 
 class TagsComponent extends Component
 {
@@ -19,7 +18,7 @@ class TagsComponent extends Component
 
     // protected $listeners = ['tagAdded', 'tagRemoved'];
 
-    public function mount(Recipe|BlogPost $parentComponent = null): void
+    public function mount(Recipe|BlogPost|null $parentComponent = null): void
     {
         $curTags = $parentComponent ? $parentComponent->tags->unique()->pluck('name') : [];
         /* $allTags = Tag::all(); */

app/Models/Chat.php

@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Builder;
 
 /**
  * App\Models\Chat

app/Models/Diary.php

@@ -2,12 +2,12 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Builder;
 
 /**
  * App\Models\Diary
@@ -59,7 +59,7 @@ class Diary extends Model
         ]);
     }
 
-    public function meals():HasMany
+    public function meals(): HasMany
     {
         return $this->hasMany(Meal::class);
     }

app/Models/UserAttachment.php

@@ -2,10 +2,10 @@
 
 namespace App\Models;
 
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**

app/Services/FeedService.php

@@ -6,8 +6,8 @@ use App\Models\BlogPost;
 use App\Models\Recipe;
 use App\Models\User;
 use Carbon\Carbon;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
 
 class FeedService
 {
@@ -46,21 +46,21 @@ class FeedService
         $hotBlogPosts = collect(
             DB::select($sql)
         )
-            ->map(fn($post) => BlogPost::find($post->id))
+            ->map(fn ($post) => BlogPost::find($post->id))
             ->take(16)
             ->chunk(4);
 
         $newbiesBlogPosts = User::orderBy('created_at', 'desc')
             ->withCount('author_of_blog_post')
             ->get()
-            ->filter(fn($u) => $u->author_of_blog_post_count > 0)
+            ->filter(fn ($u) => $u->author_of_blog_post_count > 0)
             ->take(4)
             ->pluck('id')
-            ->map(fn($id) => User::find($id)->author_of_blog_post()->limit(2)->get())
+            ->map(fn ($id) => User::find($id)->author_of_blog_post()->limit(2)->get())
             ->flatten()
             ->random();
 
-        $randomRecipe = Recipe::where('created_at', '>=', $dateMin)
+        Recipe::where('created_at', '>=', $dateMin)
             ->where('created_at', '<=', $dateMax)
             ->inRandomOrder()
             ->limit(2)
@@ -69,7 +69,7 @@ class FeedService
         $firstCollection = collect([$hotBlogPosts->first(), $newbiesBlogPosts->first()]);
         $secondCollection = collect([$hotBlogPosts->skip(1)->first(), $newbiesBlogPosts->skip(1)->first()]);
 
-        return $firstCollection->concat($secondCollection)->filter(fn($el) => !is_null($el) && $el->id);
+        return $firstCollection->concat($secondCollection)->filter(fn ($el) => ! is_null($el) && $el->id);
 
         // $firstCollection = $hotBlogPosts->first()->push($newbiesBlogPosts->first())->push($randomRecipe->first());
         // $secondCollection = $hotBlogPosts->skip(1)->first()->push($newbiesBlogPosts->skip(1)->first())->push($randomRecipe->skip(1)->first());