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 'multiple_of' validation rule #34788

Merged
merged 1 commit into from Oct 12, 2020
Merged

[8.x] Add 'multiple_of' validation rule #34788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 19 additions & 0 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Expand Up @@ -1251,6 +1251,25 @@ public function validateMin($attribute, $value, $parameters)
return $this->getSize($attribute, $value) >= $parameters[0];
}

/**
* Validate the value of an attribute is a multiple of a given value.
*
* @param string $attribute
* @param mixed $value
* @param array $parameters
* @return bool
*/
public function validateMultipleOf($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'multiple_of');

if (! $this->validateNumeric($attribute, $value) || ! $this->validateNumeric($attribute, $parameters[0])) {
return false;
}

return fmod($value, $parameters[0]) === 0.0;
}

/**
* "Indicate" validation should pass if value is null.
*
Expand Down
76 changes: 76 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Expand Up @@ -1847,6 +1847,82 @@ public function testValidateMax()
$this->assertFalse($v->passes());
}

/**
* @param mixed $input
* @param mixed $allowed
* @param bool $passes
*
* @dataProvider multipleOfDataProvider
*/
public function testValidateMutlpleOf($input, $allowed, $passes)
{
$trans = $this->getIlluminateArrayTranslator();

$v = new Validator($trans, ['foo' => $input], ['foo' => "multiple_of:{$allowed}"]);
$this->assertSame($passes, $v->passes());
}

public function multipleOfDataProvider()
{
return [
[0, 0, false], // zero (same)
[0, 10, true], // zero + integer
[10, 0, false],
[0, 10.1, true], // zero + float
[10.1, 0, false],
[0, -10, true], // zero + -integer
[-10, 0, false],
[0, -10.1, true], // zero + -float
[-10.1, 0, false],
[10, 10, true], // integer (same)
[10, 5, true], // integer + integer
[10, 4, false],
[20, 10, true],
[5, 10, false],
[10, -5, true], // integer + -integer
[10, -4, false],
[-20, 10, true],
[-5, 10, false],
[-10, -10, true], // -integer (same)
[-10, -5, true], // -integer + -integer
[-10, -4, false],
[-20, -10, true],
[-5, -10, false],
[10, 10.0, true], // integer + float (same)
[10, 5.0, true], // integer + float
[10, 4.0, false],
[20.0, 10, true],
[5.0, 10, false],
[10.0, -10.0, true], // integer + -float (same)
[10, -5.0, true], // integer + -float
[10, -4.0, false],
[-20.0, 10, true],
[-5.0, 10, false],
[10.0, -10.0, true], // -integer + float (same)
[-10, 5.0, true], // -integer + float
[-10, 4.0, false],
[20.0, -10, true],
[5.0, -10, false],
[10.5, 10.5, true], // float (same)
[10.5, 0.5, true], // float + float
[10.5, 0.3, false],
[31.5, 10.5, true],
[31.6, 10.5, false],
[10.5, -0.5, true], // float + -float
[10.5, -0.3, false],
[-31.5, 10.5, true],
[-31.6, 10.5, false],
[-10.5, -10.5, true], // -float (same)
[-10.5, -0.5, true], // -float + -float
[-10.5, -0.3, false],
[-31.5, -10.5, true],
[-31.6, -10.5, false],
['foo', 1, false], // invalid values
[1, 'foo', false],
['foo', 'foo', false],
];
}

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