Merge branch 'pr20090' into 7.x

Author: taylorotwell

src/Illuminate/Validation/Validator.php

@@ -277,7 +277,7 @@ public function __construct(Translator $translator, array $data, array $rules,
     }
 
     /**
-     * Parse the data array, converting dots to ->.
+     * Parse the data array, converting dots and asterisks.
      *
      * @param  array  $data
      * @return array
@@ -303,6 +303,33 @@ public function parseData(array $data)
         return $newData;
     }
 
+    /**
+     * Replace the placeholders used in data keys.
+     *
+     * @param  array  $data
+     * @return array
+     */
+    protected function replacePlaceholders($data)
+    {
+        $originalData = [];
+
+        foreach ($data as $key => $value) {
+            if (is_array($value)) {
+                $value = $this->replacePlaceholders($value);
+            }
+
+            $key = str_replace(
+                [$this->dotPlaceholder, '__asterisk__'],
+                ['.', '*'],
+                $key
+            );
+
+            $originalData[$key] = $value;
+        }
+
+        return $originalData;
+    }
+
     /**
      * Add an after validation callback.
      *
@@ -464,7 +491,7 @@ public function validated()
             }
         }
 
-        return $results;
+        return $this->replacePlaceholders($results);
     }
 
     /**

tests/Validation/ValidationValidatorTest.php

@@ -3880,6 +3880,32 @@ public function testPassingSlashVulnerability()
         $this->assertTrue($v->fails());
     }
 
+    public function testPlaceholdersAreReplaced()
+    {
+        $trans = $this->getIlluminateArrayTranslator();
+
+        $v = new Validator($trans, [
+            'matrix' => ['\\' => ['invalid'], '1\\' => ['invalid']],
+        ], [
+            'matrix.*.*' => 'integer',
+        ]);
+        $this->assertTrue($v->fails());
+
+        $v = new Validator($trans, [
+            'matrix' => ['\\' => [1], '1\\' => [1]],
+        ], [
+            'matrix.*.*' => 'integer',
+        ]);
+        $this->assertTrue($v->passes());
+
+        $v = new Validator($trans, [
+            'foo' => ['bar' => 'valid'], 'foo.bar' => 'invalid', 'foo->bar' => 'valid',
+        ], [
+            'foo\.bar' => 'required|in:valid',
+        ]);
+        $this->assertTrue($v->fails());
+    }
+
     public function testCoveringEmptyKeys()
     {
         $trans = $this->getIlluminateArrayTranslator();
@@ -3891,35 +3917,8 @@ public function testImplicitEachWithAsterisksWithArrayValues()
     {
         $trans = $this->getIlluminateArrayTranslator();
 
-        $v = new Validator($trans, ['foo' => [1, 2, 3]], ['foo' => 'size:4']);
-        $this->assertFalse($v->passes());
-
-        $v = new Validator($trans, ['foo' => [1, 2, 3, 4]], ['foo' => 'size:4']);
-        $this->assertTrue($v->passes());
-
-        $v = new Validator($trans, ['foo' => [1, 2, 3, 4]], ['foo.*' => 'integer', 'foo.0' => 'required']);
-        $this->assertTrue($v->passes());
-
-        $v = new Validator($trans, ['foo' => [['bar' => [1, 2, 3]], ['bar' => [1, 2, 3]]]], ['foo.*.bar' => 'size:4']);
-        $this->assertFalse($v->passes());
-
-        $v = new Validator($trans,
-            ['foo' => [['bar' => [1, 2, 3]], ['bar' => [1, 2, 3]]]], ['foo.*.bar' => 'min:3']);
-        $this->assertTrue($v->passes());
-
-        $v = new Validator($trans,
-            ['foo' => [['bar' => [1, 2, 3]], ['bar' => [1, 2, 3]]]], ['foo.*.bar' => 'between:3,6']);
-        $this->assertTrue($v->passes());
-
-        $v = new Validator($trans,
-            ['foo' => [['name' => 'first', 'votes' => [1, 2]], ['name' => 'second', 'votes' => ['something', 2]]]],
-            ['foo.*.votes' => ['Required', 'Size:2']]);
-        $this->assertTrue($v->passes());
-
-        $v = new Validator($trans,
-            ['foo' => [['name' => 'first', 'votes' => [1, 2, 3]], ['name' => 'second', 'votes' => ['something', 2]]]],
-            ['foo.*.votes' => ['Required', 'Size:2']]);
-        $this->assertFalse($v->passes());
+        $v = new Validator($trans, ['foo' => ['bar.baz' => '']], ['foo' => 'required']);
+        $this->assertEquals(['foo' => ['bar.baz' => '']], $v->validated());
     }
 
     public function testValidateNestedArrayWithCommonParentChildKey()