minor #33787 [Mailer] Tweak some code (fabpot)

fabpot · fabpot · commit 11da6f6eea1a · 2019-10-01T13:38:59.000+02:00
This PR was merged into the 4.4 branch. Discussion ---------- [Mailer] Tweak some code | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no  | Deprecations? | no  | Tickets | n/a | License | MIT | Doc PR | n/a Tweaks from the Notifier PR. Commits ------- ab094c0 [Mailer] Tweak some code
diff --git 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 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
 
     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
@@ -21,7 +21,7 @@
 /**
  * @author Fabien Potencier <fabien@symfony.com>
  */
-class Transports implements TransportInterface
+final class Transports implements TransportInterface
 {
     private $transports;
     private $default;
@@ -64,6 +64,6 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa
 
     public function __toString(): string
     {
-        return 'all';
+        return '['.implode(',', array_keys($this->transports)).']';
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RoundRobinTransport implements TransportInterface`
`35`	`35`	`public function __construct(array $transports, int $retryPeriod = 60)`
`36`	`36`	`{`
`37`	`37`	`if (!$transports) {`
`38`		`- throw new TransportException(__CLASS__.' must have at least one transport configured.');`
	`38`	`+ throw new TransportException(sprintf('"%s" must have at least one transport configured.', static::class));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`$this->transports = $transports;`
`@@ -58,9 +58,7 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa`
`58`	`58`
`59`	`59`	`public function __toString(): string`
`60`	`60`	`{`
`61`		`- return $this->getNameSymbol().'('.implode(' ', array_map(function (TransportInterface $transport) {`
`62`		`- return (string) $transport;`
`63`		`- }, $this->transports)).')';`
	`61`	`+ return $this->getNameSymbol().'('.implode(' ', array_map('strval', $this->transports)).')';`
`64`	`62`	`}`
`65`	`63`
`66`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`/**`
`22`	`22`	`* @author Fabien Potencier <fabien@symfony.com>`
`23`	`23`	`*/`
`24`		`-class Transports implements TransportInterface`
	`24`	`+final class Transports implements TransportInterface`
`25`	`25`	`{`
`26`	`26`	`private $transports;`
`27`	`27`	`private $default;`
`@@ -64,6 +64,6 @@ public function send(RawMessage $message, Envelope $envelope = null): ?SentMessa`
`64`	`64`
`65`	`65`	`public function __toString(): string`
`66`	`66`	`{`
`67`		`- return 'all';`
	`67`	`+ return '['.implode(',', array_keys($this->transports)).']';`
`68`	`68`	`}`
`69`	`69`	`}`