Merge remote-tracking branch 'mpipub/MAGETWO-57228' into MPI-PR

Author: rliukshyn

app/code/Magento/Payment/Model/Method/Cc.php

@@ -134,21 +134,16 @@ public function validate()
                     // Visa
                     'VI' => '/^4[0-9]{12}([0-9]{3})?$/',
                     // Master Card
-                    'MC' => '/^5[1-5][0-9]{14}$/',
+                    'MC' => '/^(?:5[1-5][0-9]{2}|222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}$/',
                     // American Express
                     'AE' => '/^3[47][0-9]{13}$/',
                     // Discover
-                    'DI' => '/^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})' .
-                    '|36[0-9]{12}|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}' .
-                    '|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}' .
-                    '|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}' .
-                    '|5[0-9]{14}))$/',
+                    'DI' => '/^(6011((0|9|[2-4])[0-9]{11,14}|(74|7[7-9]|8[6-9])[0-9]{10,13})|6(4[4-9][0-9]{13,16}|5[0-9]{14,17}))/',
+                    'DN' => '/^3(0[0-5][0-9]{13,16}|095[0-9]{12,15}|(6|[8-9])[0-9]{14,17})/',
+                    // UnionPay
+                    'UN' => '/^622(1(2[6-9][0-9]{10,13}|[3-9][0-9]{11,14})|[3-8][0-9]{12,15}|9([[0-1][0-9]{11,14}|2[0-5][0-9]{10,13}))|62[4-6][0-9]{13,16}|628[2-8][0-9]{12,15}/',
                     // JCB
-                    'JCB' => '/^(30[0-5][0-9]{13}|3095[0-9]{12}|35(2[8-9][0-9]{12}|[3-8][0-9]{13})|36[0-9]{12}' .
-                    '|3[8-9][0-9]{14}|6011(0[0-9]{11}|[2-4][0-9]{11}|74[0-9]{10}|7[7-9][0-9]{10}' .
-                    '|8[6-9][0-9]{10}|9[0-9]{11})|62(2(12[6-9][0-9]{10}|1[3-9][0-9]{11}|[2-8][0-9]{12}' .
-                    '|9[0-1][0-9]{11}|92[0-5][0-9]{10})|[4-6][0-9]{13}|8[2-8][0-9]{12})|6(4[4-9][0-9]{13}' .
-                    '|5[0-9]{14}))$/',
+                    'JCB' => '/^35(2[8-9][0-9]{12,15}|[3-8][0-9]{13,16})/',
                     'MI' => '/^(5(0|[6-9])|63|67(?!59|6770|6774))\d*$/',
                     'MD' => '/^(6759(?!24|38|40|6[3-9]|70|76)|676770|676774)\d*$/',
                 ];
@@ -215,6 +210,8 @@ public function getVerificationRegEx()
             'MC' => '/^[0-9]{3}$/',
             'AE' => '/^[0-9]{4}$/',
             'DI' => '/^[0-9]{3}$/',
+            'DN' => '/^[0-9]{3}$/',
+            'UN' => '/^[0-9]{3}$/',
             'SS' => '/^[0-9]{3,4}$/',
             'SM' => '/^[0-9]{3,4}$/',
             'SO' => '/^[0-9]{3,4}$/',