[Mailer] Fixed generator bug when creating multiple transports using Transport::fromDsn

atailouloute · atailouloute · commit 5d9bc1566cce · 2020-06-08T21:27:46.000+02:00
diff --git a/src/Symfony/Component/Mailer/Tests/TransportTest.php b/src/Symfony/Component/Mailer/Tests/TransportTest.php
@@ -60,6 +60,22 @@ public function fromStringProvider(): iterable
         ];
     }
 
+    /**
+     * @dataProvider fromDnsProvider
+     */
+    public function testFromDsn(string $dsn, TransportInterface $transport): void
+    {
+        $this->assertEquals($transport, Transport::fromDsn($dsn));
+    }
+
+    public function fromDnsProvider(): iterable
+    {
+        yield 'multiple transport' => [
+            'failover(smtp://a smtp://b)',
+            new FailoverTransport([new Transport\Smtp\EsmtpTransport('a'), new Transport\Smtp\EsmtpTransport('b')]),
+        ];
+    }
+
     /**
      * @dataProvider fromWrongStringProvider
      */
diff --git a/src/Symfony/Component/Mailer/Transport.php b/src/Symfony/Component/Mailer/Transport.php
@@ -51,7 +51,7 @@ class Transport
 
     public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
     {
-        $factory = new self(self::getDefaultFactories($dispatcher, $client, $logger));
+        $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));
 
         return $factory->fromString($dsn);
     }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ class Transport`
`51`	`51`
`52`	`52`	`public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface`
`53`	`53`	`{`
`54`		`- $factory = new self(self::getDefaultFactories($dispatcher, $client, $logger));`
	`54`	`+ $factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));`
`55`	`55`
`56`	`56`	`return $factory->fromString($dsn);`
`57`	`57`	`}`