[8.x] Fix multiple dots for digits_between rule#42330
Merged
taylorotwell merged 6 commits into8.xfrom May 10, 2022
Merged
Conversation
Contributor
|
Possibilities to consider (for example,
|
Member
Author
|
@taai ah the single dot is a good remark. Added a fix and test for that. The other two examples are indeed valid imo: https://3v4l.org/iDrQh |
Contributor
My solution: public function validateDigitsBetween($attribute, $value, $parameters)
{
$this->requireParameterCount(2, $parameters, 'digits_between');
// make sure that the value is a number or a numeric string
if (!is_numeric($value)) {
return false;
}
if (is_string($value)) {
// make sure that the value is not a dot and does not contain more than single dot
if ($value === '.' || substr_count($value, '.') > 1) {
return false;
}
} else {
$value = strval($value);
}
$length = strlen($value);
return $length >= $parameters[0] && $length <= $parameters[1]
&& ctype_digit(str_replace('.', '', $value));
}
public function validateDigits($attribute, $value, $parameters)
{
$this->requireParameterCount(1, $parameters, 'digits');
// make sure that the value is a number or a numeric string
if (!is_numeric($value)) {
return false;
}
if (is_string($value)) {
// make sure that the value is not a dot and does not contain more than single dot
if ($value === '.' || substr_count($value, '.') > 1) {
return false;
}
} else {
$value = strval($value);
}
return strlen($value) == $parameters[0]
&& ctype_digit(str_replace('.', '', $value));
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This makes the
digits_betweenrule a bit more strict by validating for multiple dots in a number (2.2.3,2..3,...).Fixes #42326