code refactor

.github/workflows/main.yml

@@ -25,6 +25,6 @@ jobs:
     - name: Run insights
       run: php artisan insights --no-interaction --min-quality=90 --min-complexity=85 --min-architecture=90 --min-style=95
     - name: Run tests
-      run: ./vendor/bin/paratest --processes 2 --runner=WrapperRunner
+      run: ./vendor/bin/phpunit
       env:
         APP_ENV: testing

app/Http/Livewire/AcceptedInvitation.php → app/Http/Livewire/AcceptedInvitationComponent.php

@@ -8,7 +8,7 @@
 use Illuminate\Http\Request;
 use Livewire\Component;
 
-class AcceptedInvitation extends Component
+class AcceptedInvitationComponent extends Component
 {
     use AcceptedInvitationAuth;
 
@@ -35,6 +35,17 @@ public function mount(Request $request)
         $this->authorizeInvitation($request, $this->user);
     }
 
+    /**
+     * Render the component view.
+     *
+     * @return \Illuminate\View\View
+     */
+    public function render()
+    {
+        return view('accepted-invitations.create')
+            ->extends('layouts.guest-app');
+    }
+
     /**
      * Submit the form.
      *
@@ -49,14 +60,4 @@ public function submit()
 
         return redirect()->to('/home');
     }
-
-    /**
-     * Render the component view.
-     *
-     * @return \Illuminate\View\View
-     */
-    public function render()
-    {
-        return view('livewire.accepted-invitation');
-    }
 }

app/Http/Livewire/CreateRoleComponent.php

@@ -13,30 +13,12 @@ class CreateRoleComponent extends Component
 {
     use LivewireAuth;
 
-    /** @var string */
-    public $email;
-
-    /** @var string */
-    public $roleId;
-
-    /** @var \Illuminate\Database\Eloquent\Collection */
-    public $roles;
-
     /** @var string */
     public $routeName = 'roles.create';
 
     /** @var \App\Models\Role */
     public $role;
 
-    /** @var string */
-    public $action;
-
-    /** @var string */
-    public $name;
-
-    /** @var string */
-    public $label;
-
     /** @var \Illuminate\Database\Eloquent\Collection */
     public $permissions;
 
@@ -59,8 +41,7 @@ public function render()
     {
         return view('roles.create', [
             'permissionGroups' => SaveRoleViewModel::groupPermissions($this->permissions),
-        ])
-        ->extends('layouts.app');
+        ])->extends('layouts.app');
     }
 
     /**
@@ -70,11 +51,11 @@ public function render()
      */
     public function store()
     {
-        $this->runValidation();
+        $this->validate(null, [], $this->attributes());
 
         $role = Role::create([
-            'name' => $this->name,
-            'label' => $this->label,
+            'name' => $this->role['name'],
+            'label' => $this->role['label'],
         ]);
 
         $role->createPermissions($this->permissions);
@@ -85,18 +66,18 @@ public function store()
     }
 
     /**
-     * Run validation.
+     * Validation rules.
      *
-     * @return \Illuminate\Http\Response
+     * @return array
      */
