Skip to content

[11.x] Fix: Handles non nested explode of multiple Date and Numeric rules in ValidationRuleParser #54718

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 2 commits into from
Feb 19, 2025
Merged

[11.x] Fix: Handles non nested explode of multiple Date and Numeric rules in ValidationRuleParser #54718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffd951e
fix: added condition to exit if Rule is Date or Numeric
AlexandreMeledandri Feb 19, 2025
cf74e2d
test: added tests for new condition
AlexandreMeledandri Feb 19, 2025
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
4 changes: 4 additions & 0 deletions src/Illuminate/Validation/ValidationRuleParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ protected function explodeExplicitRule($rule, $attribute)
}

if (is_object($rule)) {
if ($rule instanceof Date || $rule instanceof Numeric) {
return explode('|', (string) $rule);
}

return Arr::wrap($this->prepareRule($rule, $attribute));
}

Expand Down
118 changes: 118 additions & 0 deletions tests/Validation/ValidationRuleParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,122 @@ public function testExplodeHandlesSegmentingNestedRules()
],
], $results->implicitAttributes);
}

public function testExplodeHandlesStringDateRule()
{
$parser = (new ValidationRuleParser([
'date' => '2021-01-01',
]));

$rules = [
'date' => 'date|date_format:Y-m-d',
];

$results = $parser->explode($rules);

$this->assertEquals([
'date' => [
'date',
'date_format:Y-m-d',
],
], $results->rules);
}

public function testExplodeHandlesDateRule()
{
$parser = (new ValidationRuleParser([
'date' => '2021-01-01',
]));

$rules = [
'date' => Rule::date(),
];

$results = $parser->explode($rules);

$this->assertEquals([
'date' => [
'date',
],
], $results->rules);
}

public function testExplodeHandlesDateRuleWithAdditionalRules()
{
$parser = (new ValidationRuleParser([
'date' => '2021-01-01',
]));

$rules = [
'date' => Rule::date()->format('Y-m-d'),
];

$results = $parser->explode($rules);

$this->assertEquals([
'date' => [
'date',
'date_format:Y-m-d',
],
], $results->rules);
}

public function testExplodeHandlesNumericStringRule()
{
$parser = (new ValidationRuleParser([
'number' => 42,
]));

$rules = [
'number' => 'numeric|max:100',
];

$results = $parser->explode($rules);

$this->assertEquals([
'number' => [
'numeric',
'max:100',
],
], $results->rules);
}

public function testExplodeHandlesNumericRule()
{
$parser = (new ValidationRuleParser([
'number' => 42,
]));

$rules = [
'number' => Rule::numeric(),
];

$results = $parser->explode($rules);

$this->assertEquals([
'number' => [
'numeric',
],
], $results->rules);
}

public function testExplodeHandlesNumericRuleWithAdditionalRules()
{
$parser = (new ValidationRuleParser([
'number' => 42,
]));

$rules = [
'number' => Rule::numeric()->max(100),
];

$results = $parser->explode($rules);

$this->assertEquals([
'number' => [
'numeric',
'max:100',
],
], $results->rules);
}
}
Loading