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

[9.x] Add decimal validation rule #45356

Merged
merged 2 commits into from Dec 19, 2022
Merged

[9.x] Add decimal validation rule #45356

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
5fffb9c
Add `decimal` validation rule
Dec 19, 2022
43719cc
formatting
taylorotwell Dec 19, 2022
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
26 changes: 26 additions & 0 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Expand Up @@ -554,6 +554,32 @@ public function validateDateEquals($attribute, $value, $parameters)
return $this->compareDates($attribute, $value, $parameters, '=');
}

/**
* Validate that an attribute has a given number of decimal places.
*
* @param string $attribute
* @param mixed $value
* @param array<int, int|string> $parameters
* @return bool
*/
public function validateDecimal($attribute, $value, $parameters)
{
if (!$this->validateNumeric($attribute, $value)) {
return false;
}

$this->requireParameterCount(1, $parameters, 'decimal');

$matches = [];

preg_match('/^\d*.(\d*)$/', $value, $matches);

$decimals = strlen(end($matches));

return $decimals >= $parameters[0] &&
(! isset($parameters[1]) || $decimals <= $parameters[1]);
}

/**
* Validate that an attribute is different from another attribute.
*
Expand Down
37 changes: 37 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Expand Up @@ -2448,6 +2448,43 @@ public function testValidateInteger()
$this->assertTrue($v->passes());
}

public function testValidateDecimal()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['foo' => 'asdad'], ['foo' => 'Decimal:2,3']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.2345'], ['foo' => 'Decimal:2,3']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.234'], ['foo' => 'Decimal:2,3']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:2,3']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:2,3']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.234'], ['foo' => 'Decimal:2']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:2']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:2']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1'], ['foo' => 'Decimal:0,1']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'Decimal:0,1']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.23'], ['foo' => 'Decimal:0,1']);
$this->assertFalse($v->passes());
}

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