[Mailer] Fix failover transport

fabpot · fabpot · commit c87cf84dd2db · 2020-07-20T10:18:07.000+02:00
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php
@@ -46,9 +46,6 @@ public function testSendFirstWork()
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->never())->method('send');
         $t = new FailoverTransport([$t1, $t2]);
-        $p = new \ReflectionProperty(RoundRobinTransport::class, 'cursor');
-        $p->setAccessible(true);
-        $p->setValue($t, 0);
         $t->send(new RawMessage(''));
         $this->assertTransports($t, 1, []);
         $t->send(new RawMessage(''));
@@ -77,9 +74,6 @@ public function testSendOneDead()
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->exactly(3))->method('send');
         $t = new FailoverTransport([$t1, $t2]);
-        $p = new \ReflectionProperty(RoundRobinTransport::class, 'cursor');
-        $p->setAccessible(true);
-        $p->setValue($t, 0);
         $t->send(new RawMessage(''));
         $this->assertTransports($t, 0, [$t1]);
         $t->send(new RawMessage(''));
@@ -99,9 +93,6 @@ public function testSendOneDeadAndRecoveryWithinRetryPeriod()
         $t2->expects($this->at(2))->method('send');
         $t2->expects($this->at(3))->method('send')->will($this->throwException(new TransportException()));
         $t = new FailoverTransport([$t1, $t2], 6);
-        $p = new \ReflectionProperty(RoundRobinTransport::class, 'cursor');
-        $p->setAccessible(true);
-        $p->setValue($t, 0);
         $t->send(new RawMessage('')); // t1>fail - t2>sent
         $this->assertTransports($t, 0, [$t1]);
         sleep(4);
@@ -148,9 +139,6 @@ public function testSendOneDeadButRecover()
         $t2->expects($this->at(1))->method('send');
         $t2->expects($this->at(2))->method('send')->will($this->throwException(new TransportException()));
         $t = new FailoverTransport([$t1, $t2], 1);
-        $p = new \ReflectionProperty(RoundRobinTransport::class, 'cursor');
-        $p->setAccessible(true);
-        $p->setValue($t, 0);
         $t->send(new RawMessage(''));
         sleep(1);
         $t->send(new RawMessage(''));
diff --git a/src/Symfony/Component/Mailer/Transport/FailoverTransport.php b/src/Symfony/Component/Mailer/Transport/FailoverTransport.php
@@ -20,6 +20,13 @@ class FailoverTransport extends RoundRobinTransport
 {
     private $currentTransport;
 
+    public function __construct(array $transports, int $retryPeriod = 60)
+    {
+        parent::__construct($transports, $retryPeriod);
+
+        $this->cursor = 0;
+    }
+
     protected function getNextTransport(): ?TransportInterface
     {
         if (null === $this->currentTransport || $this->isTransportDead($this->currentTransport)) {
diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php
@@ -27,7 +27,8 @@ class RoundRobinTransport implements TransportInterface
     private $deadTransports;
     private $transports = [];
     private $retryPeriod;
-    private $cursor = -1;
+    /** @internal */
+    protected $cursor;
 
     /**
      * @param TransportInterface[] $transports
@@ -41,6 +42,9 @@ public function __construct(array $transports, int $retryPeriod = 60)
         $this->transports = $transports;
         $this->deadTransports = new \SplObjectStorage();
         $this->retryPeriod = $retryPeriod;
+        // the cursor initial value is randomized so that
+        // when are not in a daemon, we are still rotating the transports
+        $this->cursor = mt_rand(0, \count($transports) - 1);
     }
 
     public function send(RawMessage $message, Envelope $envelope = null): ?SentMessage
@@ -66,12 +70,6 @@ public function __toString(): string
      */
     protected function getNextTransport(): ?TransportInterface
     {
-        if (-1 === $this->cursor) {
-            // the cursor initial value is randomized so that
-            // when are not in a daemon, we are still rotating the transports
-            $this->cursor = mt_rand(0, \count($this->transports) - 1);
-        }
-
         $cursor = $this->cursor;
         while (true) {
             $transport = $this->transports[$cursor];

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,13 @@ class FailoverTransport extends RoundRobinTransport`
`20`	`20`	`{`
`21`	`21`	`private $currentTransport;`
`22`	`22`
	`23`	`+ public function __construct(array $transports, int $retryPeriod = 60)`
	`24`	`+ {`
	`25`	`+ parent::__construct($transports, $retryPeriod);`
	`26`	`+`
	`27`	`+ $this->cursor = 0;`
	`28`	`+ }`
	`29`	`+`
`23`	`30`	`protected function getNextTransport(): ?TransportInterface`
`24`	`31`	`{`
`25`	`32`	`if (null === $this->currentTransport \|\| $this->isTransportDead($this->currentTransport)) {`