- wip

app/Http/Requests/CategoryRequest.php

@@ -1,34 +1,34 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
 
 class CategoryRequest extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
+    public function rules(): array
     {
         return [
             'name' => 'required|string|min:3|max:25',
             'slug' => 'required|string|min:3|max:25',
             'priority' => 'required|numeric|min:0|max:10',
-            'default' => 'nullable|in:yes,1,true,on',
-            'visible' => 'nullable|in:yes,1,true,on'
+            'default' => 'nullable|boolean',
+            'visible' => 'required|boolean',
         ];
     }
+
+    protected function prepareForValidation(): void
+    {
+        $this->merge([
+            'default' => $this->toBoolean($this->default),
+            'visible' => $this->toBoolean($this->visible),
+        ]);
+    }
+
+    private function toBoolean($booleable): bool
+    {
+        return filter_var($booleable, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+    }
 }