From 9a1a26b5f44b76cb45e4b001647cc35ea4838e98 Mon Sep 17 00:00:00 2001
From: Pascal Hofmann <mail@pascalhofmann.de>
Date: Sun, 9 Oct 2016 17:17:08 +0200
Subject: [PATCH] Fixed BIN check for new mastercard range (2221-2720)

---
 src/CreditCard.php |  2 +-
 tests/Test.php     | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/CreditCard.php b/src/CreditCard.php
index ce8f5d6..af11453 100644
--- a/src/CreditCard.php
+++ b/src/CreditCard.php
@@ -53,7 +53,7 @@ class CreditCard
         ),
         'mastercard' => array(
             'type' => 'mastercard',
-            'pattern' => '/^(5[0-5]|2[2-7])/',
+            'pattern' => '/^(5[0-5]|2(2(2[1-9]|[3-9])|[3-6]|7(0|1|20)))/',
             'length' => array(16),
             'cvcLength' => array(3),
             'luhn' => true,
diff --git a/tests/Test.php b/tests/Test.php
index 00f35c2..c0d57a9 100644
--- a/tests/Test.php
+++ b/tests/Test.php
@@ -39,6 +39,28 @@ class Test extends PHPUnit_Framework_TestCase
             '5555555555554444',
             '5454545454545454',
             '2221000002222221',
+            '2222000000000008',
+            '2223000000000007',
+            '2224000000000006',
+            '2225000000000005',
+            '2226000000000004',
+            '2227000000000003',
+            '2228000000000002',
+            '2229000000000001',
+            '2230000000000008',
+            '2240000000000006',
+            '2250000000000003',
+            '2260000000000001',
+            '2270000000000009',
+            '2280000000000007',
+            '2290000000000005',
+            '2300000000000003',
+            '2400000000000002',
+            '2500000000000001',
+            '2600000000000000',
+            '2700000000000009',
+            '2710000000000007',
+            '2720999999999996',
         ),
         'amex' => array(
             '378282246310005',
@@ -67,6 +89,14 @@ class Test extends PHPUnit_Framework_TestCase
         ),
     );
 
+    protected $invalidCards = array(
+        'mastercard' => array(
+            '2220000000000000',
+            '2721000000000004',
+        ),
+    );
+
+
     public function testCardsTypes()
     {
         foreach ($this->validCards as $type => $numbers) {
@@ -77,6 +107,13 @@ public function testCardsTypes()
                 $this->assertEquals($type, $result['type'], 'Invalid type. Number: ' . $number . ', Expected: ' . $type . ', Actual: ' . $result['type']);
             }
         }
+
+        foreach ($this->invalidCards as $type => $numbers) {
+            foreach ($numbers as $number) {
+                $result = CreditCard::validCreditCard($number);
+                $this->assertNotEquals($type, $result['type'], 'Invalid type. Number: ' . $number . ', Should not be: ' . $type . ', Actual: ' . $result['type']);
+            }
+        }
     }
 
     public function testNumbers()