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

[9.x] Ensure decimal rule handles large values #45693

Merged
merged 4 commits into from
Jan 23, 2023
Merged

[9.x] Ensure decimal rule handles large values #45693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
266ceee
Ensure decimal rule handles large values
timacdonald Jan 18, 2023
03e916f
Refactor
timacdonald Jan 18, 2023
5bd6010
Remove todos
timacdonald Jan 18, 2023
abe2a51
lint
timacdonald Jan 23, 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
32 changes: 17 additions & 15 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Illuminate\Validation\Concerns;

use Brick\Math\BigDecimal;
use Brick\Math\BigNumber;
use Brick\Math\Exception\MathException as BrickMathException;
use DateTime;
use DateTimeInterface;
Expand Down Expand Up @@ -436,9 +437,10 @@ public function validateBetween($attribute, $value, $parameters)
{
$this->requireParameterCount(2, $parameters, 'between');

$size = $this->getSize($attribute, $value);

return $size >= $parameters[0] && $size <= $parameters[1];
return with(
BigNumber::of($this->getSize($attribute, $value)),
fn ($size) => $size->isGreaterThanOrEqualTo($parameters[0]) && $size->isLessThanOrEqualTo($parameters[1])
);
}

/**
Expand Down Expand Up @@ -1080,15 +1082,15 @@ public function validateGt($attribute, $value, $parameters)
$this->shouldBeNumeric($attribute, 'Gt');

if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
return $this->getSize($attribute, $value) > $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isGreaterThan($parameters[0]);
}

if (is_numeric($parameters[0])) {
return false;
}

if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
return $value > $comparedToValue;
return BigNumber::of($value)->isGreaterThan($comparedToValue);
}

if (! $this->isSameType($value, $comparedToValue)) {
Expand All @@ -1115,15 +1117,15 @@ public function validateLt($attribute, $value, $parameters)
$this->shouldBeNumeric($attribute, 'Lt');

if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
return $this->getSize($attribute, $value) < $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isLessThan($parameters[0]);
}

if (is_numeric($parameters[0])) {
return false;
}

if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
return $value < $comparedToValue;
return BigNumber::of($value)->isLessThan($comparedToValue);
}

if (! $this->isSameType($value, $comparedToValue)) {
Expand All @@ -1150,15 +1152,15 @@ public function validateGte($attribute, $value, $parameters)
$this->shouldBeNumeric($attribute, 'Gte');

if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
return $this->getSize($attribute, $value) >= $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isGreaterThanOrEqualTo($parameters[0]);
}

if (is_numeric($parameters[0])) {
return false;
}

if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
return $value >= $comparedToValue;
return BigNumber::of($value)->isGreaterThanOrEqualTo($comparedToValue);
}

if (! $this->isSameType($value, $comparedToValue)) {
Expand All @@ -1185,15 +1187,15 @@ public function validateLte($attribute, $value, $parameters)
$this->shouldBeNumeric($attribute, 'Lte');

if (is_null($comparedToValue) && (is_numeric($value) && is_numeric($parameters[0]))) {
return $this->getSize($attribute, $value) <= $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isLessThanOrEqualTo($parameters[0]);
}

if (is_numeric($parameters[0])) {
return false;
}

if ($this->hasRule($attribute, $this->numericRules) && is_numeric($value) && is_numeric($comparedToValue)) {
return $value <= $comparedToValue;
return BigNumber::of($value)->isLessThanOrEqualTo($comparedToValue);
}

if (! $this->isSameType($value, $comparedToValue)) {
Expand Down Expand Up @@ -1385,7 +1387,7 @@ public function validateMax($attribute, $value, $parameters)
return false;
}

return $this->getSize($attribute, $value) <= $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isLessThanOrEqualTo($parameters[0]);
}

/**
Expand Down Expand Up @@ -1487,7 +1489,7 @@ public function validateMin($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'min');

return $this->getSize($attribute, $value) >= $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isGreaterThanOrEqualTo($parameters[0]);
}

/**
Expand Down Expand Up @@ -2162,7 +2164,7 @@ public function validateSize($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'size');

return $this->getSize($attribute, $value) == $parameters[0];
return BigNumber::of($this->getSize($attribute, $value))->isEqualTo($parameters[0]);
}

/**
Expand Down Expand Up @@ -2321,7 +2323,7 @@ public function validateUuid($attribute, $value)
*
* @param string $attribute
* @param mixed $value
* @return mixed
* @return int|float|string
Comment on lines -2324 to +2326
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tightening this return type, as I believe it can only return these types.

*/
protected function getSize($attribute, $value)
{
Expand Down
87 changes: 87 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2767,6 +2767,93 @@ public function testValidateDecimal()

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

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

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

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Min:1.88888888888888888889']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Min:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Max:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Max:1.88888888888888888887']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Max:1.88888888888888888887']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Size:1.88888888888888888889']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Size:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889'], ['foo' => 'Decimal:20|Between:1.88888888888888888886,1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888887'], ['foo' => 'Decimal:20|Between:1.88888888888888888886,1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gt:1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889'], ['foo' => 'Decimal:20|Gt:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gt:bar']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gt:bar']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lt:1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888887'], ['foo' => 'Decimal:20|Lt:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lt:bar']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888887', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lt:bar']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888887'], ['foo' => 'Decimal:20|Gte:1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gte:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888887', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gte:bar']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Gte:bar']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889'], ['foo' => 'Decimal:20|Lte:1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lte:1.88888888888888888888']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lte:bar']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888', 'bar' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Lte:bar']);
$this->assertTrue($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888889'], ['foo' => 'Decimal:20|Max:1.88888888888888888888']);
$this->assertFalse($v->passes());

$v = new Validator($trans, ['foo' => '1.88888888888888888888'], ['foo' => 'Decimal:20|Max:1.88888888888888888888']);
$this->assertTrue($v->passes());
}

public function testValidateInt()
Expand Down