[Mailer] Change the syntax for DSNs using failover or roundrobin

fabpot · fabpot · commit f30dc2bbc787 · 2019-09-07T08:34:32.000+02:00
diff --git a/src/Symfony/Component/Mailer/CHANGELOG.md b/src/Symfony/Component/Mailer/CHANGELOG.md
@@ -4,6 +4,18 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] changed the syntax for failover and roundrobin DSNs
+
+   Before:
+
+   dummy://a || dummy://b (for failover)
+   dummy://a && dummy://b (for roundrobin)
+
+   After:
+
+   failover(dummy://a dummy://b)
+   roundrobin(dummy://a dummy://b)
+
  * added support for multiple transports on a `Mailer` instance
  * [BC BREAK] removed the `auth_mode` DSN option (it is now always determined automatically)
  * STARTTLS cannot be enabled anymore (it is used automatically if TLS is disabled and the server supports STARTTLS)
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php
@@ -36,7 +36,7 @@ public function testToString()
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->once())->method('__toString')->willReturn('t2://local');
         $t = new FailoverTransport([$t1, $t2]);
-        $this->assertEquals('t1://local || t2://local', (string) $t);
+        $this->assertEquals('failover(t1://local t2://local)', (string) $t);
     }
 
     public function testSendFirstWork()
diff --git a/src/Symfony/Component/Mailer/Tests/Transport/RoundRobinTransportTest.php b/src/Symfony/Component/Mailer/Tests/Transport/RoundRobinTransportTest.php
@@ -35,7 +35,7 @@ public function testToString()
         $t2 = $this->createMock(TransportInterface::class);
         $t2->expects($this->once())->method('__toString')->willReturn('t2://local');
         $t = new RoundRobinTransport([$t1, $t2]);
-        $this->assertEquals('t1://local && t2://local', (string) $t);
+        $this->assertEquals('roundrobin(t1://local t2://local)', (string) $t);
     }
 
     public function testSendAlternate()
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -12,6 +12,7 @@
 namespace Symfony\Component\Mailer\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mailer\SentMessage;
 use Symfony\Component\Mailer\SmtpEnvelope;
 use Symfony\Component\Mailer\Transport;
@@ -44,14 +45,42 @@ public function fromStringProvider(): iterable
         ];
 
         yield 'failover transport' => [
-            'dummy://a || dummy://b',
+            'failover(dummy://a dummy://b)',
             new FailoverTransport([$transportA, $transportB]),
         ];
 
         yield 'round robin transport' => [
-            'dummy://a && dummy://b',
+            'roundrobin(dummy://a dummy://b)',
             new RoundRobinTransport([$transportA, $transportB]),
         ];
+
+        yield 'mixed transport' => [
+            'roundrobin(dummy://a failover(dummy://b dummy://a) dummy://b)',
+            new RoundRobinTransport([$transportA, new FailoverTransport([$transportB, $transportA]), $transportB]),
+        ];
+    }
+
+    /**
+     * @dataProvider fromWrongStringProvider
+     */
+    public function testFromWrongString(string $dsn, string $error): void
+    {
+        $transportFactory = new Transport([new DummyTransportFactory()]);
+
+        $this->expectExceptionMessage($error);
+        $this->expectException(InvalidArgumentException::class);
+        $transportFactory->fromString($dsn);
+    }
+
+    public function fromWrongStringProvider(): iterable
+    {
+        yield 'garbage at the end' => ['dummy://a some garbage here', 'The DSN has some garbage at the end:  some garbage here.'];
+
+        yield 'not a valid DSN' => ['something not a dsn', 'The "something" mailer DSN must contain a scheme.'];
+
+        yield 'failover not closed' => ['failover(dummy://a', 'The "(dummy://a" mailer DSN must contain a scheme.'];
+
+        yield 'not a valid keyword' => ['foobar(dummy://a)', 'The "foobar(dummy://a" mailer DSN must contain a scheme.'];
     }
 }
 
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
@@ -18,6 +18,7 @@
 use Symfony\Component\Mailer\Bridge\Mailgun\Transport\MailgunTransportFactory;
 use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
 use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
+use Symfony\Component\Mailer\Exception\InvalidArgumentException;
 use Symfony\Component\Mailer\Exception\UnsupportedHostException;
 use Symfony\Component\Mailer\Transport\Dsn;
 use Symfony\Component\Mailer\Transport\FailoverTransport;
