Skip to content

Commit 3824698

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: Various cleanups
1 parent 52ecda1 commit 3824698

20 files changed

+24
-24
lines changed

‎Amazon/Transport/SesApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
6565

6666
$result = new \SimpleXMLElement($response->getContent(false));
6767
if (200 !== $response->getStatusCode()) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result->Error->Message.' (code %d).', $result->Error->Code), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result->Error->Message.sprintf(' (code %d).', $result->Error->Code), $response);
6969
}
7070

7171
$property = $payload['Action'].'Result';

‎Amazon/Transport/SesHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
6565

6666
$result = new \SimpleXMLElement($response->getContent(false));
6767
if (200 !== $response->getStatusCode()) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result->Error->Message.' (code %d).', $result->Error->Code), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result->Error->Message.sprintf(' (code %d).', $result->Error->Code), $response);
6969
}
7070

7171
$message->setMessageId($result->SendRawEmailResult->MessageId);

‎Mailchimp/Transport/MandrillApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5151
$result = $response->toArray(false);
5252
if (200 !== $response->getStatusCode()) {
5353
if ('error' === ($result['status'] ?? false)) {
54-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
54+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
5555
}
5656

5757
throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);

‎Mailchimp/Transport/MandrillHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
5757
$result = $response->toArray(false);
5858
if (200 !== $response->getStatusCode()) {
5959
if ('error' === ($result['status'] ?? false)) {
60-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
60+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
6161
}
6262

6363
throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);

‎Mailgun/Transport/MailgunApiTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
6565
$result = $response->toArray(false);
6666
if (200 !== $response->getStatusCode()) {
6767
if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
6969
}
7070

71-
throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
71+
throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
7272
}
7373

7474
$sentMessage->setMessageId($result['id']);

‎Mailgun/Transport/MailgunHttpTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
6767
$result = $response->toArray(false);
6868
if (200 !== $response->getStatusCode()) {
6969
if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
70-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
70+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
7171
}
7272

73-
throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
73+
throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
7474
}
7575

7676
$message->setMessageId($result['id']);

‎MailgunApiTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
6565
$result = $response->toArray(false);
6666
if (200 !== $response->getStatusCode()) {
6767
if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
6969
}
7070

71-
throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
71+
throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
7272
}
7373

7474
$sentMessage->setMessageId($result['id']);

‎MailgunHttpTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
6767
$result = $response->toArray(false);
6868
if (200 !== $response->getStatusCode()) {
6969
if ('application/json' === $response->getHeaders(false)['content-type'][0]) {
70-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $response->getStatusCode()), $response);
70+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $response->getStatusCode()), $response);
7171
}
7272

73-
throw new HttpTransportException(sprintf('Unable to send an email: '.$response->getContent(false).' (code %d).', $response->getStatusCode()), $response);
73+
throw new HttpTransportException('Unable to send an email: '.$response->getContent(false).sprintf(' (code %d).', $response->getStatusCode()), $response);
7474
}
7575

7676
$message->setMessageId($result['id']);

‎MandrillApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5151
$result = $response->toArray(false);
5252
if (200 !== $response->getStatusCode()) {
5353
if ('error' === ($result['status'] ?? false)) {
54-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
54+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
5555
}
5656

5757
throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);

‎MandrillHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
5757
$result = $response->toArray(false);
5858
if (200 !== $response->getStatusCode()) {
5959
if ('error' === ($result['status'] ?? false)) {
60-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['message'].' (code %d).', $result['code']), $response);
60+
throw new HttpTransportException('Unable to send an email: '.$result['message'].sprintf(' (code %d).', $result['code']), $response);
6161
}
6262

6363
throw new HttpTransportException(sprintf('Unable to send an email (code %d).', $result['code']), $response);

‎Postmark/Transport/PostmarkApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5454

5555
$result = $response->toArray(false);
5656
if (200 !== $response->getStatusCode()) {
57-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['Message'].' (code %d).', $result['ErrorCode']), $response);
57+
throw new HttpTransportException('Unable to send an email: '.$result['Message'].sprintf(' (code %d).', $result['ErrorCode']), $response);
5858
}
5959

6060
$sentMessage->setMessageId($result['MessageID']);

‎PostmarkApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5454

5555
$result = $response->toArray(false);
5656
if (200 !== $response->getStatusCode()) {
57-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result['Message'].' (code %d).', $result['ErrorCode']), $response);
57+
throw new HttpTransportException('Unable to send an email: '.$result['Message'].sprintf(' (code %d).', $result['ErrorCode']), $response);
5858
}
5959

