Merge branch '4.4' into 5.0

* 4.4: Fix abstract method name in PHP doc block Various cleanups [HttpClient] fix issues in tests Fixes sprintf(): Too few arguments in form transformer [Console] Fix QuestionHelper::disableStty() [Validator] Use Mime component to determine mime type for file validator validate subforms in all validation groups Update Hungarian translations Add meaningful message when Process is not installed (ProcessHelper) [PropertyAccess] Fix TypeError parsing again. [TwigBridge] fix fallback html-to-txt body converter [Form] add missing Czech validators translation [Validator] add missing Czech translations never directly validate Existence (Required/Optional) constraints
symfony · May 30, 2020 · 8464d13 · 8464d13
2 parents c267e57 + 6a7df30
commit 8464d13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Transport/MandrillApiTransport.php b/Transport/MandrillApiTransport.php
@@ -51,7 +51,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
         $result = $response->toArray(false);
         if (200 !== $response->getStatusCode()) {
             if ('error' === ($result['status'] ?? false)) {
-                throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
+                throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
             }
 
             throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);

diff --git a/Transport/MandrillHttpTransport.php b/Transport/MandrillHttpTransport.php
@@ -57,7 +57,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
         $result = $response->toArray(false);
         if (200 !== $response->getStatusCode()) {
             if ('error' === ($result['status'] ?? false)) {
-                throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
+                throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
             }
 
             throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);