Skip to content

Commit c6d1a2d

Browse files
committed
revert digits changes
1 parent 1383b5d commit c6d1a2d

File tree

2 files changed

+1
-63
lines changed

2 files changed

+1
-63
lines changed

src/Illuminate/Validation/Concerns/ValidatesAttributes.php

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -564,18 +564,7 @@ public function validateDigits($attribute, $value, $parameters)
564564
{
565565
$this->requireParameterCount(1, $parameters, 'digits');
566566

567-
$length = strlen((string) $value);
568-
569-
if (((string) $value) === '.') {
570-
return false;
571-
}
572-
573-
// Make sure there is not more than one dot...
574-
if (($length - strlen(str_replace('.', '', (string) $value))) > 1) {
575-
return false;
576-
}
577-
578-
return ! preg_match('/[^0-9.]/', $value)
567+
return ! preg_match('/[^0-9]/', $value)
579568
&& strlen((string) $value) == $parameters[0];
580569
}
581570

@@ -593,15 +582,6 @@ public function validateDigitsBetween($attribute, $value, $parameters)
593582

594583
$length = strlen((string) $value);
595584

596-
if (((string) $value) === '.') {
597-
return false;
598-
}
599-
600-
// Make sure there is not more than one dot...
601-
if (($length - strlen(str_replace('.', '', (string) $value))) > 1) {
602-
return false;
603-
}
604-
605585
return ! preg_match('/[^0-9.]/', $value)
606586
&& $length >= $parameters[0] && $length <= $parameters[1];
607587
}

tests/Validation/ValidationValidatorTest.php

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,30 +2272,6 @@ public function testValidateDigits()
22722272
$v = new Validator($trans, ['foo' => '2e7'], ['foo' => 'Digits:3']);
22732273
$this->assertTrue($v->fails());
22742274

2275-
$v = new Validator($trans, ['foo' => '1.2'], ['foo' => 'digits:3']);
2276-
$this->assertTrue($v->passes());
2277-
2278-
$v = new Validator($trans, ['foo' => '0.9876'], ['foo' => 'digits:5']);
2279-
$this->assertTrue($v->fails());
2280-
2281-
$v = new Validator($trans, ['foo' => '1..2'], ['foo' => 'digits:4']);
2282-
$this->assertTrue($v->fails());
2283-
2284-
$v = new Validator($trans, ['foo' => '123.456.789'], ['foo' => 'digits:10']);
2285-
$this->assertTrue($v->fails());
2286-
2287-
$v = new Validator($trans, ['foo' => '...'], ['foo' => 'digits:3']);
2288-
$this->assertTrue($v->fails());
2289-
2290-
$v = new Validator($trans, ['foo' => '.'], ['foo' => 'digits:1']);
2291-
$this->assertTrue($v->fails());
2292-
2293-
$v = new Validator($trans, ['foo' => '.2'], ['foo' => 'digits:2']);
2294-
$this->assertTrue($v->passes());
2295-
2296-
$v = new Validator($trans, ['foo' => '2.'], ['foo' => 'digits:2']);
2297-
$this->assertTrue($v->passes());
2298-
22992275
$trans = $this->getIlluminateArrayTranslator();
23002276
$v = new Validator($trans, ['foo' => '12345'], ['foo' => 'digits_between:1,6']);
23012277
$this->assertTrue($v->passes());
@@ -2314,24 +2290,6 @@ public function testValidateDigits()
23142290

23152291
$v = new Validator($trans, ['foo' => '0.9876'], ['foo' => 'digits_between:1,5']);
23162292
$this->assertTrue($v->fails());
2317-
2318-
$v = new Validator($trans, ['foo' => '1..2'], ['foo' => 'digits_between:1,10']);
2319-
$this->assertTrue($v->fails());
2320-
2321-
$v = new Validator($trans, ['foo' => '123.456.789'], ['foo' => 'digits_between:1,10']);
2322-
$this->assertTrue($v->fails());
2323-
2324-
$v = new Validator($trans, ['foo' => '...'], ['foo' => 'digits_between:1,10']);
2325-
$this->assertTrue($v->fails());
2326-
2327-
$v = new Validator($trans, ['foo' => '.'], ['foo' => 'digits_between:1,10']);
2328-
$this->assertTrue($v->fails());
2329-
2330-
$v = new Validator($trans, ['foo' => '.2'], ['foo' => 'digits_between:0,10']);
2331-
$this->assertTrue($v->passes());
2332-
2333-
$v = new Validator($trans, ['foo' => '2.'], ['foo' => 'digits_between:1,10']);
2334-
$this->assertTrue($v->passes());
23352293
}
23362294

23372295
public function testValidateSize()

0 commit comments

Comments
 (0)