fix: return nothing when optional param absent

leafsphp · Nov 8, 2024 · c73cf7b · c73cf7b
1 parent f58fc91
commit c73cf7b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Form.php b/src/Form.php
@@ -287,6 +287,17 @@ public function validate(array $dataSource, array $validationSet)
             if (!$this->test($userRules, $value, $itemToValidate)) {
                 $output = false;
             } else if ($output !== false && !$endsWithWildcard) {
+                if (
+                    (is_array($userRules) && in_array('optional', $userRules))
+                    || (is_string($userRules) && strpos($userRules, 'optional') !== false)
+                ) {
+                    if (Anchor::deepGetDot($dataSource, $itemToValidate) !== null) {
+                        $output = Anchor::deepSetDot($output, $itemToValidate, $value);
+                    }
+
+                    continue;
+                }
+
                 $output = Anchor::deepSetDot($output, $itemToValidate, $value);
             }
         }

diff --git a/tests/rules.test.php b/tests/rules.test.php
@@ -36,7 +36,9 @@
         'item2' => 'not custom',
     ];
 
-    expect(validator()->validate($data, ['item1' => 'anotherCustomRule']))->toBe($data);
+    expect(validator()->validate($data, ['item1' => 'anotherCustomRule']))->toBe([
+        'item1' => 'custom',
+    ]);
     expect(validator()->validate($data, ['item2' => 'anotherCustomRule']))->toBe(false);
     expect(validator()->errors())->toHaveKey('item2');
 });