Skip to content

[8.x] Fix bug discarding input fields with empty validation rules #38563

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
Aug 26, 2021
Merged

[8.x] Fix bug discarding input fields with empty validation rules #38563

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
0cbdbe2
Add failing tests
bakerkretzmar Aug 26, 2021
9f05145
Fix `ValidationRuleParser` to ignore and preserve empty rules
bakerkretzmar Aug 26, 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
6 changes: 3 additions & 3 deletions src/Illuminate/Validation/ValidationRuleParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,8 @@ public static function filterConditionalRules($rules, array $data = [])

if ($attributeRules instanceof ConditionalRules) {
return [$attribute => $attributeRules->passes($data)
? $attributeRules->rules()
: $attributeRules->defaultRules(), ];
? array_filter($attributeRules->rules())
: array_filter($attributeRules->defaultRules()), ];
Comment on lines +295 to +296
Copy link
Contributor Author

@bakerkretzmar bakerkretzmar Aug 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not strictly necessary, but it prevents empty rules inside a conditional from sometimes resulting in a list of rules of just an empty string in an empty array: [''].

}

return [$attribute => collect($attributeRules)->map(function ($rule) use ($data) {
Expand All @@ -303,6 +303,6 @@ public static function filterConditionalRules($rules, array $data = [])

return $rule->passes($data) ? $rule->rules() : $rule->defaultRules();
})->filter()->flatten(1)->values()->all()];
})->filter()->all();
})->all();
}
}
31 changes: 31 additions & 0 deletions tests/Validation/ValidationRuleParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,29 @@ public function test_conditional_rules_are_properly_expanded_and_filtered()

$this->assertEquals([
'name' => ['required', 'min:2'],
'email' => [],
'password' => ['required', 'min:2'],
'username' => ['required', 'min:2'],
'address' => ['required'],
'city' => ['required', 'min:2'],
], $rules);
}

public function test_empty_rules_are_preserved()
{
$rules = ValidationRuleParser::filterConditionalRules([
'name' => [],
'email' => '',
'password' => Rule::when(true, 'required|min:2'),
]);

$this->assertEquals([
'name' => [],
'email' => '',
'password' => ['required', 'min:2'],
], $rules);
}

public function test_conditional_rules_with_default()
{
$rules = ValidationRuleParser::filterConditionalRules([
Expand All @@ -49,4 +65,19 @@ public function test_conditional_rules_with_default()
'address' => ['required', 'string', 'max:10'],
], $rules);
}

public function test_empty_conditional_rules_are_preserved()
{
$rules = ValidationRuleParser::filterConditionalRules([
'name' => Rule::when(true, '', ['string', 'max:10']),
'email' => Rule::when(false, ['required', 'min:2'], []),
'password' => Rule::when(false, 'required|min:2', 'string|max:10'),
]);

$this->assertEquals([
'name' => [],
'email' => [],
'password' => ['string', 'max:10'],
], $rules);
}
}