Merge branch '5.3' into 5.4

derrabus · derrabus · commit 34e1972f97f1 · 2021-08-01T20:09:23.000+02:00
* 5.3:
  [Validator] Update MIR card scheme
  [Mailer][Sendgrid] Add previous exception
diff --git a/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php b/src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php
@@ -64,7 +64,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
 
                 throw new HttpTransportException('Unable to send an email: '.implode('; ', array_column($result['errors'], 'message')).sprintf(' (code %d).', $statusCode), $response);
             } catch (DecodingExceptionInterface $e) {
-                throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response);
+                throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response, 0, $e);
             }
         }
 
diff --git a/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php b/src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php
@@ -77,9 +77,9 @@ class CardSchemeValidator extends ConstraintValidator
             '/^5[1-5][0-9]{14}$/',
             '/^2(22[1-9][0-9]{12}|2[3-9][0-9]{13}|[3-6][0-9]{14}|7[0-1][0-9]{13}|720[0-9]{12})$/',
         ],
-        // Payment system MIR numbers start with 220, then 1 digit from 0 to 4, then 12 digits
+        // Payment system MIR numbers start with 220, then 1 digit from 0 to 4, then between 12 and 15 digits
         CardScheme::MIR => [
-            '/^220[0-4][0-9]{12}$/',
+            '/^220[0-4][0-9]{12,15}$/',
         ],
         // All UATP card numbers start with a 1 and have a length of 15 digits.
         CardScheme::UATP => [
diff --git a/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php b/src/Symfony/Component/Validator/Tests/Constraints/CardSchemeValidatorTest.php
@@ -130,6 +130,9 @@ public function getValidNumbers()
             ['MASTERCARD', '2709999999999999'],
             ['MASTERCARD', '2720995105105100'],
             ['MIR', '2200381427330082'],
+            ['MIR', '22003814273300821'],
+            ['MIR', '220038142733008212'],
+            ['MIR', '2200381427330082123'],
             ['UATP', '110165309696173'],
             ['VISA', '4111111111111111'],
             ['VISA', '4012888888881881'],
@@ -162,7 +165,8 @@ public function getInvalidNumbers()
             ['MASTERCARD', '2721001234567890', CardScheme::INVALID_FORMAT_ERROR], // Not assigned yet
             ['MASTERCARD', '2220991234567890', CardScheme::INVALID_FORMAT_ERROR], // Not assigned yet
             ['UATP', '11016530969617', CardScheme::INVALID_FORMAT_ERROR], // invalid length
-            ['MIR', '22003814273300821', CardScheme::INVALID_FORMAT_ERROR], // invalid length
+            ['MIR', '220038142733008', CardScheme::INVALID_FORMAT_ERROR], // invalid length
+            ['MIR', '22003814273300821234', CardScheme::INVALID_FORMAT_ERROR], // invalid length
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e`
`64`	`64`
`65`	`65`	`throw new HttpTransportException('Unable to send an email: '.implode('; ', array_column($result['errors'], 'message')).sprintf(' (code %d).', $statusCode), $response);`
`66`	`66`	`} catch (DecodingExceptionInterface $e) {`
`67`		`- throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response);`
	`67`	`+ throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $statusCode), $response, 0, $e);`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`