6060
$sentMessage->setMessageId($result['MessageID']);

‎Sendgrid/Transport/SendgridApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5353
if (202 !== $response->getStatusCode()) {
5454
$errors = $response->toArray(false);
5555

56-
throw new HttpTransportException(sprintf('Unable to send an email: '.implode('; ', array_column($errors['errors'], 'message')).' (code %d).', $response->getStatusCode()), $response);
56+
throw new HttpTransportException('Unable to send an email: '.implode('; ', array_column($errors['errors'], 'message')).sprintf(' (code %d).', $response->getStatusCode()), $response);
5757
}
5858

5959
$sentMessage->setMessageId($response->getHeaders(false)['x-message-id'][0]);

‎SendgridApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
5353
if (202 !== $response->getStatusCode()) {
5454
$errors = $response->toArray(false);
5555

56-
throw new HttpTransportException(sprintf('Unable to send an email: '.implode('; ', array_column($errors['errors'], 'message')).' (code %d).', $response->getStatusCode()), $response);
56+
throw new HttpTransportException('Unable to send an email: '.implode('; ', array_column($errors['errors'], 'message')).sprintf(' (code %d).', $response->getStatusCode()), $response);
5757
}
5858

5959
$sentMessage->setMessageId($response->getHeaders(false)['x-message-id'][0]);

‎SesApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function doSendApi(SentMessage $sentMessage, Email $email, Envelope $e
6565

6666
$result = new \SimpleXMLElement($response->getContent(false));
6767
if (200 !== $response->getStatusCode()) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result->Error->Message.' (code %d).', $result->Error->Code), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result->Error->Message.sprintf(' (code %d).', $result->Error->Code), $response);
6969
}
7070

7171
$property = $payload['Action'].'Result';

‎SesHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected function doSendHttp(SentMessage $message): ResponseInterface
6565

6666
$result = new \SimpleXMLElement($response->getContent(false));
6767
if (200 !== $response->getStatusCode()) {
68-
throw new HttpTransportException(sprintf('Unable to send an email: '.$result->Error->Message.' (code %d).', $result->Error->Code), $response);
68+
throw new HttpTransportException('Unable to send an email: '.$result->Error->Message.sprintf(' (code %d).', $result->Error->Code), $response);
6969
}
7070

7171
$message->setMessageId($result->SendRawEmailResult->MessageId);

‎Smtp/Stream/SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function initialize(): void
135135
$streamContext = stream_context_create($options);
136136

137137
set_error_handler(function ($type, $msg) {
138-
throw new TransportException(sprintf('Connection could not be established with host "%s": '.$msg, $this->url));
138+
throw new TransportException(sprintf('Connection could not be established with host "%s": ', $this->url).$msg);
139139
});
140140
try {
141141
$this->stream = stream_socket_client($this->url, $errno, $errstr, $this->timeout, STREAM_CLIENT_CONNECT, $streamContext);

‎SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function initialize(): void
135135
$streamContext = stream_context_create($options);
136136

137137
set_error_handler(function ($type, $msg) {
138-
throw new TransportException(sprintf('Connection could not be established with host "%s": '.$msg, $this->url));
138+
throw new TransportException(sprintf('Connection could not be established with host "%s": ', $this->url).$msg);
139139
});
140140
try {
141141
$this->stream = stream_socket_client($this->url, $errno, $errstr, $this->timeout, STREAM_CLIENT_CONNECT, $streamContext);

‎Stream/SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function initialize(): void
135135
$streamContext = stream_context_create($options);
136136

137137
set_error_handler(function ($type, $msg) {
138-
throw new TransportException(sprintf('Connection could not be established with host "%s": '.$msg, $this->url));
138+
throw new TransportException(sprintf('Connection could not be established with host "%s": ', $this->url).$msg);
139139
});
140140
try {
141141
$this->stream = stream_socket_client($this->url, $errno, $errstr, $this->timeout, STREAM_CLIENT_CONNECT, $streamContext);

‎Transport/Smtp/Stream/SocketStream.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public function initialize(): void
135135
$streamContext = stream_context_create($options);
136136

137137
set_error_handler(function ($type, $msg) {
138-
throw new TransportException(sprintf('Connection could not be established with host "%s": '.$msg, $this->url));
138+
throw new TransportException(sprintf('Connection could not be established with host "%s": ', $this->url).$msg);
139139
});
140140
try {
141141
$this->stream = stream_socket_client($this->url, $errno, $errstr, $this->timeout, STREAM_CLIENT_CONNECT, $streamContext);

0 commit comments

Comments
 (0)