diff --git a/src/Generators/Statements/FormRequestGenerator.php b/src/Generators/Statements/FormRequestGenerator.php index 3e5f5b21..8e29004f 100644 --- a/src/Generators/Statements/FormRequestGenerator.php +++ b/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; diff --git a/tests/fixtures/form-requests/certificate-store.php b/tests/fixtures/form-requests/certificate-store.php index 5a1e2251..dec79684 100644 --- a/tests/fixtures/form-requests/certificate-store.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/certificate-update.php b/tests/fixtures/form-requests/certificate-update.php index 47461a72..34ec8d6d 100644 --- a/tests/fixtures/form-requests/certificate-update.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/form-request-configured.php b/tests/fixtures/form-requests/form-request-configured.php index 623d94f0..9bf452e1 100644 --- a/tests/fixtures/form-requests/form-request-configured.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/nested-components.php b/tests/fixtures/form-requests/nested-components.php index 1802bced..6932e358 100644 --- a/tests/fixtures/form-requests/nested-components.php +++ b/tests/fixtures/form-requests/nested-components.php @@ -24,7 +24,7 @@ public function authorize() public function rules() { return [ - 'name' => 'required|string', + 'name' => ['required', 'string'], ]; } } diff --git a/tests/fixtures/form-requests/other-store.php b/tests/fixtures/form-requests/other-store.php index e1a59e69..8bb4c35a 100644 --- a/tests/fixtures/form-requests/other-store.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/post-index.php b/tests/fixtures/form-requests/post-index.php index 2b62d049..4cad4c7f 100644 --- a/tests/fixtures/form-requests/post-index.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/post-store.php b/tests/fixtures/form-requests/post-store.php index 71138450..51ae7d02 100644 --- a/tests/fixtures/form-requests/post-store.php +++ b/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'], ]; } } diff --git a/tests/fixtures/form-requests/reference-cache.php b/tests/fixtures/form-requests/reference-cache.php index 9f8bbedc..7252bd1b 100644 --- a/tests/fixtures/form-requests/reference-cache.php +++ b/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'], ]; } }