Merge pull request #32452 from sileence/validates_array_with_keys

[7.x] Allow developers to specify accepted keys in array rule
laravel · Apr 21, 2020 · 0f8bf7e · 0f8bf7e
2 parents 3c9a67a + ceaf391
commit 0f8bf7e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Concerns/ValidatesAttributes.php b/src/Illuminate/Validation/Concerns/ValidatesAttributes.php
@@ -317,11 +317,20 @@ public function validateAlphaNum($attribute, $value)
      *
      * @param  string  $attribute
      * @param  mixed  $value
+     * @param  array  $parameters
      * @return bool
      */
-    public function validateArray($attribute, $value)
+    public function validateArray($attribute, $value, $parameters = [])
     {
-        return is_array($value);
+        if (! is_array($value)) {
+            return false;
+        }
+
+        if (empty($parameters)) {
+            return true;
+        }
+
+        return empty(array_diff_key($value, array_fill_keys($parameters, '')));
     }
 
     /**

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -672,6 +672,23 @@ public function testValidateArray()
         $this->assertFalse($v->passes());
     }
 
+    public function testValidateArrayKeys()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+        $rules = ['user' => 'array:name,username'];
+
+        $v = new Validator($trans, ['user' => ['name' => 'Duilio', 'username' => 'duilio']], $rules);
+        $this->assertTrue($v->passes());
+
+        // The array is valid if there's a missing key.
+        $v = new Validator($trans, ['user' => ['name' => 'Duilio']], $rules);
+        $this->assertTrue($v->passes());
+
+        // But it's not valid if there's an unexpected key.
+        $v = new Validator($trans, ['user' => ['name' => 'Duilio', 'username' => 'duilio', 'is_admin' => true]], $rules);
+        $this->assertFalse($v->passes());
+    }
+
     public function testValidateFilled()
     {
         $trans = $this->getIlluminateArrayTranslator();