Skip to content

[10.x] Fix validation of attributes that depend on previous excluded attribute #48122

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 7 commits into from
Aug 27, 2023
Merged

[10.x] Fix validation of attributes that depend on previous excluded attribute #48122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
46c964c
fix validation of attributes that depend on others with exclude rule …
onlime Jun 30, 2023
d3e169e
fixed style
onlime Jun 30, 2023
934a36c
Validator's passes methods fixed;
hans-thomas Aug 19, 2023
bb1d2e6
tests added for passes method;
hans-thomas Aug 19, 2023
1705b12
Apply fixes from StyleCI;
hans-thomas Aug 19, 2023
db1b149
rename the test;
hans-thomas Aug 21, 2023
7c8b495
formatting
taylorotwell Aug 27, 2023
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: 6 additions & 2 deletions src/Illuminate/Validation/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,8 +430,6 @@ public function passes()
$this->validateAttribute($attribute, $rule);

if ($this->shouldBeExcluded($attribute)) {
$this->removeAttribute($attribute);

break;
}

Expand All @@ -441,6 +439,12 @@ public function passes()
}
}

foreach ($this->rules as $attribute => $rules) {
if ($this->shouldBeExcluded($attribute)) {
$this->removeAttribute($attribute);
}
}

// Here we will spin through all of the "after" hooks on this validator and
// fire them off. This gives the callbacks a chance to perform all kinds
// of other validation that needs to get wrapped up in this operation.
Expand Down
33 changes: 33 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8199,6 +8199,39 @@ public function testExclude($rules, $data, $expectedValidatedData)
$this->assertSame($expectedValidatedData, $validator->validated());
}

public function testExcludeBeforeADependentRule()
{
$validator = new Validator(
$this->getIlluminateArrayTranslator(),
[
'profile_id' => null,
'type' => 'denied',
],
[
'type' => ['required', 'string', 'exclude'],
'profile_id' => ['nullable', 'required_if:type,profile', 'integer'],
],
);

$this->assertTrue($validator->passes());
$this->assertSame(['profile_id' => null], $validator->validated());

$validator = new Validator(
$this->getIlluminateArrayTranslator(),
[
'profile_id' => null,
'type' => 'profile',
],
[
'type' => ['required', 'string', 'exclude'],
'profile_id' => ['nullable', 'required_if:type,profile', 'integer'],
],
);

$this->assertFalse($validator->passes());
$this->assertSame(['profile_id' => ['validation.required_if']], $validator->getMessageBag()->getMessages());
}

public function testExcludingArrays()
{
$validator = new Validator(
Expand Down