Skip to content

[Mailer] Restore Transport signatures #42695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2021
+4 −32
Merged

[Mailer] Restore Transport signatures #42695

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 4 additions & 32 deletions src/Symfony/Component/Mailer/Transport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,8 @@
/**
* @author Fabien Potencier <fabien@symfony.com>
* @author Konstantin Myakshin <molodchick@gmail.com>
*
* @final since Symfony 5.4
*/
class Transport
final class Transport
{
private const FACTORY_CLASSES = [
GmailTransportFactory::class,
Expand All @@ -56,33 +54,15 @@ class Transport

private $factories;

/**
* @param EventDispatcherInterface|null $dispatcher
* @param HttpClientInterface|null $client
* @param LoggerInterface|null $logger
*/
public static function fromDsn(string $dsn/*, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null*/): TransportInterface
public static function fromDsn(string $dsn, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
{
$dispatcher = 2 <= \func_num_args() ? func_get_arg(1) : null;
$client = 3 <= \func_num_args() ? func_get_arg(2) : null;
$logger = 4 <= \func_num_args() ? func_get_arg(3) : null;

$factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));

return $factory->fromString($dsn);
}

/**
* @param EventDispatcherInterface|null $dispatcher
* @param HttpClientInterface|null $client
* @param LoggerInterface|null $logger
*/
public static function fromDsns(array $dsns/*, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null*/): TransportInterface
public static function fromDsns(array $dsns, EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): TransportInterface
{
$dispatcher = 2 <= \func_num_args() ? func_get_arg(1) : null;
$client = 3 <= \func_num_args() ? func_get_arg(2) : null;
$logger = 4 <= \func_num_args() ? func_get_arg(3) : null;

$factory = new self(iterator_to_array(self::getDefaultFactories($dispatcher, $client, $logger)));

return $factory->fromStrings($dsns);
Expand Down Expand Up @@ -175,18 +155,10 @@ public function fromDsnObject(Dsn $dsn): TransportInterface
}

/**
* @param EventDispatcherInterface|null $dispatcher
* @param HttpClientInterface|null $client
* @param LoggerInterface|null $logger
*
* @return \Traversable<int, TransportFactoryInterface>
*/
public static function getDefaultFactories(/*EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null*/): iterable
public static function getDefaultFactories(EventDispatcherInterface $dispatcher = null, HttpClientInterface $client = null, LoggerInterface $logger = null): \Traversable
{
$dispatcher = 1 <= \func_num_args() ? func_get_arg(0) : null;
$client = 2 <= \func_num_args() ? func_get_arg(1) : null;
$logger = 3 <= \func_num_args() ? func_get_arg(2) : null;

foreach (self::FACTORY_CLASSES as $factoryClass) {
if (class_exists($factoryClass)) {
yield new $factoryClass($dispatcher, $client, $logger);
Expand Down