Skip to content

[9.x] Fix array to string conversion when using custom validation messages for size rules #40074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 16, 2021
Merged

[9.x] Fix array to string conversion when using custom validation messages for size rules #40074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfcf253
fix array to string conversion when using custom validation messages …
mateusjunges Dec 16, 2021
70bf174
ci fixes
mateusjunges Dec 16, 2021
e957923
remove missing comment
mateusjunges Dec 16, 2021
128fcf8
formatting
taylorotwell Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 27 additions & 15 deletions src/Illuminate/Validation/Concerns/FormatsMessages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,12 @@ protected function getMessage($attribute, $rule)

$lowerRule = Str::snake($rule);

$customKey = "validation.custom.{$attribute}.{$lowerRule}";

$customMessage = $this->getCustomMessageFromTranslator(
$customKey = "validation.custom.{$attribute}.{$lowerRule}"
in_array($rule, $this->sizeRules)
? [$customKey.".{$this->getAttributeType($attribute)}", $customKey]
: $customKey
);

// First we check for a custom defined validation message for the attribute
Expand Down Expand Up @@ -118,25 +122,33 @@ protected function getFromLocalArray($attribute, $lowerRule, $source = null)
/**
* Get the custom error message from the translator.
*
* @param string $key
* @param array|string $keys
* @return string
*/
protected function getCustomMessageFromTranslator($key)
protected function getCustomMessageFromTranslator($keys)
{
if (($message = $this->translator->get($key)) !== $key) {
return $message;
}
foreach (Arr::wrap($keys) as $key) {
if (($message = $this->translator->get($key)) !== $key) {
return $message;
}

// If an exact match was not found for the key, we will collapse all of these
// messages and loop through them and try to find a wildcard match for the
// given key. Otherwise, we will simply return the key's value back out.
$shortKey = preg_replace(
'/^validation\.custom\./', '', $key
);
// If an exact match was not found for the key, we will collapse all of these
// messages and loop through them and try to find a wildcard match for the
// given key. Otherwise, we will simply return the key's value back out.
$shortKey = preg_replace(
'/^validation\.custom\./', '', $key
);

$message = $this->getWildcardCustomMessages(Arr::dot(
(array) $this->translator->get('validation.custom')
), $shortKey, $key);

if ($message !== $key) {
return $message;
}
}

return $this->getWildcardCustomMessages(Arr::dot(
(array) $this->translator->get('validation.custom')
), $shortKey, $key);
return Arr::last(Arr::wrap($keys));
}

/**
Expand Down
25 changes: 25 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,31 @@ public function testCustomValidationLinesAreRespected()
$this->assertSame('really required!', $v->messages()->first('name'));
}

public function testCustomValidationLinesForSizeRules()
{
$trans = $this->getIlluminateArrayTranslator();
$trans->getLoader()->addMessages('en', 'validation', [
'required' => 'required!',
'custom' => [
'image' => [
'gte' => [
'file' => 'Custom message for image files.',
'string' => 'Custom message for image filenames.',
],
],
],
]);

$v = new Validator($trans, ['image' => 'image.png'], ['image' => 'gte:50']);
$this->assertFalse($v->passes());
$this->assertSame('Custom message for image filenames.', $v->messages()->first('image'));

$file = new UploadedFile(__FILE__, '', null, null, true);
$v = new Validator($trans, ['image' => $file], ['image' => 'gte:50']);
$this->assertFalse($v->passes());
$this->assertSame('Custom message for image files.', $v->messages()->first('image'));
}

public function testCustomValidationLinesAreRespectedWithAsterisks()
{
$trans = $this->getIlluminateArrayTranslator();
Expand Down