Merge pull request #5792 from jnoordsij/fix-required-asterisk

Fix required field asterisk on array of rules for field

Author: pxpm

src/app/Library/CrudPanel/Traits/Validation.php

@@ -201,17 +201,21 @@ public function setRequiredFields($classOrRulesArray)
                 foreach ($validationRules as $rule) {
                     if (is_a($rule, BackpackCustomRule::class, true)) {
                         foreach ($rule->getFieldRules() as $customValidatorRules) {
-                            $key = $this->checkIfRuleIsRequired($key, $customValidatorRules);
-                            if ($key) {
-                                $requiredFields[] = $key;
+                            if ($requiredFieldName = $this->checkIfRuleIsRequired($key, $customValidatorRules)) {
+                                // Field is required, move on to next field
+                                $requiredFields[] = $requiredFieldName;
+                                break;
                             }
                         }
 
+                        // Try next rule for field
                         continue;
                     }
-                    $key = $this->checkIfRuleIsRequired($key, $rule);
-                    if ($key) {
-                        $requiredFields[] = $key;
+
+                    if ($requiredFieldName = $this->checkIfRuleIsRequired($key, $rule)) {
+                        // Field is required, move on to next field
+                        $requiredFields[] = $requiredFieldName;
+                        break;
                     }
                 }
             }

tests/Unit/CrudPanel/CrudPanelValidationTest.php

@@ -234,6 +234,7 @@ public function testItCanGetTheRequiredFields()
         $this->crudPanel->setValidation([
             'email' => 'required',
             'password.*.test' => 'required',
+            'not_required' => 'present',
         ]);
 
         $this->crudPanel->setValidation(UserRequest::class);
@@ -250,13 +251,31 @@ public function testItCanGetTheRequiredFieldsFromCustomRules()
         $this->crudPanel->setValidation([
             'email' => ValidUpload::field('required'),
             'password' => ValidUploadMultiple::field('required'),
+            'not_required' => ValidUpload::field('present'),
         ]);
 
         $this->assertEquals(['email', 'password'], array_values($this->crudPanel->getOperationSetting('requiredFields')));
         $this->assertTrue($this->crudPanel->isRequired('email'));
         $this->assertTrue($this->crudPanel->isRequired('password'));
     }
 
+    public function testItCanGetTheRequiredFieldsFromRulesArray()
+    {
+        $this->crudPanel->setModel(User::class);
+
+        $this->crudPanel->setValidation([
+            'email' => ['required', 'string'],
+            'password' => ['string', 'required'],
+            'password_confirm' => ['same:password', ValidUploadMultiple::field('required')],
+            'not_required' => ['string', 'present', 'foobar'],
+        ]);
+
+        $this->assertEquals(['email', 'password', 'password_confirm'], array_values($this->crudPanel->getOperationSetting('requiredFields')));
+        $this->assertTrue($this->crudPanel->isRequired('email'));
+        $this->assertTrue($this->crudPanel->isRequired('password'));
+        $this->assertTrue($this->crudPanel->isRequired('password_confirm'));
+    }
+
     public function testItCanValidateCustomRules()
     {
         $this->crudPanel->setModel(User::class);