Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions src/Illuminate/Validation/Concerns/ValidatesAttributes.php
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,7 @@ public function validateDecimal($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'decimal');

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

Expand Down Expand Up @@ -1863,7 +1863,7 @@ public function validateMultipleOf($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'multiple_of');

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

Expand Down Expand Up @@ -1919,10 +1919,15 @@ public function validateNotIn($attribute, $value, $parameters)
*
* @param string $attribute
* @param mixed $value
* @param array{0: 'strict'} $parameters
* @return bool
*/
public function validateNumeric($attribute, $value)
public function validateNumeric($attribute, $value, array $parameters)
{
if (($parameters[0] ?? null) === 'strict' && is_string($value)) {
return false;
}

return is_numeric($value);
}

Expand Down
22 changes: 22 additions & 0 deletions tests/Validation/ValidationValidatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3245,6 +3245,28 @@ public function testValidateNumeric()
$this->assertTrue($v->passes());
}

public function testValidateNumericStrict()
{
$trans = $this->getIlluminateArrayTranslator();
$v = new Validator($trans, ['foo' => 'asdad'], ['foo' => 'Numeric:strict']);
$this->assertFalse($v->passes());

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

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

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

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

$v = new Validator($trans, ['foo' => 0.1], ['foo' => 'Numeric:strict']);
$this->assertTrue($v->passes());
}

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