-    private function runValidation()
+    protected function rules()
     {
-        $this->validate([
-            'name' => [
+        return [
+            'role.name' => [
                 'required',
-                Rule::unique('roles')->ignore($this->role->id ?? ''),
+                Rule::unique('roles', 'name'),
             ],
-            'label' => [
+            'role.label' => [
                 'required',
             ],
             'permissions.*.allowed' => [
@@ -107,7 +88,7 @@ private function runValidation()
                 'boolean',
                 new OwnerRestrictedRule($this->permissions),
             ],
-        ], [], $this->attributes());
+        ];
     }
 
     /**

app/Http/Livewire/CreateUserComponent.php

@@ -7,37 +7,22 @@
 use App\Models\User;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Mail;
+use Illuminate\Validation\Rule;
 use Livewire\Component;
 
 class CreateUserComponent extends Component
 {
     use LivewireAuth;
 
-    /** @var string */
-    public $email;
-
-    /** @var string */
-    public $roleId;
+    /** @var \App\Models\User */
+    public $user;
 
     /** @var \Illuminate\Database\Eloquent\Collection */
     public $roles;
 
     /** @var string */
     public $routeName = 'users.create';
 
-    /** @var array */
-    protected $rules = [
-        'email' => [
-            'required',
-            'email',
-            'unique:users',
-        ],
-        'roleId' => [
-            'required',
-            'exists:roles,id',
-        ],
-    ];
-
     /**
      * Render the component view.
      *
@@ -61,8 +46,8 @@ public function store()
         $this->validate();
 
         $user = User::create([
-            'email' => $this->email,
-            'role_id' => $this->roleId,
+            'email' => $this->user['email'],
+            'role_id' => $this->user['role_id'],
         ]);
 
         msg_success('User has been successfully created.');
@@ -72,4 +57,24 @@ public function store()
 
         return redirect()->route('users.index');
     }
+
+    /**
+     * Validation rules.
+     *
+     * @return array
+     */
+    protected function rules()
+    {
+        return [
+            'user.email' => [
+                'required',
+                'email',
+                Rule::unique('users', 'email'),
+            ],
+            'user.role_id' => [
+                'required',
+                Rule::exists('roles', 'id'),
+            ],
+        ];
+    }
 }

app/Http/Livewire/EditRoleComponent.php

@@ -14,17 +14,11 @@ class EditRoleComponent extends Component
     use LivewireAuth;
 
     /** @var \App\Models\Role */
-    public $role;
+    public Role $role;
 
     /** @var string */
     public $routeName = 'roles.edit';
 
-    /** @var string */
-    public $name;
-
-    /** @var string */
-    public $label;
-
     /** @var \Illuminate\Database\Eloquent\Collection */
     public $permissions;
 
@@ -37,10 +31,6 @@ class EditRoleComponent extends Component
     public function mount(Role $role)
     {
         $this->permissions = SaveRoleViewModel::buildRolePermissions($role->id);
-
-        $this->role = $role;
-        $this->name = $role->name;
-        $this->label = $role->label;
     }
 
     /**
@@ -63,11 +53,11 @@ public function render()
      */
     public function update()
     {
-        $this->runValidation();
+        $this->validate($this->validationRules(), [], $this->attributes());
 
         $this->role->update([
-            'name' => $this->name,
-            'label' => $this->label,
+            'name' => $this->role->name,
+            'label' => $this->role->label,
         ]);
 
         if (! $this->role->isAdmin()) {
@@ -80,18 +70,19 @@ public function update()
     }
 
     /**
-     * Run validation.
+     * Validation rules.
      *
-     * @return \Illuminate\Http\Response
+     * @return array
      */
-    private function runValidation()
+    protected function validationRules()
     {
-        $this->validate([
-            'name' => [
+        return [
+            'role.name' => [
                 'required',
-                Rule::unique('roles')->ignore($this->role->id ?? ''),
+                Rule::unique('roles', 'name')->ignore($this->role->id),
+                'unique:roles,id,'.$this->role->id,
             ],
-            'label' => [
+            'role.label' => [
                 'required',
             ],
             'permissions.*.allowed' => [
@@ -102,15 +93,32 @@ private function runValidation()
                 'boolean',
                 new OwnerRestrictedRule($this->permissions),
             ],
-        ], [], $this->attributes());
+        ];
+    }
+
+    /**
+     * Validation rules.
+     *
+     * @return array
+     */
+    protected function rules()
+    {
+        return [
+            'role.name' => [
+                'required',
+            ],
+            'role.label' => [
+                'required',
+            ],
+        ];
     }
 
     /**
      * Rename attributes.
      *
      * @return array
      */
-    private function attributes()
+    protected function attributes()
     {
         $attributes = [];
         $iteration = 1;