Skip to content

[8.x] Fixes array to string conversion exception when using custom validation messages for size rules #36885

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

Closed
wants to merge 6 commits into from
Closed

[8.x] Fixes array to string conversion exception when using custom validation messages for size rules #36885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f9c579a
Fixes array to string conversion when using custom validation message…
mateusjunges Apr 6, 2021
ac4aaa6
Apply fixes from styleci
mateusjunges Apr 6, 2021
965179d
Improve solution
mateusjunges Apr 6, 2021
dfa542a
Adding tests
mateusjunges Apr 6, 2021
8a39e35
fix tests
mateusjunges Apr 6, 2021
c09b714
add fixes from styleci
mateusjunges Apr 6, 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
8 changes: 5 additions & 3 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,9 +31,11 @@ protected function getMessage($attribute, $rule)

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

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

$customMessage = $this->getCustomMessageFromTranslator($customKey);

// First we check for a custom defined validation message for the attribute
// and rule. This allows the developer to specify specific messages for
Expand Down
22 changes: 22 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,28 @@ 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' => [
'name' => [
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'Some custom message here',
'array' => 'The :attribute must have between :min and :max items.',
],
],
],
]);
$v = new Validator($trans, ['name' => 'Taylor'], ['name' => 'between:10,20']);
$this->assertFalse($v->passes());
$v->messages()->setFormat(':message');
$this->assertSame('Some custom message here', $v->messages()->first('name'));
}

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