Skip to content

Commit

Permalink
Fix Credit card number pattern(JCB) is wrong
Browse files Browse the repository at this point in the history
  • Loading branch information
tenkoma committed Oct 4, 2017
1 parent 20840d8 commit 9b9cb03
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 35 deletions.
2 changes: 1 addition & 1 deletion src/Validation/Validation.php
Expand Up @@ -178,7 +178,7 @@ public static function cc($check, $type = 'fast', $deep = false, $regex = null)
'disc' => '/^(?:6011|650\\d)\\d{12}$/',
'electron' => '/^(?:417500|4917\\d{2}|4913\\d{2})\\d{10}$/',
'enroute' => '/^2(?:014|149)\\d{11}$/',
'jcb' => '/^(3\\d{4}|2100|1800)\\d{11}$/',
'jcb' => '/^(35\\d{3}|2131|1800)\\d{11}$/',
'maestro' => '/^(?:5020|6\\d{3})\\d{12}$/',
'mc' => '/^(5[1-5]\\d{14})|(2(?:22[1-9]|2[3-9][0-9]|[3-6][0-9]{2}|7[0-1][0-9]|720)\\d{12})$/',
'solo' => '/^(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?$/',
Expand Down
68 changes: 34 additions & 34 deletions tests/TestCase/Validation/ValidationTest.php
Expand Up @@ -266,47 +266,47 @@ public function testCc()
$this->assertTrue(Validation::cc('214981579370225', ['enroute']));
$this->assertTrue(Validation::cc('201447595859877', ['enroute']));
// JCB 15 digit
$this->assertTrue(Validation::cc('210034762247893', ['jcb']));
$this->assertTrue(Validation::cc('213134762247898', ['jcb']));
$this->assertTrue(Validation::cc('180078671678892', ['jcb']));
$this->assertTrue(Validation::cc('180010559353736', ['jcb']));
$this->assertTrue(Validation::cc('210095474464258', ['jcb']));
$this->assertTrue(Validation::cc('210006675562188', ['jcb']));
$this->assertTrue(Validation::cc('210063299662662', ['jcb']));
$this->assertTrue(Validation::cc('213195474464253', ['jcb']));
$this->assertTrue(Validation::cc('213106675562183', ['jcb']));
$this->assertTrue(Validation::cc('213163299662667', ['jcb']));
$this->assertTrue(Validation::cc('180032506857825', ['jcb']));
$this->assertTrue(Validation::cc('210057919192738', ['jcb']));
$this->assertTrue(Validation::cc('213157919192733', ['jcb']));
$this->assertTrue(Validation::cc('180031358949367', ['jcb']));
$this->assertTrue(Validation::cc('180033802147846', ['jcb']));
// JCB 16 digit
$this->assertTrue(Validation::cc('3096806857839939', ['jcb']));
$this->assertTrue(Validation::cc('3158699503187091', ['jcb']));
$this->assertTrue(Validation::cc('3112549607186579', ['jcb']));
$this->assertTrue(Validation::cc('3112332922425604', ['jcb']));
$this->assertTrue(Validation::cc('3112001541159239', ['jcb']));
$this->assertTrue(Validation::cc('3112162495317841', ['jcb']));
$this->assertTrue(Validation::cc('3337562627732768', ['jcb']));
$this->assertTrue(Validation::cc('3337107161330775', ['jcb']));
$this->assertTrue(Validation::cc('3586806857839936', ['jcb']));
$this->assertTrue(Validation::cc('3558699503187097', ['jcb']));
$this->assertTrue(Validation::cc('3529549607186576', ['jcb']));
$this->assertTrue(Validation::cc('3529332922425601', ['jcb']));
$this->assertTrue(Validation::cc('3529001541159236', ['jcb']));
$this->assertTrue(Validation::cc('3529162495317848', ['jcb']));
$this->assertTrue(Validation::cc('3537562627732766', ['jcb']));
$this->assertTrue(Validation::cc('3537107161330773', ['jcb']));
$this->assertTrue(Validation::cc('3528053736003621', ['jcb']));
$this->assertTrue(Validation::cc('3528915255020360', ['jcb']));
$this->assertTrue(Validation::cc('3096786059660921', ['jcb']));
$this->assertTrue(Validation::cc('3546786059660927', ['jcb']));
$this->assertTrue(Validation::cc('3528264799292320', ['jcb']));
$this->assertTrue(Validation::cc('3096469164130136', ['jcb']));
$this->assertTrue(Validation::cc('3112127443822853', ['jcb']));
$this->assertTrue(Validation::cc('3096849995802328', ['jcb']));
$this->assertTrue(Validation::cc('3536469164130134', ['jcb']));
$this->assertTrue(Validation::cc('3529127443822850', ['jcb']));
$this->assertTrue(Validation::cc('3596849995802323', ['jcb']));
$this->assertTrue(Validation::cc('3528090735127407', ['jcb']));
$this->assertTrue(Validation::cc('3112101006819234', ['jcb']));
$this->assertTrue(Validation::cc('3337444428040784', ['jcb']));
$this->assertTrue(Validation::cc('3088043154151061', ['jcb']));
$this->assertTrue(Validation::cc('3088295969414866', ['jcb']));
$this->assertTrue(Validation::cc('3158748843158575', ['jcb']));
$this->assertTrue(Validation::cc('3158709206148538', ['jcb']));
$this->assertTrue(Validation::cc('3158365159575324', ['jcb']));
$this->assertTrue(Validation::cc('3158671691305165', ['jcb']));
$this->assertTrue(Validation::cc('3529101006819231', ['jcb']));
$this->assertTrue(Validation::cc('3537444428040782', ['jcb']));
$this->assertTrue(Validation::cc('3588043154151066', ['jcb']));
$this->assertTrue(Validation::cc('3588295969414861', ['jcb']));
$this->assertTrue(Validation::cc('3558748843158571', ['jcb']));
$this->assertTrue(Validation::cc('3558709206148534', ['jcb']));
$this->assertTrue(Validation::cc('3558365159575320', ['jcb']));
$this->assertTrue(Validation::cc('3558671691305161', ['jcb']));
$this->assertTrue(Validation::cc('3528523028771093', ['jcb']));
$this->assertTrue(Validation::cc('3096057126267870', ['jcb']));
$this->assertTrue(Validation::cc('3158514047166834', ['jcb']));
$this->assertTrue(Validation::cc('3576057126267879', ['jcb']));
$this->assertTrue(Validation::cc('3558514047166830', ['jcb']));
$this->assertTrue(Validation::cc('3528274546125962', ['jcb']));
$this->assertTrue(Validation::cc('3528890967705733', ['jcb']));
$this->assertTrue(Validation::cc('3337198811307545', ['jcb']));
$this->assertTrue(Validation::cc('3537198811307543', ['jcb']));
// Maestro (debit card)
$this->assertTrue(Validation::cc('5020147409985219', ['maestro']));
$this->assertTrue(Validation::cc('5020931809905616', ['maestro']));
Expand Down Expand Up @@ -646,9 +646,9 @@ public function testLuhn()
// enRoute
$this->assertTrue(Validation::luhn('201496944158937'));
// JCB 15 digit
$this->assertTrue(Validation::luhn('210034762247893'));
$this->assertTrue(Validation::luhn('213134762247898'));
// JCB 16 digit
$this->assertTrue(Validation::luhn('3096806857839939'));
$this->assertTrue(Validation::luhn('3586806857839936'));
// Maestro (debit card)
$this->assertTrue(Validation::luhn('5020147409985219'));
// Mastercard
Expand Down Expand Up @@ -753,9 +753,9 @@ public function testAllCc()
// enRoute
$this->assertTrue(Validation::cc('201496944158937', 'all'));
// JCB 15 digit
$this->assertTrue(Validation::cc('210034762247893', 'all'));
$this->assertTrue(Validation::cc('213134762247898', 'all'));
// JCB 16 digit
$this->assertTrue(Validation::cc('3096806857839939', 'all'));
$this->assertTrue(Validation::cc('3586806857839936', 'all'));
// Maestro (debit card)
$this->assertTrue(Validation::cc('5020147409985219', 'all'));
// Mastercard
Expand Down Expand Up @@ -804,9 +804,9 @@ public function testAllCcDeep()
// enRoute
$this->assertTrue(Validation::cc('201496944158937', 'all', true));
// JCB 15 digit
$this->assertTrue(Validation::cc('210034762247893', 'all', true));
$this->assertTrue(Validation::cc('213134762247898', 'all', true));
// JCB 16 digit
$this->assertTrue(Validation::cc('3096806857839939', 'all', true));
$this->assertTrue(Validation::cc('3586806857839936', 'all', true));
// Maestro (debit card)
$this->assertTrue(Validation::cc('5020147409985219', 'all', true));
// Mastercard
Expand Down

0 comments on commit 9b9cb03

Please sign in to comment.