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

[Validator] fixed CS

Browse Source
This commit is contained in:
Fabien Potencier 2013-04-20 15:26:53 +02:00
parent 3a507e0d86
commit 44be949045
5 changed files with 66 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Symfony/Component/Validator/Constraints/IbanValidator.php
View File

@ -18,12 +18,9 @@ use Symfony\Component\Validator\ConstraintValidator;
* @author Manuel Reinhard <manu@sprain.ch>
* @author Michael Schummel
* @link http://www.michael-schummel.de/2007/10/05/iban-prufung-mit-php/
*
* @api
*/
class IbanValidator extends ConstraintValidator
{
/**
* {@inheritDoc}
*/
@ -37,24 +34,23 @@ class IbanValidator extends ConstraintValidator
if (strlen($teststring) < 4) {
$this->context->addViolation($constraint->message, array('{{ value }}' => $value));
return;
}
$teststring = substr($teststring, 4)
. strval(ord($teststring{0}) - 55)
. strval(ord($teststring{1}) - 55)
. substr($teststring, 2, 2);
.strval(ord($teststring{0}) - 55)
.strval(ord($teststring{1}) - 55)
.substr($teststring, 2, 2);
$letterToInt = function ($letter) {
$teststring = preg_replace_callback('/[A-Za-z]/', function ($letter) {
return intval(ord(strtolower($letter[0])) - 87);
};
}, $teststring);
$teststring = preg_replace_callback('/[A-Za-z]/', $letterToInt, $teststring);
$rest=0;
$rest = 0;
$strlen = strlen($teststring);
for ($pos = 0; $pos < $strlen; $pos += 7) {
$part = strval($rest) . substr($teststring, $pos, 7);
$part = strval($rest).substr($teststring, $pos, 7);
$rest = intval($part) % 97;
}

2
src/Symfony/Component/Validator/Resources/translations/validators.fr.xlf
View File

@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59">
<source>This is not a valid International Bank Account Number (IBAN).</source>
<target>Le numéro IBAN saisi n'est pas valide (International Bank Account Number).</target>
<target>Le numéro IBAN (International Bank Account Number) saisi n'est pas valide.</target>
</trans-unit>
</body>
</file>

16
src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php
View File

@ -26,24 +26,16 @@ class IbanValidatorTest extends \PHPUnit_Framework_TestCase
$this->validator->initialize($this->context);
}
protected function tearDown()
{
$this->context = null;
$this->validator = null;
}
public function testNullIsValid()
{
$this->context->expects($this->never())
->method('addViolation');
$this->context->expects($this->never())->method('addViolation');
$this->validator->validate(null, new Iban());
}
public function testEmptyStringIsValid()
{
$this->context->expects($this->never())
->method('addViolation');
$this->context->expects($this->never())->method('addViolation');
$this->validator->validate('', new Iban());
}
@ -53,8 +45,7 @@ class IbanValidatorTest extends \PHPUnit_Framework_TestCase
*/
public function testValidIbans($iban)
{
$this->context->expects($this->never())
->method('addViolation');
$this->context->expects($this->never())->method('addViolation');
$this->validator->validate($iban, new Iban());
}
@ -158,7 +149,6 @@ class IbanValidatorTest extends \PHPUnit_Framework_TestCase
array('TN5914207207100707129648'), //Tunisia
array('TR330006100519786457841326'), //Turkey
array('AE260211000000230064016'), //United Arab Emirates
);
}