Merge branch '8.x' into 9.x

laravel · May 27, 2022 · e4e40df · e4e40df
2 parents 6999399 + c6d1a2d
commit e4e40df
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/Illuminate/Validation/Concerns/FormatsMessages.php b/src/Illuminate/Validation/Concerns/FormatsMessages.php
@@ -20,6 +20,10 @@ trait FormatsMessages
  */
  protected function getMessage($attribute, $rule)
  {
+ $attributeWithPlaceholders = $attribute;
+
+ $attribute = $this->replacePlaceholderInString($attribute);
+
  $inlineMessage = $this->getInlineMessage($attribute, $rule);
 
  // First we will retrieve the custom message for the validation rule if one
@@ -50,7 +54,7 @@ protected function getMessage($attribute, $rule)
  // specific error message for the type of attribute being validated such
  // as a number, file or string which all have different message types.
  elseif (in_array($rule, $this->sizeRules)) {
- return $this->getSizeMessage($attribute, $rule);
+ return $this->getSizeMessage($attributeWithPlaceholders, $rule);
  }
 
  // Finally, if no developer specified messages have been set, and no other

diff --git a/src/Illuminate/Validation/Validator.php b/src/Illuminate/Validation/Validator.php
@@ -865,6 +865,8 @@ public function addFailure($attribute, $rule, $parameters = [])
  $this->passes();
  }
 
+ $attributeWithPlaceholders = $attribute;
+
  $attribute = str_replace(
  [$this->dotPlaceholder, '__asterisk__'],
  ['.', '*'],
@@ -876,7 +878,7 @@ public function addFailure($attribute, $rule, $parameters = [])
  }
 
  $this->messages->add($attribute, $this->makeReplacements(
- $this->getMessage($attribute, $rule), $attribute, $rule, $parameters
+ $this->getMessage($attributeWithPlaceholders, $rule), $attribute, $rule, $parameters
  ));
 
  $this->failedRules[$attribute][$rule] = $parameters;

diff --git a/tests/Validation/ValidationValidatorTest.php b/tests/Validation/ValidationValidatorTest.php
@@ -7193,6 +7193,28 @@ public function testArrayKeysValidationFailsWithNotAnArray()
  );
  }
 
+ public function testArrayKeysWithDotIntegerMin()
+ {
+ $trans = $this->getIlluminateArrayTranslator();
+
+ $data = [
+ 'foo.bar' => -1,
+ ];
+
+ $rules = [
+ 'foo\.bar' => 'integer|min:1',
+ ];
+
+ $expectedResult = [
+ 'foo.bar' => [
+ 'validation.min.numeric',
+ ],
+ ];
+
+ $validator = new Validator($trans, $data, $rules, [], []);
+ $this->assertEquals($expectedResult, $validator->getMessageBag()->getMessages());
+ }
+
  protected function getTranslator()
  {
  return m::mock(TranslatorContract::class);