Merge branch 'master' into master

Author: emsifa

src/Helper.php

@@ -58,12 +58,12 @@ public static function arrayHas(array $array, string $key): bool
      * Get an item from an array using "dot" notation.
      * Adapted from: https://github.com/illuminate/support/blob/v5.3.23/Arr.php#L246
      *
-     * @param  array  $array
-     * @param  string $key
-     * @param  mixed  $default
+     * @param  array       $array
+     * @param  string|null $key
+     * @param  mixed       $default
      * @return mixed
      */
-    public static function arrayGet(array $array, string $key, $default = null)
+    public static function arrayGet(array $array, $key, $default = null)
     {
         if (is_null($key)) {
             return $array;
@@ -111,14 +111,21 @@ public static function arrayDot(array $array, string $prepend = ''): array
      * Set an item on an array or object using dot notation.
      * Adapted from: https://github.com/illuminate/support/blob/v5.3.23/helpers.php#L437
      *
-     * @param  mixed        $target
-     * @param  string|array $key
-     * @param  mixed        $value
-     * @param  bool         $overwrite
+     * @param mixed             $target
+     * @param string|array|null $key
+     * @param mixed             $value
+     * @param bool              $overwrite
      * @return mixed
      */
     public static function arraySet(&$target, $key, $value, $overwrite = true): array
     {
+        if (is_null($key)) {
+            if ($overwrite) {
+                return $target = array_merge($target, $value);
+            }
+            return $target = array_merge($value, $target);
+        }
+
         $segments = is_array($key) ? $key : explode('.', $key);
 
         if (($segment = array_shift($segments)) === '*') {

src/Validation.php

@@ -282,9 +282,9 @@ public function extractValuesForWildcards(array $data, string $attributeKey): ar
      * Allows us to not spin through all of the flattened data for some operations.
      *
      * @param  string  $attributeKey
-     * @return string
+     * @return string|null null when root wildcard
      */
-    protected function getLeadingExplicitAttributePath(string $attributeKey): string
+    protected function getLeadingExplicitAttributePath(string $attributeKey)
     {
         return rtrim(explode('*', $attributeKey)[0], '.') ?: null;
     }
@@ -295,10 +295,10 @@ protected function getLeadingExplicitAttributePath(string $attributeKey): string
      *
      * Used to extract a sub-section of the data for faster iteration.
      *
-     * @param  string  $attributeKey
+     * @param  string|null $attributeKey
      * @return array
      */
-    protected function extractDataFromPath(string $attributeKey): array
+    protected function extractDataFromPath($attributeKey): array
     {
         $results = [];
 

tests/ValidatorTest.php

@@ -4,12 +4,13 @@
 
 use DateTime;
 use PHPUnit\Framework\TestCase;
+use Rakit\Validation\Rule;
 use Rakit\Validation\Rules\UploadedFile;
 use Rakit\Validation\Validator;
 
 class ValidatorTest extends TestCase
 {
-
+    /** @var Validator */
     protected $validator;
 
     protected function setUp()
@@ -812,6 +813,71 @@ public function testEmptyArrayAssocValidation()
 
         $this->assertFalse($validation->passes());
     }
+  
+    /**
+     * Test root asterisk validation.
+     *
+     * @dataProvider rootAsteriskProvider
+     */
+    public function testRootAsteriskValidation(array $data, array $rules, $errors = null)
+    {
+        $validation = $this->validator->validate($data, $rules);
+        $this->assertSame(empty($errors), $validation->passes());
+        $errorBag = $validation->errors();
+        if (!empty($errors)) {
+            foreach ($errors as $error) {
+                $field = $error[0];
+                $rule = $error[1] ?? null;
+                $error = $errorBag->get($field);
+                $this->assertNotEmpty($error);
+                if ($rule !== null) {
+                    $this->assertArrayHasKey($rule, $error);
+                }
+            }
+        }
+    }
+
+    public function rootAsteriskProvider(): array
+    {
+        return [
+            'control sample success' => [
+                ['Body' => ['a' => 1, 'b' => 2]],
+                ['Body.*' => 'integer|min:0'],
+            ],
+            'control sample failure' => [
+                ['Body' => ['a' => 1, 'b' => -2]],
+                ['Body.*' => 'integer|min:0'],
+                [['Body.b', 'min']],
+            ],
+            'root field success' => [
+                ['a' => 1, 'b' => 2],
+                ['*' => 'integer|min:0'],
+            ],
+            'root field failure' => [
+                ['a' => 1, 'b' => -2],
+                ['*' => 'integer|min:0'],
+                [['b', 'min']],
+            ],
+            'root array success' => [
+                [[1], [2]],
+                ['*.*' => 'integer|min:0'],
+            ],
+            'root array failure' => [
+                [[1], [-2]],
+                ['*.*' => 'integer|min:0'],
+                [['1.0', 'min']],
+            ],
+            'root dict success' => [
+                ['a' => ['c' => 1, 'd' => 4], 'b' => ['c' => 'e', 'd' => 8]],
+                ['*.c' => 'required'],
+            ],
+            'root dict failure' => [
+                ['a' => ['c' => 1, 'd' => 4], 'b' => ['d' => 8]],
+                ['*.c' => 'required'],
+                [['b.c', 'required']],
+            ],
+        ];
+    }
 
     public function testArrayValidation()
     {