Merge pull request #33932 from klimov-paul/33357-fix-validator-dot-re…

…place [7.x ] Fix key composition for attribute with dot at validation error messages
laravel · Aug 19, 2020 · 0d1ac32 · 0d1ac32
2 parents 56d2fec + f9b9fda
commit 0d1ac32
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -776,7 +776,11 @@ public function addFailure($attribute, $rule, $parameters = [])
             $this->passes();
         }
 
-        $attribute = str_replace('__asterisk__', '*', $attribute);
+        $attribute = str_replace(
+            [$this->dotPlaceholder, '__asterisk__'],
+            ['.', '*'],
+            $attribute
+        );
 
         if (in_array($rule, $this->excludeRules)) {
             return $this->excludeAttribute($attribute);

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -3953,6 +3953,15 @@ public function testPlaceholdersAreReplaced()
             'foo\.bar' => 'required|in:valid',
         ]);
         $this->assertTrue($v->fails());
+        $this->assertArrayHasKey('foo.bar', $v->errors()->getMessages());
+
+        $v = new Validator($trans, [
+            'foo.bar' => 'valid',
+        ], [
+            'foo\.bar' => 'required|in:valid',
+        ]);
+        $this->assertTrue($v->passes());
+        $this->assertArrayHasKey('foo.bar', $v->validated());
     }
 
     public function testCoveringEmptyKeys()