@@ -82,17 +83,55 @@ public function fromStrings(array $dsns): Transports
 
     public function fromString(string $dsn): TransportInterface
     {
-        $dsns = preg_split('/\s++\|\|\s++/', $dsn);
-        if (\count($dsns) > 1) {
-            return new FailoverTransport($this->createFromDsns($dsns));
+        list($transport, $offset) = $this->parseDsn($dsn);
+        if ($offset !== \strlen($dsn)) {
+            throw new InvalidArgumentException(sprintf('The DSN has some garbage at the end: %s.', substr($dsn, $offset)));
         }
 
-        $dsns = preg_split('/\s++&&\s++/', $dsn);
-        if (\count($dsns) > 1) {
-            return new RoundRobinTransport($this->createFromDsns($dsns));
-        }
+        return $transport;
+    }
+
+    private function parseDsn(string $dsn, int $offset = 0): array
+    {
+        static $keywords = [
+            'failover' => FailoverTransport::class,
+            'roundrobin' => RoundRobinTransport::class,
+        ];
+
+        while (true) {
+            foreach ($keywords as $name => $class) {
+                $name .= '(';
+                if ($name === substr($dsn, $offset, \strlen($name))) {
+                    $offset += \strlen($name) - 1;
+                    preg_match('{\(([^()]|(?R))*\)}A', $dsn, $matches, 0, $offset);
+                    if (!isset($matches[0])) {
+                        continue;
+                    }
+
+                    ++$offset;
+                    $args = [];
+                    while (true) {
+                        list($arg, $offset) = $this->parseDsn($dsn, $offset);
+                        $args[] = $arg;
+                        if (\strlen($dsn) === $offset) {
+                            break;
+                        }
+                        ++$offset;
+                        if (')' === $dsn[$offset - 1]) {
+                            break;
+                        }
+                    }
+
+                    return [new $class($args), $offset];
+                }
+            }
+
+            if ($pos = strcspn($dsn, ' )', $offset)) {
+                return [$this->fromDsnObject(Dsn::fromString(substr($dsn, $offset, $pos))), $offset + $pos];
+            }
 
-        return $this->fromDsnObject(Dsn::fromString($dsn));
+            return [$this->fromDsnObject(Dsn::fromString(substr($dsn, $offset))), \strlen($dsn)];
+        }
     }
 
     public function fromDsnObject(Dsn $dsn): TransportInterface
@@ -106,21 +145,6 @@ public function fromDsnObject(Dsn $dsn): TransportInterface
         throw new UnsupportedHostException($dsn);
     }
 
-    /**
-     * @param string[] $dsns
-     *
-     * @return TransportInterface[]
-     */
-    private function createFromDsns(array $dsns): array
-    {
-        $transports = [];
-        foreach ($dsns as $dsn) {
-            $transports[] = $this->fromDsnObject(Dsn::fromString($dsn));
-        }
-
-        return $transports;
-    }
-
     private static function getDefaultFactories(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): iterable
     {
         foreach (self::FACTORY_CLASSES as $factoryClass) {
diff --git a/src/Symfony/Component/Mailer/Transport/FailoverTransport.php b/src/Symfony/Component/Mailer/Transport/FailoverTransport.php
@@ -31,6 +31,6 @@ protected function getNextTransport(): ?TransportInterface
 
     protected function getNameSymbol(): string
     {
-        return '||';
+        return 'failover';
     }
 }
diff --git a/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php b/src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php
@@ -58,9 +58,9 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM
 
     public function __toString(): string
     {
-        return implode(' '.$this->getNameSymbol().' ', array_map(function (TransportInterface $transport) {
+        return $this->getNameSymbol().'('.implode(' ', array_map(function (TransportInterface $transport) {
             return (string) $transport;
-        }, $this->transports));
+        }, $this->transports)).')';
     }
 
     /**
@@ -99,7 +99,7 @@ protected function isTransportDead(TransportInterface $transport): bool
 
     protected function getNameSymbol(): string
     {
-        return '&&';
+        return 'roundrobin';
     }
 
     private function moveCursor(int $cursor): int

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function testToString()`
`36`	`36`	`$t2 = $this->createMock(TransportInterface::class);`
`37`	`37`	`$t2->expects($this->once())->method('__toString')->willReturn('t2://local');`
`38`	`38`	`$t = new FailoverTransport([$t1, $t2]);`
`39`		`- $this->assertEquals('t1://local \|\| t2://local', (string) $t);`
	`39`	`+ $this->assertEquals('failover(t1://local t2://local)', (string) $t);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`public function testSendFirstWork()`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public function testToString()`
`35`	`35`	`$t2 = $this->createMock(TransportInterface::class);`
`36`	`36`	`$t2->expects($this->once())->method('__toString')->willReturn('t2://local');`
`37`	`37`	`$t = new RoundRobinTransport([$t1, $t2]);`
`38`		`- $this->assertEquals('t1://local && t2://local', (string) $t);`
	`38`	`+ $this->assertEquals('roundrobin(t1://local t2://local)', (string) $t);`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`public function testSendAlternate()`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ protected function getNextTransport(): ?TransportInterface`
`31`	`31`
`32`	`32`	`protected function getNameSymbol(): string`
`33`	`33`	`{`
`34`		`- return '\|\|';`
	`34`	`+ return 'failover';`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,9 @@ public function send(RawMessage $message, SmtpEnvelope $envelope = null): ?SentM`
`58`	`58`
`59`	`59`	`public function __toString(): string`
`60`	`60`	`{`
`61`		`- return implode(' '.$this->getNameSymbol().' ', array_map(function (TransportInterface $transport) {`
	`61`	`+ return $this->getNameSymbol().'('.implode(' ', array_map(function (TransportInterface $transport) {`
`62`	`62`	`return (string) $transport;`
`63`		`- }, $this->transports));`
	`63`	`+ }, $this->transports)).')';`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`/**`
`@@ -99,7 +99,7 @@ protected function isTransportDead(TransportInterface $transport): bool`
`99`	`99`
`100`	`100`	`protected function getNameSymbol(): string`
`101`	`101`	`{`
`102`		`- return '&&';`
	`102`	`+ return 'roundrobin';`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`private function moveCursor(int $cursor): int`