Generate FormRequest rules using array syntax (#345)

Author: Nathan Esayeas

src/Generators/Statements/FormRequestGenerator.php

@@ -96,9 +96,9 @@ protected function buildRules(string $context, ValidateStatement $validateStatem
             $validationRules = $this->validationRules($qualifier, $column);
 
             foreach ($validationRules as $name => $rule) {
-                $formattedRule = implode('|', $rule);
+                $formattedRule = implode("', '", $rule);
 
-                $output .= self::INDENT."'{$name}' => '{$formattedRule}',".PHP_EOL;
+                $output .= self::INDENT."'{$name}' => ['{$formattedRule}'],".PHP_EOL;
             }
 
             return $output;

tests/fixtures/form-requests/certificate-store.php

@@ -24,12 +24,12 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => 'required|string',
-            'certificate_type_id' => 'required|integer|exists:certificate_types,id',
-            'reference' => 'required|string',
-            'document' => 'required|string',
-            'expiry_date' => 'required|date',
-            'remarks' => 'string',
+            'name' => ['required', 'string'],
+            'certificate_type_id' => ['required', 'integer', 'exists:certificate_types,id'],
+            'reference' => ['required', 'string'],
+            'document' => ['required', 'string'],
+            'expiry_date' => ['required', 'date'],
+            'remarks' => ['string'],
         ];
     }
 }

tests/fixtures/form-requests/certificate-update.php

@@ -24,12 +24,12 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => 'required|string',
-            'certificate_type_id' => 'required|integer|exists:certificate_types,id',
-            'reference' => 'required|string',
-            'document' => 'required|string',
-            'expiry_date' => 'required|date',
-            'remarks' => 'string',
+            'name' => ['required', 'string'],
+            'certificate_type_id' => ['required', 'integer', 'exists:certificate_types,id'],
+            'reference' => ['required', 'string'],
+            'document' => ['required', 'string'],
+            'expiry_date' => ['required', 'date'],
+            'remarks' => ['string'],
         ];
     }
 }

tests/fixtures/form-requests/form-request-configured.php

@@ -24,9 +24,9 @@ public function authorize()
     public function rules()
     {
         return [
-            'title' => 'required|string|max:400',
-            'content' => 'required|string',
-            'author_id' => 'required|integer|exists:users,id',
+            'title' => ['required', 'string', 'max:400'],
+            'content' => ['required', 'string'],
+            'author_id' => ['required', 'integer', 'exists:users,id'],
         ];
     }
 }

tests/fixtures/form-requests/nested-components.php

@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => 'required|string',
+            'name' => ['required', 'string'],
         ];
     }
 }

tests/fixtures/form-requests/other-store.php

@@ -24,8 +24,8 @@ public function authorize()
     public function rules()
     {
         return [
-            'field' => 'required',
-            'text' => 'required',
+            'field' => ['required'],
+            'text' => ['required'],
         ];
     }
 }

tests/fixtures/form-requests/post-index.php

@@ -24,7 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'title' => 'required|string|max:400',
+            'title' => ['required', 'string', 'max:400'],
         ];
     }
 }

tests/fixtures/form-requests/post-store.php

@@ -24,10 +24,10 @@ public function authorize()
     public function rules()
     {
         return [
-            'title' => 'required|string|max:400',
-            'content' => 'required|string',
-            'rating' => 'required|numeric|between:-99.99,99.99',
-            'count' => 'required|numeric|gt:0|between:0,99999999',
+            'title' => ['required', 'string', 'max:400'],
+            'content' => ['required', 'string'],
+            'rating' => ['required', 'numeric', 'between:-99.99,99.99'],
+            'count' => ['required', 'numeric', 'gt:0', 'between:0,99999999'],
         ];
     }
 }

tests/fixtures/form-requests/reference-cache.php

@@ -24,8 +24,8 @@ public function authorize()
     public function rules()
     {
         return [
-            'email' => 'required|email',
-            'password' => 'required|password',
+            'email' => ['required', 'email'],
+            'password' => ['required', 'password'],
         ];
     }
 }