-
Notifications
You must be signed in to change notification settings - Fork 1
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
Matches regex rule #26
Open
mboiev
wants to merge
5
commits into
Morebec:dev
Choose a base branch
from
mboiev:MatchesRegex
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
Changes from all commits
Commits
Show all changes
5 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 7995eee
Added MatchesRegex rule
mboiev 470e89b
Merge branch 'dev' into MatchesRegex
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 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,52 @@ | ||
<?php | ||
|
||
namespace Morebec\Validator\Rule; | ||
|
||
|
||
use Morebec\Validator\ValidationRuleInterface; | ||
|
||
class MatchesRegex implements ValidationRuleInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $regex; | ||
/** | ||
* @var string|null | ||
*/ | ||
private $message; | ||
|
||
/** | ||
* MatchesRegex constructor. | ||
* @param string $regex | ||
* @param string|null $message | ||
*/ | ||
public function __construct( | ||
string $regex, | ||
?string $message = null | ||
) | ||
{ | ||
$this->regex = $regex; | ||
$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 preg_match($this->regex, $v) != 0?true:false; | ||
} | ||
|
||
/** | ||
* 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}' does not match provided regex"; | ||
} | ||
} |
This file contains 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 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,18 @@ | ||
<?php | ||
|
||
namespace Tests\Morebec\Validator\Rule; | ||
use Morebec\Validator\Rule\MatchesRegex; | ||
use PHPUnit\Framework\TestCase; | ||
|
||
|
||
class MatchesRegexTest extends TestCase | ||
{ | ||
public function testValidate(){ | ||
$ruleFirst = new MatchesRegex("/[0-9]/"); | ||
$ruleSecond = new MatchesRegex("/[0-9]/","Custom message"); | ||
|
||
$this->assertTrue($ruleFirst->validate("hello1")); | ||
$this->assertFalse($ruleFirst->validate("hello")); | ||
$this->assertEquals("Custom message",$ruleSecond->getMessage("hello")); | ||
} | ||
} |
This file contains 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
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.
No need to return true or false, here.
The following line:
Will already return a boolean.