Skip to content

Fixes cases where check digit is zero #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.

Sign up for GitHub

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
Jontsa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixes cases where check digit is zero #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/Modulus11.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ private static function getChecksum($number, $factors = null)
$sum += ($sequence[$i] * $factor);
}

$calculus = 11 - $sum % 11;
$remainder = $sum % 11;

switch($calculus){
case 10: return 'X';
default: return $calculus;
switch($remainder){
case 0: return 0;
case 1: return 'X';
default: return 11 - $remainder;
}
}

Expand Down
50 changes: 31 additions & 19 deletions tests/Modulus11Test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,34 +6,46 @@

class Mod11Test extends \PHPUnit_Framework_TestCase
{
protected $withCheckDigit1 = '1234.56.78903';
protected $withoutCheckDigit1 = '1234.56.7890';
protected $theCheckDigit1 = 3;

protected $withCheckDigit2 = '036522X';
protected $withoutCheckDigit2 = '036522';
protected $theCheckDigit2 = 'X';

public function testValidate()
public function provideValues()
{
$this->assertTrue(Modulus11::validate($this->withCheckDigit1));
$this->assertTrue(Modulus11::validate($this->withCheckDigit2));
return array(
array('1234.56.78903', '1234.56.7890', 3),
array('036522X', '036522', 'X'),
array('01010104900', '0101010490', 0)
);
}

public function testCalculate()
/**
* @param string $withCheckDigit
* @dataProvider provideValues
*/
public function testValidate($withCheckDigit)
{
$this->assertSame($this->theCheckDigit1, Modulus11::calculate($this->withoutCheckDigit1));
$this->assertSame($this->theCheckDigit2, Modulus11::calculate($this->withoutCheckDigit2));
$this->assertTrue(Modulus11::validate($withCheckDigit));
}

public function testAppendCheckDigit()
/**
* @param string $withCheckDigit
* @param string $withoutCheckDigit
* @param string|int $checkDigit
* @dataProvider provideValues
*/
public function testCalculate($withCheckDigit, $withoutCheckDigit, $checkDigit)
{
$appended = Modulus11::appendCheckDigit($this->withoutCheckDigit1);
$this->assertSame($this->withoutCheckDigit1.$this->theCheckDigit1, $appended);
$this->assertTrue(Modulus11::validate($appended));
$this->assertSame($checkDigit, Modulus11::calculate($withoutCheckDigit));
}

$appended = Modulus11::appendCheckDigit($this->withoutCheckDigit2);
$this->assertSame($this->withoutCheckDigit2.$this->theCheckDigit2, $appended);
/**
* @param string $withCheckDigit
* @param string $withoutCheckDigit
* @param string|int $checkDigit
* @dataProvider provideValues
*/
public function testAppendCheckDigit($withCheckDigit, $withoutCheckDigit, $checkDigit)
{
$appended = Modulus11::appendCheckDigit($withoutCheckDigit);
$this->assertSame($withoutCheckDigit . $checkDigit, $appended);
$this->assertTrue(Modulus11::validate($appended));
}

Expand Down