Merge pull request #9 from Rasalas/v2.x

Add support for nested fields in form validation resolves #8
leafsphp · Nov 12, 2023 · 07a149c · 07a149c
2 parents 9fb5aee + 041edd5
commit 07a149c
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -34,13 +34,17 @@ composer require leafs/form
 <?php
 
 $data = [
-  'name' => 'Full Name',
+  'name' => [
+    'first' => 'Jane',
+    'last' => 'Doe',
+  ],
   'email' => 'example@example.com',
   'password' => 'password1234',
 ];
 
 $success = form()->validate($data, [
-  'name' => 'required',
+  'name.first' => 'required',
+  'name.last' => 'required',
   'email' => 'required|email',
   'password' => 'required|min:8'
 ]);

diff --git a/src/Form.php b/src/Form.php
@@ -199,7 +199,7 @@ public static function validate(array $data, array $rules)
                     $rule[1] = trim($rule[1]);
                 }
 
-                $value = $data[$field] ?? null;
+                $value = Form::getDotNotatedValue($data, $field);
 
                 if (!static::test($rule[0], $value, $rule[1] ?? null, $field)) {
                     $params = is_string($rule[1] ?? null) ? trim($rule[1], '()') : ($rule[1] ?? null);
@@ -225,6 +225,24 @@ public static function validate(array $data, array $rules)
         return $output;
     }
 
+    /**
+     * Get the value from a nested array by key.
+     *
+     * @param array $array The array to search in.
+     * @param string $key The key to search for.
+     * @return mixed|null The value if found, null otherwise.
+     */
+    public static function getDotNotatedValue($array, $key) {
+        $keys = explode('.', $key);
+        foreach ($keys as $k) {
+            if (!isset($array[$k])) {
+                return null;
+            }
+            $array = $array[$k];
+        }
+        return $array;
+    }
+
     /**
      * Add custom validation rule
      * @param string $name The name of the rule

diff --git a/tests/nesting.test.php b/tests/nesting.test.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+use Leaf\Form;
+
+test('getDotNotatedValue retrieves simple field', function () {
+    $array = ['name' => 'Max'];
+    expect(Form::getDotNotatedValue($array, 'name'))->toBe('Max');
+});
+
+test('getDotNotatedValue returns null for non-existent field', function () {
+    $array = ['name' => 'Max'];
+    expect(Form::getDotNotatedValue($array, 'age'))->toBeNull();
+});
+
+test('getDotNotatedValue retrieves nested field', function () {
+    $nestedArray = [
+        'customer' => [
+            'phone' => '123456789',
+            'name' => 'Anna'
+        ],
+        'order' => [
+            'id' => 1
+        ]
+    ];
+    expect(Form::getDotNotatedValue($nestedArray, 'customer.phone'))->toBe('123456789');
+    expect(Form::getDotNotatedValue($nestedArray, 'customer.name'))->toBe('Anna');
+    expect(Form::getDotNotatedValue($nestedArray, 'order.id'))->toBe(1);
+});
+
+test('getDotNotatedValue retrieves deeply nested field', function () {
+    $deepNestedArray = [
+        'customer' => [
+            'details' => [
+                'address' => [
+                    'city' => 'Berlin'
+                ]
+            ]
+        ]
+    ];
+    expect(Form::getDotNotatedValue($deepNestedArray, 'customer.details.address.city'))->toBe('Berlin');
+});
+
+test('getDotNotatedValue returns null for non-existent nested field', function () {
+    $deepNestedArray = [
+        'customer' => [
+            'details' => [
+                'address' => [
+                    'city' => 'Berlin'
+                ]
+            ]
+        ]
+    ];
+    expect(Form::getDotNotatedValue($deepNestedArray, 'customer.details.phone'))->toBeNull();
+});