feat: add support for optional fields

leafsphp · Nov 12, 2023 · 2bc65ee · 2bc65ee
1 parent fa9aece
commit 2bc65ee
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/src/Form.php b/src/Form.php
@@ -187,6 +187,16 @@ public static function validate(array $data, array $rules)
                 }
             }
 
+            if (in_array('optional', $userRules)) {
+                $userRules = array_filter($userRules, function ($rule) {
+                    return $rule !== 'optional';
+                });
+
+                if (!isset($data[$field])) {
+                    continue;
+                }
+            }
+
             foreach ($userRules as $rule) {
                 if (empty($rule)) {
                     continue;

diff --git a/tests/validation.test.php b/tests/validation.test.php
@@ -42,3 +42,21 @@
 
     expect(Form::errors())->toHaveKey('test3');
 });
+
+test('fields can be marked as optional', function () {
+    $itemsToValidate = [];
+
+    $validatedData = Form::validate($itemsToValidate, ['test4' => 'optional|email']);
+
+    expect($validatedData)->toBe($itemsToValidate);
+    expect(Form::errors())->not->toHaveKey('test4');
+});
+
+test('optional fields are validated correctly if provided', function () {
+    $itemsToValidate = ['test5' => ''];
+
+    $validatedData = Form::validate($itemsToValidate, ['test5' => 'optional|email']);
+
+    expect($validatedData)->toBe(false);
+    expect(Form::errors())->toHaveKey('test5');
+});