Skip to content

[9.x] Patch nested array validation rule regression bug #43897

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 6 commits into from
Aug 29, 2022
Merged

[9.x] Patch nested array validation rule regression bug #43897

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
b49e47b
Remove Arr::flatten
stevebauman Aug 19, 2022
35c0874
Update tests and remove no-longer relevant tests
stevebauman Aug 19, 2022
3df2336
Add test for nested validation rules
stevebauman Aug 28, 2022
0de8df9
Rename and move test
stevebauman Aug 28, 2022
92b5402
Add failing validation run
stevebauman Aug 28, 2022
694b5e7
CS fix
stevebauman Aug 28, 2022
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
2 changes: 1 addition & 1 deletion src/Illuminate/Validation/ValidationRuleParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ protected function explodeWildcardRules($results, $attribute, $rules)

foreach ($data as $key => $value) {
if (Str::startsWith($key, $attribute) || (bool) preg_match('/^'.$pattern.'\z/', $key)) {
foreach (Arr::flatten((array) $rules) as $rule) {
foreach ((array) $rules as $rule) {
if ($rule instanceof NestedRules) {
$compiled = $rule->compile($key, $value, $data);

Expand Down
49 changes: 12 additions & 37 deletions tests/Validation/ValidationRuleParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,18 +144,6 @@ public function testExplodeFailsParsingRegexWithOtherRulesInSingleString()
$this->assertSame('bar)$/i', $exploded->rules['items.0.type'][2]);
}

public function testExplodeProperlyFlattensRuleArraysOfArrays()
{
$data = ['items' => [['type' => 'foo']]];

$exploded = (new ValidationRuleParser($data))->explode(
['items.*.type' => ['in:foo', [[['regex:/^(foo|bar)$/i']]]]]
);

$this->assertSame('in:foo', $exploded->rules['items.0.type'][0]);
$this->assertSame('regex:/^(foo|bar)$/i', $exploded->rules['items.0.type'][1]);
}

public function testExplodeGeneratesNestedRules()
{
$parser = (new ValidationRuleParser([
Expand Down Expand Up @@ -208,28 +196,19 @@ public function testExplodeHandlesArraysOfNestedRules()
]));

$results = $parser->explode([
'users.*.name' => [
Rule::forEach(function ($value, $attribute, $data) {
$this->assertEquals([
'users.0.name' => 'Taylor Otwell',
'users.1.name' => 'Abigail Otwell',
], $data);

return [Rule::requiredIf(true)];
}),
Rule::forEach(function ($value, $attribute, $data) {
'users.*.name' => Rule::forEach(function ($value, $attribute, $data) {
$this->assertEquals([
'users.0.name' => 'Taylor Otwell',
'users.1.name' => 'Abigail Otwell',
], $data);

return [
Rule::requiredIf(true),
$value === 'Taylor Otwell'
? Rule::in('taylor')
: Rule::in('abigail'),
];
}),
],
]);

$this->assertEquals([
Expand All @@ -240,8 +219,6 @@ public function testExplodeHandlesArraysOfNestedRules()
$this->assertEquals([
'users.*.name' => [
'users.0.name',
'users.0.name',
'users.1.name',
'users.1.name',
],
], $results->implicitAttributes);
Expand All @@ -254,9 +231,13 @@ public function testExplodeHandlesRecursivelyNestedRules()
]));

$results = $parser->explode([
'users.*.name' => [
Rule::forEach(function ($value, $attribute, $data) {
$this->assertSame('Taylor Otwell', $value);
'users.*.name' => Rule::forEach(function ($value, $attribute, $data) {
$this->assertSame('Taylor Otwell', $value);
$this->assertSame('users.0.name', $attribute);
$this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);

return Rule::forEach(function ($value, $attribute, $data) {
$this->assertNull($value);
$this->assertSame('users.0.name', $attribute);
$this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);

Expand All @@ -265,16 +246,10 @@ public function testExplodeHandlesRecursivelyNestedRules()
$this->assertSame('users.0.name', $attribute);
$this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);

return Rule::forEach(function ($value, $attribute, $data) {
$this->assertNull($value);
$this->assertSame('users.0.name', $attribute);
$this->assertEquals(['users.0.name' => 'Taylor Otwell'], $data);

return [Rule::requiredIf(true)];
});
return [Rule::requiredIf(true)];
});
}),
],
});
}),
]);

$this->assertEquals(['users.0.name' => ['required']], $results->rules);
Expand Down
31 changes: 31 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,37 @@ public function testInValidatableRulesReturnsValid()
$this->assertTrue($v->passes());
}

public function testValidateUsingNestedValidationRulesPasses()
{
$rules = [
'items' => ['array'],
'items.*' => ['array', ['required_array_keys', '|name']],
'items.*.|name' => [['in', '|ABC123']],
];

$data = [
'items' => [
['|name' => '|ABC123'],
],
];

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, $rules);

$this->assertTrue($v->passes());

$data = [
'items' => [
['|name' => '|1234'],
],
];

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, $rules);

$this->assertSame('validation.in', $v->messages()->get('items.0.|name')[0]);
}

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