Skip to content

[8.x] Add $validator->sometimesNested() to work with nested arrays #38385

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 5 commits into from
Closed

[8.x] Add $validator->sometimesNested() to work with nested arrays #38385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
90be153
Add method sometimesNested() to validator
Aug 13, 2021
b2b6404
Add tests for sometimesNested()
Aug 13, 2021
cb24e3a
Style fixes
Aug 15, 2021
007a2f5
Style fixes
Aug 15, 2021
ea22df7
Merge branch 'laravel:8.x' into validator-sometimes-nested-8x
NickSdot Aug 16, 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
24 changes: 24 additions & 0 deletions src/Illuminate/Validation/Validator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,30 @@ public function sometimes($attribute, $rules, callable $callback)
return $this;
}

/**
* Add conditions to a given nested field based on a Closure.
*
* @param string $parent
* @param string|array $attribute
* @param string|array $rules
* @param callable $callback
* @return $this
*/
public function sometimesNested(string $parent, $attribute, $rules, callable $callback)
{
foreach ((array) $this->getValue($parent) as $index => $item) {
$payload = new Fluent($item);

if ($callback($payload)) {
foreach ((array) $attribute as $key) {
$this->addRules([$parent.'.'.$index.'.'.$key => $rules]);
}
}
}

return $this;
}

/**
* Instruct the validator to stop validating after the first rule failure.
*
Expand Down
103 changes: 103 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4129,6 +4129,109 @@ public function testSometimesAddingRules()
$this->assertEquals(['foo.0.name' => ['Required', 'String']], $v->getRules());
}

public function testSometimesNestedAddingRules()
{
$data = [
'first' => [
[
'type' => 'email',
'value' => '[email protected]',
'description' => 'Foo Bar',
],
[
'type' => 'email',
'value' => 'No valid email',
'description' => 'Foo Bar',
],
[
'type' => 'url',
'value' => 'https://www.laraval.com/',
'description' => 'Foo Bar',
],
[
'type' => 'url',
'value' => 'No valid URL',
'description' => 'Foo Bar',
],
[
'type' => 'string',
'value' => 'Valid string',
'description' => 'Foo Bar',
],
],
'second' => [
'deep' => [
[
'type' => 'email',
'value' => '[email protected]',
'description' => 'Foo Bar',
],
[
'type' => 'string',
'value' => 'Valid string',
'description' => 'Foo Bar',
],
],
],
];

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.2.value' => ['Required'], 'first.4.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'String', function ($i) {
return $i->type === 'url';
});
$this->assertNotEquals(['first.4.value' => ['Required', 'String']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.4.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'String', function ($i) {
return $i->type === 'string';
});
$this->assertEquals(['first.4.value' => ['Required', 'String']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.4.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'email:rfc,dns', function ($i) {
return $i->type === 'email';
});
$this->assertNotEquals(['first.4.value' => ['Required', 'String']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.0.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'email:rfc,dns', function ($i) {
return $i->type === 'email';
});
$this->assertNotEquals(['first.4.value' => ['Required', 'String']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.0.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'email:rfc,dns', function ($i) {
return $i->type === 'email';
});
$this->assertNotEquals(['first.4.value' => ['Required', 'String']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.4.value' => ['Required']]);
$v->sometimesNested('first', 'value', 'email:rfc,dns', function ($i) {
return $i->type === 'email';
});
$this->assertEquals(['first.0.value' => ['email:rfc,dns'], 'first.1.value' => ['email:rfc,dns'], 'first.4.value' => ['Required']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['first.0.type' => ['Required']]);
$v->sometimesNested('first', 'value', 'email:rfc,dns', function ($i) {
return true;
});
$this->assertNotEquals(['first.0.type' => ['Required'], 'first.4.type' => ['email:rfc,dns']], $v->getRules());

$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, $data, ['second.deep.0.value' => ['Required'], 'second.deep.1.value' => ['Required']]);
$v->sometimesNested('second.deep', 'value', 'email:rfc,dns', function ($i) {
return $i->type === 'email';
});
$this->assertEquals(['second.deep.0.value' => ['Required', 'email:rfc,dns'], 'second.deep.1.value' => ['Required']], $v->getRules());
}

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