Merge pull request #224 from RonasIT/206_correct_rules_generation

refactor: correct rules generation

Author: DenTray

src/Generators/RequestsGenerator.php

@@ -135,15 +135,15 @@ protected function getSearchValidationParameters(): array
             'per_page',
         ]);
 
-        $parameters['array'] = ['with'];
-
         $parameters['string'] = ['order_by'];
 
         $parameters['string-nullable'] = ['query'];
 
+        $parameters['array'] = ['with'];
+
         $parameters['string-required'] = ['with.*'];
 
-        return $this->getValidationParameters($parameters, false);
+        return $this->getValidationParameters($parameters, true);
     }
 
     public function getValidationParameters($parameters, $requiredAvailable): array
@@ -187,7 +187,7 @@ protected function getRules($name, $type, $required, $nullable, $present): array
         }
 
         if ($required) {
-            $rules[] = 'required';
+            array_unshift($rules, 'required');
         }
 
         if ($nullable) {

tests/fixtures/CommandTest/get_request.php

@@ -14,7 +14,7 @@ public function rules(): array
 
         return [
             'with' => 'array',
-            'with.*' => 'string|required|in:' . $availableRelations,
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 

tests/fixtures/CommandTest/search_request.php

@@ -17,9 +17,9 @@ public function rules(): array
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
-            'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string|in:' . $availableRelations,
+            'with' => 'array',
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 

tests/fixtures/CommandTest/search_request_subfolder_model.php

@@ -17,9 +17,9 @@ public function rules(): array
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'desc' => 'boolean',
             'all' => 'boolean',
-            'with' => 'array',
             'query' => 'string|nullable',
-            'with.*' => 'string|in:' . $availableRelations,
+            'with' => 'array',
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 

tests/fixtures/RequestGeneratorTest/create_request.php

@@ -9,7 +9,7 @@ class CreatePostRequest extends Request
     public function rules(): array
     {
         return [
-            'user_id' => 'integer|exists:users,id|required',
+            'user_id' => 'required|integer|exists:users,id',
             'is_draft' => 'boolean',
             'is_published' => 'boolean|present',
         ];

tests/fixtures/RequestGeneratorTest/get_request.php

@@ -14,7 +14,7 @@ public function rules(): array
 
         return [
             'with' => 'array',
-            'with.*' => 'string|required|in:' . $availableRelations,
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 

tests/fixtures/RequestGeneratorTest/search_request.php

@@ -12,16 +12,16 @@ public function rules(): array
         $availableRelations = implode(',', $this->getAvailableRelations());
 
         return [
-            'user_id' => 'integer|exists:users,id|required',
+            'user_id' => 'required|integer|exists:users,id',
             'page' => 'integer',
             'per_page' => 'integer',
             'is_published' => 'boolean',
             'desc' => 'boolean',
             'all' => 'boolean',
-            'with' => 'array',
             'order_by' => 'string|in:' . $this->getOrderableFields(Post::class),
             'query' => 'string|nullable',
-            'with.*' => 'string|in:' . $availableRelations,
+            'with' => 'array',
+            'with.*' => 'required|string|in:' . $availableRelations,
         ];
     }
 

tests/fixtures/RequestGeneratorTest/update_request.php

@@ -11,7 +11,7 @@ class UpdatePostRequest extends Request
     public function rules(): array
     {
         return [
-            'user_id' => 'integer|exists:users,id|required',
+            'user_id' => 'required|integer|exists:users,id',
             'is_draft' => 'boolean',
             'is_published' => 'boolean',
         ];