fix merge error

mortenebak · Aug 21, 2024 · 3ff1a33 · 3ff1a33
2 parents c2e8209 + 3414e25
commit 3ff1a33
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/app/Livewire/Admin/Roles/CreateRole.php b/app/Livewire/Admin/Roles/CreateRole.php
@@ -26,8 +26,8 @@ public static function modalMaxWidth(): string
 
     public function mount()
     {
-        abort_if(!auth()->check(), 403);
-        abort_if(!auth()
+        abort_if(! auth()->check(), 403);
+        abort_if(! auth()
             ->user()
             ->hasPermissionTo('create roles'), 403);
     }
@@ -43,9 +43,9 @@ public function create(): void
             ]);
 
             $permissions = collect($this->rolePermissions)
-                ->map(function ($permission) use ($role) {
+                ->map(function ($permission) {
                     // convert string to int
-                    return (int)$permission;
+                    return (int) $permission;
                 })
                 ->toArray();
 

diff --git a/app/Rules/ValidCoupon.php b/app/Rules/ValidCoupon.php
@@ -25,9 +25,9 @@ public function __construct()
     /**
      * Determine if the validation rule passes.
      *
-     * @param string $attribute
-     * @param mixed $value
-     * @return bool
+     * @param  string  $attribute
+     * @param  mixed  $value
+     *
      * @throws ApiErrorException
      */
     public function passes($attribute, $value): bool
@@ -51,8 +51,6 @@ public function passes($attribute, $value): bool
 
     /**
      * Get the validation error message.
-     *
-     * @return string
      */
     public function message(): string
     {

diff --git a/app/View/Components/CardForm.php b/app/View/Components/CardForm.php
@@ -2,7 +2,6 @@
 
 namespace App\View\Components;
 
-use Closure;
 use Illuminate\Contracts\View\View;
 use Illuminate\View\Component;
 
@@ -20,8 +19,6 @@ public function __construct()
 
     /**
      * Get the view / contents that represent the component.
-     *
-     * @return View
      */
     public function render(): View
     {