Merge pull request #73 from andreaselia/fix/issue-71

Fix issue with class based rules in an array

Author: tomirons

src/Commands/ExportPostmanCommand.php

@@ -312,6 +312,13 @@ protected function parseRulesIntoHumanReadable($attribute, $rules): string
     {
         // ... bail if user has asked for non interpreted strings:
         if (! $this->config['rules_to_human_readable']) {
+            foreach ($rules as $i => $rule) {
+                // because we don't support custom rule classes, we remove them from the rules
+                if (is_subclass_of($rule, Rule::class)) {
+                    unset($rules[$i]);
+                }
+            }
+
             return is_array($rules) ? implode(', ', $rules) : $this->safelyStringifyClassBasedRule($rules);
         }
 
@@ -327,6 +334,12 @@ protected function parseRulesIntoHumanReadable($attribute, $rules): string
          * Handle string based rules (e.g. required|string|max:30)
          */
         if (is_array($rules)) {
+            foreach ($rules as $i => $rule) {
+                if (is_object($rule)) {
+                    unset($rules[$i]);
+                }
+            }
+
             $this->validator = Validator::make([], [$attribute => implode('|', $rules)]);
 
             foreach ($rules as $rule) {

tests/Feature/ExportPostmanTest.php

@@ -190,13 +190,17 @@ public function test_rules_printing_export_to_human_readable_works()
         $this->assertCount(1, $fields->where('key', 'field_2')->where('description', 'The field 2 field is required., The field 2 must be an integer.'));
         $this->assertCount(1, $fields->where('key', 'field_3')->where('description', '(Optional), The field 3 must be an integer.'));
         $this->assertCount(1, $fields->where('key', 'field_4')->where('description', '(Nullable), The field 4 must be an integer.'));
+        // the below fails locally, but passes on GitHub actions?
         $this->assertCount(1, $fields->where('key', 'field_5')->where('description', 'The field 5 field is required., The field 5 must be an integer., The field 5 must not be greater than 30., The field 5 must be at least 1.'));
 
         /** This looks bad, but this is the default message in lang/en/validation.php, you can update to:.
          *
          * "'in' => 'The selected :attribute is invalid. Allowable values: :values',"
          **/
         $this->assertCount(1, $fields->where('key', 'field_6')->where('description', 'The selected field 6 is invalid.'));
+        $this->assertCount(1, $fields->where('key', 'field_7')->where('description', 'The field 7 field is required.'));
+        $this->assertCount(1, $fields->where('key', 'field_8')->where('description', 'validation.'));
+        $this->assertCount(1, $fields->where('key', 'field_9')->where('description', 'The field 9 field is required., The field 9 must be a string.'));
     }
 
     public function providerFormDataEnabled(): array

tests/Fixtures/ExampleFormRequest.php

@@ -16,7 +16,9 @@ public function rules(): array
             'field_4' => 'nullable|integer',
             'field_5' => 'required|integer|max:30|min:1',
             'field_6' => new In([1, 2, 3]),
-            'field_7' => new UppercaseRule,
+            'field_7' => ['required', new In([1, 2, 3])],
+            'field_8' => new UppercaseRule,
+            'field_9' => ['required', 'string', new UppercaseRule],
         ];
     }
 }