Merge branch '5.1'

fabpot · fabpot · commit 8a7c776b92c9 · 2020-07-20T18:31:06.000+02:00
* 5.1:
  [Mailer] Fix failover transport
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
@@ -29,6 +29,11 @@ protected function getNextTransport(): ?TransportInterface
         return $this->currentTransport;
     }
 
+    protected function getInitialCursor(): int
+    {
+        return 0;
+    }
+
     protected function getNameSymbol(): string
     {
         return 'failover';
diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php
@@ -67,9 +67,7 @@ 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);
+            $this->cursor = $this->getInitialCursor();
         }
 
         $cursor = $this->cursor;
@@ -101,6 +99,13 @@ protected function isTransportDead(TransportInterface $transport): bool
         return $this->deadTransports->contains($transport);
     }
 
+    protected function getInitialCursor(): int
+    {
+        // the cursor initial value is randomized so that
+        // when are not in a daemon, we are still rotating the transports
+        return mt_rand(0, \count($this->transports) - 1);
+    }
+
     protected function getNameSymbol(): string
     {
         return 'roundrobin';

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ protected function getNextTransport(): ?TransportInterface`
`29`	`29`	`return $this->currentTransport;`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ protected function getInitialCursor(): int`
	`33`	`+ {`
	`34`	`+ return 0;`
	`35`	`+ }`
	`36`	`+`
`32`	`37`	`protected function getNameSymbol(): string`
`33`	`38`	`{`
`34`	`39`	`return 'failover';`
Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,7 @@ public function __toString(): string`
`67`	`67`	`protected function getNextTransport(): ?TransportInterface`
`68`	`68`	`{`
`69`	`69`	`if (-1 === $this->cursor) {`
`70`		`- // the cursor initial value is randomized so that`
`71`		`- // when are not in a daemon, we are still rotating the transports`
`72`		`- $this->cursor = mt_rand(0, \count($this->transports) - 1);`
	`70`	`+ $this->cursor = $this->getInitialCursor();`
`73`	`71`	`}`
`74`	`72`
`75`	`73`	`$cursor = $this->cursor;`
`@@ -101,6 +99,13 @@ protected function isTransportDead(TransportInterface $transport): bool`
`101`	`99`	`return $this->deadTransports->contains($transport);`
`102`	`100`	`}`
`103`	`101`
	`102`	`+ protected function getInitialCursor(): int`
	`103`	`+ {`
	`104`	`+ // the cursor initial value is randomized so that`
	`105`	`+ // when are not in a daemon, we are still rotating the transports`
	`106`	`+ return mt_rand(0, \count($this->transports) - 1);`
	`107`	`+ }`
	`108`	`+`
`104`	`109`	`protected function getNameSymbol(): string`
`105`	`110`	`{`
`106`	`111`	`return 'roundrobin';`