-
Notifications
You must be signed in to change notification settings - Fork 1
Contains numeric characters rule #22
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.
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
base: dev
Are you sure you want to change the base?
Changes from 2 commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
|
|
||
| namespace Morebec\Validator\Rule; | ||
|
|
||
|
|
||
| use Morebec\Validator\ValidationRuleInterface; | ||
|
|
||
| class ContainsNumericCharacters implements ValidationRuleInterface | ||
| { | ||
| /** | ||
| * @var int | ||
| */ | ||
| private $numberCharacters; | ||
| /** | ||
| * @var bool | ||
| */ | ||
| private $strict; | ||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $message; | ||
|
|
||
| /** | ||
| * ContainsNumericCharacters constructor. | ||
| * @param int|null $numberCharacters | ||
| * @param bool|null $strict | ||
| * @param string|null $message | ||
| */ | ||
| public function __construct( | ||
| ?int $numberCharacters = 1, | ||
| ?bool $strict = false, | ||
| ?string $message = null | ||
|
Comment on lines
+31
to
+33
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you also set the default parameter values I had provided in the issue? |
||
| ) | ||
| { | ||
| $this->numberCharacters = $numberCharacters; | ||
| $this->strict = $strict; | ||
| $this->message = $message; | ||
| } | ||
|
|
||
| /** | ||
| * Validates a value according to this rule and returns if it is valid or not | ||
| * @param mixed $v | ||
| * @return bool true if valid, otherwise false | ||
| */ | ||
| public function validate($v): bool | ||
| { | ||
| if($this->strict){ | ||
| return $this->countDigits($v)<=$this->numberCharacters; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. There is an error here. Can you find it? |
||
| } | ||
| else{ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since the control flows rely on return, the else is not necessary. |
||
| return $this->countDigits($v)>=$this->numberCharacters; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Returns the message to be used in case the validation did not pass | ||
| * @param mixed $v the value that did not pass the validation | ||
| * @return string | ||
| */ | ||
| public function getMessage($v): string | ||
| { | ||
| if($this->message){ | ||
| return $this->message; | ||
| } | ||
| else if($this->strict){ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since the control flow (if, elseif, else) relies on return statements, all the else workflows are unecessary, you can replace with if, if and a direct return. |
||
| return "Number of numeric characters exceeds ".${$this->numberCharacters}; | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The message here should be: "The value '{$v}' should have exactly {$this->numberCharacters} numeric characters" |
||
| } | ||
| else{ | ||
| return "Number of numeric characters should exceed ".${$this->numberCharacters}; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * @param string $str | ||
| * @return int | ||
| */ | ||
| private function countDigits(string $str) | ||
| { | ||
| return preg_match_all( "/[0-9]/", $str )?:0; | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php | ||
|
|
||
| namespace Tests\Morebec\Validator\Rule; | ||
| use Morebec\Validator\Rule\ContainsNumericCharacters; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class ContainsNumericCharactersTest extends TestCase | ||
| { | ||
| public function testValidate(){ | ||
| $ruleFirst = new ContainsNumericCharacters(1,true); | ||
| $ruleSecond = new ContainsNumericCharacters(1,false); | ||
| $ruleThird= new ContainsNumericCharacters(1,false,"Custom Message"); | ||
|
Comment on lines
+10
to
+13
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Testing with various values instead of only '1' would be better for test coverage. |
||
| $this->assertTrue($ruleFirst->validate("test string 1")); | ||
| $this->assertFalse($ruleFirst->validate("test string 12")); | ||
| $this->assertFalse($ruleSecond->validate('test string')); | ||
| $this->assertTrue($ruleSecond->validate('test string 12')); | ||
| $this->assertEquals( "Custom Message", $ruleThird->getMessage("test string")); | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| <?php | ||
|
|
||
| namespace Tests\Morebec\Validator\Rule; | ||
|
|
||
|
|
||
| use Morebec\Validator\Rule\MaxLength; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class MaxLengthTest extends TestCase | ||
| { | ||
| public function testValidate() | ||
| { | ||
| $firstRule = new MaxLength(5); | ||
| $secondRule = new MaxLength(5,"Custom message"); | ||
| $this->assertTrue($firstRule->validate("test")); | ||
| $this->assertFalse($firstRule->validate("long test")); | ||
| $this->assertEquals( | ||
| "The length of 'arr' was expected to be at most 5 characters long", | ||
| $firstRule->getMessage("arr") | ||
| ); | ||
| $this->assertEquals( | ||
| "Custom message", | ||
| $secondRule->getMessage("arr") | ||
| ); | ||
| } | ||
| } |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you ensure that the value of the parameter is always a positive integer or zero?