From 910cc727a07b37c2e294ab8a9fb22504243459c1 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 12 Apr 2020 19:06:46 +0200 Subject: [PATCH] Tweak the code to avoid fabbot false positives --- src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php | 2 +- src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php | 2 +- .../Component/Notifier/Bridge/Nexmo/NexmoTransport.php | 2 +- .../Component/Notifier/Bridge/Slack/SlackTransport.php | 4 ++-- .../Component/Notifier/Bridge/Telegram/TelegramTransport.php | 2 +- .../Component/Notifier/Bridge/Twilio/TwilioTransport.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php index 1233fc7afc..599613973c 100644 --- a/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php +++ b/src/Symfony/Component/Cache/Adapter/MemcachedAdapter.php @@ -313,7 +313,7 @@ class MemcachedAdapter extends AbstractAdapter return $result; } - throw new CacheException(sprintf('MemcachedAdapter client error: %s.', strtolower($this->client->getResultMessage()))); + throw new CacheException('MemcachedAdapter client error: '.strtolower($this->client->getResultMessage())); } private function getClient(): \Memcached diff --git a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php index 99e35b3468..bbdd025d49 100644 --- a/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php +++ b/src/Symfony/Component/Ldap/Adapter/ExtLdap/EntryManager.php @@ -152,7 +152,7 @@ class EntryManager implements EntryManagerInterface } if (!@ldap_modify_batch($this->getConnectionResource(), $dn, $operationsMapped)) { - throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": "%s".', $dn, ldap_error($this->getConnectionResource()))); + throw new UpdateOperationException(sprintf('Error executing UpdateOperation on "%s": '.ldap_error($this->getConnectionResource()), $dn)); } } diff --git a/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php b/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php index ae46ffbea2..3b2be88d6a 100644 --- a/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Nexmo/NexmoTransport.php @@ -70,7 +70,7 @@ final class NexmoTransport extends AbstractTransport $result = $response->toArray(false); foreach ($result['messages'] as $msg) { if ($msg['status'] ?? false) { - throw new TransportException(sprintf('Unable to send the SMS: %s (%s).', $msg['error-text'], $msg['status']), $response); + throw new TransportException(sprintf('Unable to send the SMS: '.$msg['error-text'].' (%s).', $msg['status']), $response); } } } diff --git a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php index 566ee7a25f..ccde708dbf 100644 --- a/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Slack/SlackTransport.php @@ -79,12 +79,12 @@ final class SlackTransport extends AbstractTransport ]); if (200 !== $response->getStatusCode()) { - throw new TransportException(sprintf('Unable to post the Slack message: %s.', $response->getContent(false)), $response); + throw new TransportException('Unable to post the Slack message: '.$response->getContent(false), $response); } $result = $response->toArray(false); if (!$result['ok']) { - throw new TransportException(sprintf('Unable to post the Slack message: %s.', $result['error']), $response); + throw new TransportException('Unable to post the Slack message: '.$result['error'], $response); } } } diff --git a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php index 7856938187..800e814aec 100644 --- a/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Telegram/TelegramTransport.php @@ -80,7 +80,7 @@ final class TelegramTransport extends AbstractTransport if (200 !== $response->getStatusCode()) { $result = $response->toArray(false); - throw new TransportException(sprintf('Unable to post the Telegram message: %s (%s).', $result['description'], $result['error_code']), $response); + throw new TransportException(sprintf('Unable to post the Telegram message: '.$result['description'].' (%s).', $result['error_code']), $response); } } } diff --git a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php index 79131282ac..f2219b8b09 100644 --- a/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php +++ b/src/Symfony/Component/Notifier/Bridge/Twilio/TwilioTransport.php @@ -70,7 +70,7 @@ final class TwilioTransport extends AbstractTransport if (201 !== $response->getStatusCode()) { $error = $response->toArray(false); - throw new TransportException(sprintf('Unable to send the SMS: %s (see %s).', $error['message'], $error['more_info']), $response); + throw new TransportException(sprintf('Unable to send the SMS: '.$error['message'].' (see %s).', $error['more_info']), $response); } } }