From ab094c02ebbfbc0a3e020f53f98b314765336918 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 1 Oct 2019 12:10:05 +0200 Subject: [PATCH] [Mailer] Tweak some code --- .../Component/Mailer/Transport/RoundRobinTransport.php | 6 ++---- src/Symfony/Component/Mailer/Transport/Transports.php | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php index 4f004784ef..37128dda62 100644 --- a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php +++ b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php @@ -35,7 +35,7 @@ class RoundRobinTransport implements TransportInterface public function __construct(array $transports, int $retryPeriod = 60) { if (!$transports) { - throw new TransportException(__CLASS__.' must have at least one transport configured.'); + throw new TransportException(sprintf('"%s" must have at least one transport configured.', static::class)); } $this->transports = $transports; @@ -58,9 +58,7 @@ class RoundRobinTransport implements TransportInterface public function __toString(): string { - return $this->getNameSymbol().'('.implode(' ', array_map(function (TransportInterface $transport) { - return (string) $transport; - }, $this->transports)).')'; + return $this->getNameSymbol().'('.implode(' ', array_map('strval', $this->transports)).')'; } /** diff --git a/src/Symfony/Component/Mailer/Transport/Transports.php b/src/Symfony/Component/Mailer/Transport/Transports.php index 38c868862f..c8f7970b32 100644 --- a/src/Symfony/Component/Mailer/Transport/Transports.php +++ b/src/Symfony/Component/Mailer/Transport/Transports.php @@ -21,7 +21,7 @@ use Symfony\Component\Mime\RawMessage; /** * @author Fabien Potencier */ -class Transports implements TransportInterface +final class Transports implements TransportInterface { private $transports; private $default; @@ -64,6 +64,6 @@ class Transports implements TransportInterface public function __toString(): string { - return 'all'; + return '['.implode(',', array_keys($this->transports)).']'; } }