diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename requireHyphens to requireHyphen for Issn constraint

Browse Source
This commit is contained in:
Antonio J. García Lagar 2013-04-22 20:32:17 +02:00
parent 4e6cc864cf
commit 94173ec58e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Validator/Constraints/Issn.php
View File

@ -22,5 +22,5 @@ class Issn extends Constraint
{ {
public $invalidMessage = 'This value is not a valid ISSN.'; public $invalidMessage = 'This value is not a valid ISSN.';
public $caseSensitive = false; public $caseSensitive = false;
public $requireHyphens = false; public $requireHyphen = false;
} }

2
src/Symfony/Component/Validator/Constraints/IssnValidator.php
View File

@ -38,7 +38,7 @@ class IssnValidator extends ConstraintValidator
} }
// Compose regex pattern // Compose regex pattern
$digitsPattern = $constraint->requireHyphens ? '\d{4}-\d{3}' : '\d{4}-?\d{3}'; $digitsPattern = $constraint->requireHyphen ? '\d{4}-\d{3}' : '\d{4}-?\d{3}';
$checksumPattern = $constraint->caseSensitive ? '[\d|X]' : '[\d|X|x]'; $checksumPattern = $constraint->caseSensitive ? '[\d|X]' : '[\d|X|x]';
$pattern = "/^".$digitsPattern.$checksumPattern."$/"; $pattern = "/^".$digitsPattern.$checksumPattern."$/";

4
src/Symfony/Component/Validator/Tests/Constraints/IssnValidatorTest.php
View File

@ -153,9 +153,9 @@ class IssnValidatorTest extends \PHPUnit_Framework_TestCase
/** /**
* @dataProvider getValidNonHyphenatedIssn * @dataProvider getValidNonHyphenatedIssn
*/ */
public function testRequireHyphensIssns($issn) public function testRequireHyphenIssns($issn)
{ {
$constraint = new Issn(array('requireHyphens' => true)); $constraint = new Issn(array('requireHyphen' => true));
$this->context $this->context
->expects($this->once()) ->expects($this->once())
->method('addViolation') ->method('addViolation')