-
Notifications
You must be signed in to change notification settings - Fork 1
Min length rule #25
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
Open
mboiev
wants to merge
6
commits into
Morebec:dev
Choose a base branch
from
mboiev:MinLength
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Min length rule #25
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
24571c6
added message functionality to maxlength rule
mboiev 8c3b79e
Added ContainsNumericCharactersRule
mboiev 9867e5e
Revert "Added ContainsNumericCharactersRule"
mboiev 5959b86
Added minLength rule
mboiev bddc786
Updated for negative values
mboiev d66c8f1
Merge branch 'dev' into MinLength
mboiev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| <?php | ||
|
|
||
| namespace Morebec\Validator\Rule; | ||
|
|
||
|
|
||
| use Morebec\Validator\ValidationRuleInterface; | ||
|
|
||
| class MinLength implements ValidationRuleInterface | ||
| { | ||
| /** | ||
| * @var int | ||
| */ | ||
| private $minLength; | ||
|
|
||
| /** | ||
| * @var string|null | ||
| */ | ||
| private $message; | ||
|
|
||
| /** | ||
| * MinLength constructor. | ||
| * @param int $minLength | ||
| * @param string|null $message | ||
| */ | ||
| public function __construct( | ||
| int $minLength, | ||
| ?string $message = null | ||
| ) | ||
| { | ||
| $this->minLength = $minLength; | ||
|
jwillp marked this conversation as resolved.
|
||
| $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 | ||
| { | ||
| return strlen($v)>=$this->minLength; | ||
| } | ||
|
|
||
| /** | ||
| * 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 | ||
| { | ||
| return $this->message?:"'${$v}' is supposed to be at least ".$this->minLength." characters long."; | ||
|
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. Can you change the message to: "'The value '{$v}' was expected to be at least {$this->minLength} characters long." |
||
| } | ||
| } | ||
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
| 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); | ||
|
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. According to my other comment with a negative value, it would require a test that makes sure the exception is thrown. |
||
| $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") | ||
| ); | ||
| } | ||
| } | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| <?php | ||
|
|
||
| namespace Tests\Morebec\Validator\Rule; | ||
|
|
||
|
|
||
| use Morebec\Validator\Rule\MinLength; | ||
| use PHPUnit\Framework\TestCase; | ||
|
|
||
| class MinLengthTest extends TestCase | ||
| { | ||
| public function testValidate(){ | ||
| $ruleFirst = new MinLength(4); | ||
|
jwillp marked this conversation as resolved.
|
||
| $ruleSecond = new MinLength(4,"Custom message"); | ||
|
|
||
| $this->assertTrue($ruleFirst->validate("test string")); | ||
| $this->assertFalse($ruleFirst->validate("tes")); | ||
| $this->assertEquals("Custom message",$ruleSecond->getMessage("test")); | ||
| } | ||
| } | ||
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.
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.
This file should not be part of the PR.
Although seeing, this it makes me think that a negative integer should not be passed to the function, but it is currently possible.
Could you make it throw an InvalidArgumentException in that case?