Skip to content
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

Jump to bottom

[8.x] Add ValidatorAwareRule interface #37442

Merged
merged 2 commits into from
May 21, 2021
Merged

[8.x] Add ValidatorAwareRule interface #37442

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
e6aefbc
Add ValidatorAwareRule interface
bastien-phi May 21, 2021
e94e4c1
Update Validator.php
taylorotwell May 21, 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
14 changes: 14 additions & 0 deletions src/Illuminate/Contracts/Validation/ValidatorAwareRule.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

namespace Illuminate\Contracts\Validation;

interface ValidatorAwareRule
{
/**
* Set the current validator.
*
* @param \Illuminate\Validation\Validator $validator
* @return $this
*/
public function setValidator($validator);
}
5 changes: 5 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 @@ -9,6 +9,7 @@
use Illuminate\Contracts\Validation\ImplicitRule;
use Illuminate\Contracts\Validation\Rule as RuleContract;
use Illuminate\Contracts\Validation\Validator as ValidatorContract;
use Illuminate\Contracts\Validation\ValidatorAwareRule;
use Illuminate\Support\Arr;
use Illuminate\Support\Fluent;
use Illuminate\Support\MessageBag;
Expand Down Expand Up @@ -749,6 +750,10 @@ protected function validateUsingCustomRule($attribute, $value, $rule)

$value = is_array($value) ? $this->replacePlaceholders($value) : $value;

if ($rule instanceof ValidatorAwareRule) {
$rule->setValidator($this);
}

if ($rule instanceof DataAwareRule) {
$rule->setData($this->data);
}
Expand Down
113 changes: 113 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
use Illuminate\Contracts\Validation\DataAwareRule;
use Illuminate\Contracts\Validation\ImplicitRule;
use Illuminate\Contracts\Validation\Rule;
use Illuminate\Contracts\Validation\ValidatorAwareRule;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
Expand Down Expand Up @@ -5357,6 +5358,118 @@ public function message()

$this->assertTrue($v->fails());
$this->assertSame('The password confirmation does not match.', $v->errors()->get('password')[0]);

// Test access to the validator
$v = new Validator(
$this->getIlluminateArrayTranslator(),
['base' => 21, 'double' => 42],
[
'base' => ['integer'],
'double' => [
'integer',
new class implements Rule, ValidatorAwareRule
{
protected $validator;

public function setValidator($validator)
{
$this->validator = $validator;
}

public function passes($attribute, $value)
{
if ($this->validator->errors()->hasAny(['base', $attribute])) {
return true;
}

return $value === 2 * $this->validator->getData()['base'];
}

public function message()
{
return ['The :attribute must be the double of base.'];
}
},
],
]
);

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

$v = new Validator(
$this->getIlluminateArrayTranslator(),
['base' => 21, 'double' => 10],
[
'base' => ['integer'],
'double' => [
'integer',
new class implements Rule, ValidatorAwareRule
{
protected $validator;

public function setValidator($validator)
{
$this->validator = $validator;
}

public function passes($attribute, $value)
{
if ($this->validator->errors()->hasAny(['base', $attribute])) {
return true;
}

return $value === 2 * $this->validator->getData()['base'];
}

public function message()
{
return ['The :attribute must be the double of base.'];
}
},
],
]
);

$this->assertTrue($v->fails());
$this->assertSame('The double must be the double of base.', $v->errors()->get('double')[0]);

$v = new Validator(
$this->getIlluminateArrayTranslator(),
['base' => 21, 'double' => 'foo'],
[
'base' => ['integer'],
'double' => [
'integer',
new class implements Rule, ValidatorAwareRule
{
protected $validator;

public function setValidator($validator)
{
$this->validator = $validator;
}

public function passes($attribute, $value)
{
if ($this->validator->errors()->hasAny(['base', $attribute])) {
return true;
}

return $value === 2 * $this->validator->getData()['base'];
}

public function message()
{
return ['The :attribute must be the double of base.'];
}
},
],
]
);

$this->assertTrue($v->fails());
$this->assertCount(1, $v->errors()->get('double'));
$this->assertSame('validation.integer', $v->errors()->get('double')[0]);
}

public function testCustomValidationObjectWithDotKeysIsCorrectlyPassedValue()
Expand Down