8000 Merge branch '5.0' · symfony/symfony@6ae2fc3 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6ae2fc3

Browse files
committed
Merge branch '5.0'
* 5.0: Tweak the code to avoid fabbot false positives
2 parents edb0518 + 910cc72 commit 6ae2fc3

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ private function checkResultCode($result)
313313
return $result;
314314
}
315315

316-
throw new CacheException(sprintf('MemcachedAdapter client error: "%s".', strtolower($this->client->getResultMessage())));
316+
throw new CacheException('MemcachedAdapter client error: '.strtolower($this->client->getResultMessage()));
317317
}
318318

319319
private function getClient(): 10000 \Memcached

src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function applyOperations(string $dn, iterable $operations): void
152152
}
153153

154154
if (!@ldap_modify_batch($this->getConnectionResource(), $dn, $operationsMapped)) {
155-
throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": "%s".', $dn, ldap_error($this->getConnectionResource())), ldap_errno($con));
155+
throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": '.ldap_error($this->getConnectionResource()), $dn), ldap_errno($con));
156156
}
157157
}
158158

src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function doSend(MessageInterface $message): void
7070
$result = $response->toArray(false);
7171
foreach ($result['messages'] as $msg) {
7272
if ($msg['status'] ?? false) {
73-
throw new TransportException(sprintf('Unable to send the SMS: %s (%s).', $msg['error-text'], $msg['status']), $response);
73+
throw new TransportException(sprintf('Unable to send the SMS: '.$msg['error-text'].' (%s).', $msg['status']), $response);
7474
}
7575
}
7676
}

src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ protected function doSend(MessageInterface $message): void
7979
]);
8080

8181
if (200 !== $response->getStatusCode()) {
82-
throw new TransportException(sprintf('Unable to post the Slack message: '.$response->getContent(false)), $response);
82+
throw new TransportException('Unable to post the Slack message: '.$response->getContent(false), $response);
8383
}
8484

8585
$result = $response->getContent(false);
8686
if ('ok' !== $result) {
87-
throw new TransportException(sprintf('Unable to post the Slack message: '.$result), $response);
87+
throw new TransportException('Unable to post the Slack message: '.$result, $response);
8888
}
8989
}
9090
}

src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ protected function doSend(MessageInterface $message): void
8080
if (200 !== $response->getStatusCode()) {
8181
$result = $response->toArray(false);
8282

83-
throw new TransportException(sprintf('Unable to post the Telegram message: %s (%s).', $result['description'], $result['error_code']), $response);
83+
throw new TransportException(sprintf('Unable to post the Telegram message: '.$result['description'].' (%s).', $result['error_code']), $response);
8484
}
8585
}
8686
}

src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ protected function doSend(MessageInterface $message): void
7070
if (201 !== $response->getStatusCode()) {
7171
$error = $response->toArray(false);
7272

73-
throw new TransportException(sprintf('Unable to send the SMS: %s (see %s).', $error['message'], $error['more_info']), $response);
73+
throw new TransportException(sprintf('Unable to send the SMS: '.$error['message'].' (see %s).', $error['more_info']), $response);
7474
}
7575
}
7676
}

0 commit comments

Comments
 (0)
0