Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 5db5558

Browse files
KocKoc
committed
[Mailer] Split standard transports per sub-namespaces
1 parent e38c7d3 commit 5db5558

23 files changed

+49
-36
lines changed

‎src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
1818
use Symfony\Component\Mime\Email;
1919
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
2020
use Symfony\Contracts\HttpClient\HttpClientInterface;

‎src/Symfony/Component/Mailer/Bridge/Amazon/Transport/SesHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SentMessage;
17-
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
1818
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1919
use Symfony\Contracts\HttpClient\HttpClientInterface;
2020
use Symfony\Contracts\HttpClient\ResponseInterface;

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
1818
use Symfony\Component\Mime\Email;
1919
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
2020
use Symfony\Contracts\HttpClient\HttpClientInterface;

‎src/Symfony/Component/Mailer/Bridge/Mailchimp/Transport/MandrillHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SentMessage;
17-
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
1818
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
1919
use Symfony\Contracts\HttpClient\HttpClientInterface;
2020
use Symfony\Contracts\HttpClient\ResponseInterface;

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
1818
use Symfony\Component\Mime\Email;
1919
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
2020
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;

‎src/Symfony/Component/Mailer/Bridge/Mailgun/Transport/MailgunHttpTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SentMessage;
17-
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractHttpTransport;
1818
use Symfony\Component\Mime\Part\DataPart;
1919
use Symfony\Component\Mime\Part\Multipart\FormDataPart;
2020
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;

‎src/Symfony/Component/Mailer/Bridge/Postmark/Transport/PostmarkApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
1818
use Symfony\Component\Mime\Email;
1919
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
2020
use Symfony\Contracts\HttpClient\HttpClientInterface;

‎src/Symfony/Component/Mailer/Bridge/Sendgrid/Transport/SendgridApiTransport.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\Exception\HttpTransportException;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\Api\AbstractApiTransport;
17+
use Symfony\Component\Mailer\Transport\AbstractApiTransport;
1818
use Symfony\Component\Mime\Address;
1919
use Symfony\Component\Mime\Email;
2020
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;

‎src/Symfony/Component/Mailer/Tests/Transport/AbstractTransportTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Mailer\SmtpEnvelope;
16-
use Symfony\Component\Mailer\Transport\NullTransport;
16+
use Symfony\Component\Mailer\Transport\Null\NullTransport;
1717
use Symfony\Component\Mime\Address;
1818
use Symfony\Component\Mime\RawMessage;
1919

‎src/Symfony/Component/Mailer/Tests/Transport/FailoverTransportTest.php renamed to ‎src/Symfony/Component/Mailer/Tests/Transport/Chain/FailoverTransportTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Tests\Transport;
12+
namespace Symfony\Component\Mailer\Tests\Transport\Chain;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Mailer\Exception\TransportException;
16-
use Symfony\Component\Mailer\Transport\FailoverTransport;
17-
use Symfony\Component\Mailer\Transport\RoundRobinTransport;
16+
use Symfony\Component\Mailer\Transport\Chain\FailoverTransport;
17+
use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
1818
use Symfony\Component\Mailer\Transport\TransportInterface;
1919
use Symfony\Component\Mime\RawMessage;
2020

‎src/Symfony/Component/Mailer/Tests/Transport/RoundRobinTransportTest.php renamed to ‎src/Symfony/Component/Mailer/Tests/Transport/Chain/RoundRobinTransportTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Tests\Transport;
12+
namespace Symfony\Component\Mailer\Tests\Transport\Chain;
1313

1414
use PHPUnit\Framework\TestCase;
1515
use Symfony\Component\Mailer\Exception\TransportException;
16-
use Symfony\Component\Mailer\Transport\RoundRobinTransport;
16+
use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
1717
use Symfony\Component\Mailer\Transport\TransportInterface;
1818
use Symfony\Component\Mime\RawMessage;
1919

‎src/Symfony/Component/Mailer/Tests/Transport/NullTransportFactoryTest.php renamed to ‎src/Symfony/Component/Mailer/Tests/Transport/Null/NullTransportFactoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Tests\Transport;
12+
namespace Symfony\Component\Mailer\Tests\Transport\Null;
1313

1414
use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
1515
use Symfony\Component\Mailer\Transport\Dsn;
16-
use Symfony\Component\Mailer\Transport\NullTransport;
17-
use Symfony\Component\Mailer\Transport\NullTransportFactory;
16+
use Symfony\Component\Mailer\Transport\Null\NullTransport;
17+
use Symfony\Component\Mailer\Transport\Null\NullTransportFactory;
1818
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
1919

2020
class NullTransportFactoryTest extends TransportFactoryTestCase

‎src/Symfony/Component/Mailer/Tests/Transport/SendmailTransportFactoryTest.php renamed to ‎src/Symfony/Component/Mailer/Tests/Transport/Sendmail/SendmailTransportFactoryTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Tests\Transport;
12+
namespace Symfony\Component\Mailer\Tests\Transport\Sendmail;
1313

1414
use Symfony\Component\Mailer\Tests\TransportFactoryTestCase;
1515
use Symfony\Component\Mailer\Transport\Dsn;
16-
use Symfony\Component\Mailer\Transport\SendmailTransport;
17-
use Symfony\Component\Mailer\Transport\SendmailTransportFactory;
16+
use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransport;
17+
use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransportFactory;
1818
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
1919

2020
class SendmailTransportFactoryTest extends TransportFactoryTestCase

‎src/Symfony/Component/Mailer/Tests/TransportTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
use Symfony\Component\Mailer\SentMessage;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
1717
use Symfony\Component\Mailer\Transport;
18+
use Symfony\Component\Mailer\Transport\Chain\FailoverTransport;
19+
use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
1820
use Symfony\Component\Mailer\Transport\Dsn;
1921
use Symfony\Component\Mailer\Transport\TransportInterface;
2022
use Symfony\Component\Mime\RawMessage;
@@ -43,12 +45,12 @@ public function fromStringProvider(): iterable
4345

4446
yield 'failover transport' => [
4547
'dummy://a || dummy://b',
46-
new Transport\FailoverTransport([$transportA, $transportB]),
48+
new FailoverTransport([$transportA, $transportB]),
4749
];
4850

4951
yield 'round robin transport' => [
5052
'dummy://a && dummy://b',
51-
new Transport\RoundRobinTransport([$transportA, $transportB]),
53+
new RoundRobinTransport([$transportA, $transportB]),
5254
];
5355
}
5456
}

‎src/Symfony/Component/Mailer/Transport.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,11 @@
1919
use Symfony\Component\Mailer\Bridge\Postmark\Transport\PostmarkTransportFactory;
2020
use Symfony\Component\Mailer\Bridge\Sendgrid\Transport\SendgridTransportFactory;
2121
use Symfony\Component\Mailer\Exception\UnsupportedHostException;
22+
use Symfony\Component\Mailer\Transport\Chain\FailoverTransport;
23+
use Symfony\Component\Mailer\Transport\Chain\RoundRobinTransport;
2224
use Symfony\Component\Mailer\Transport\Dsn;
23-
use Symfony\Component\Mailer\Transport\NullTransportFactory;
24-
use Symfony\Component\Mailer\Transport\SendmailTransportFactory;
25+
use Symfony\Component\Mailer\Transport\Null\NullTransportFactory;
26+
use Symfony\Component\Mailer\Transport\Sendmail\SendmailTransportFactory;
2527
use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransportFactory;
2628
use Symfony\Component\Mailer\Transport\TransportFactoryInterface;
2729
use Symfony\Component\Mailer\Transport\TransportInterface;
@@ -64,12 +66,12 @@ public function fromString(string $dsn): TransportInterface
6466
{
6567
$dsns = preg_split('/\s++\|\|\s++/', $dsn);
6668
if (\count($dsns) > 1) {
67-
return new Transport\FailoverTransport($this->createFromDsns($dsns));
69+
return new FailoverTransport($this->createFromDsns($dsns));
6870
}
6971

7072
$dsns = preg_split('/\s++&&\s++/', $dsn);
7173
if (\count($dsns) > 1) {
72-
return new Transport\RoundRobinTransport($this->createFromDsns($dsns));
74+
return new RoundRobinTransport($this->createFromDsns($dsns));
7375
}
7476

7577
return $this->fromDsnObject(Dsn::fromString($dsn));

‎src/Symfony/Component/Mailer/Transport/Http/Api/AbstractApiTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/AbstractApiTransport.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport\Http\Api;
12+
namespace Symfony\Component\Mailer\Transport;
1313

1414
use Symfony\Component\Mailer\Exception\RuntimeException;
1515
use Symfony\Component\Mailer\SentMessage;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17-
use Symfony\Component\Mailer\Transport\Http\AbstractHttpTransport;
1817
use Symfony\Component\Mime\Address;
1918
use Symfony\Component\Mime\Email;
2019
use Symfony\Component\Mime\MessageConverter;

‎src/Symfony/Component/Mailer/Transport/Http/AbstractHttpTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/AbstractHttpTransport.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport\Http;
12+
namespace Symfony\Component\Mailer\Transport;
1313

1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\HttpClient\HttpClient;
1616
use Symfony\Component\Mailer\Exception\HttpTransportException;
1717
use Symfony\Component\Mailer\SentMessage;
18-
use Symfony\Component\Mailer\Transport\AbstractTransport;
1918
use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
2019
use Symfony\Contracts\HttpClient\HttpClientInterface;
2120
use Symfony\Contracts\HttpClient\ResponseInterface;

‎src/Symfony/Component/Mailer/Transport/FailoverTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/Chain/FailoverTransport.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Chain;
13+
14+
use Symfony\Component\Mailer\Transport\TransportInterface;
1315

1416
/**
1517
* Uses several Transports using a failover algorithm.

‎src/Symfony/Component/Mailer/Transport/RoundRobinTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/Chain/RoundRobinTransport.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,13 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Chain;
1313

1414
use Symfony\Component\Mailer\Exception\TransportException;
1515
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
1616
use Symfony\Component\Mailer\SentMessage;
1717
use Symfony\Component\Mailer\SmtpEnvelope;
18+
use Symfony\Component\Mailer\Transport\TransportInterface;
1819
use Symfony\Component\Mime\RawMessage;
1920

2021
/**

‎src/Symfony/Component/Mailer/Transport/NullTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/Null/NullTransport.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Null;
1313

1414
use Symfony\Component\Mailer\SentMessage;
15+
use Symfony\Component\Mailer\Transport\AbstractTransport;
1516

1617
/**
1718
* Pretends messages have been sent, but just ignores them.

‎src/Symfony/Component/Mailer/Transport/NullTransportFactory.php renamed to ‎src/Symfony/Component/Mailer/Transport/Null/NullTransportFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Null;
1313

1414
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
15+
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
16+
use Symfony\Component\Mailer\Transport\Dsn;
17+
use Symfony\Component\Mailer\Transport\TransportInterface;
1518

1619
/**
1720
* @author Konstantin Myakshin <[email protected]>

‎src/Symfony/Component/Mailer/Transport/SendmailTransport.php renamed to ‎src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransport.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Sendmail;
1313

1414
use Psr\Log\LoggerInterface;
1515
use Symfony\Component\Mailer\SentMessage;
1616
use Symfony\Component\Mailer\SmtpEnvelope;
17+
use Symfony\Component\Mailer\Transport\AbstractTransport;
1718
use Symfony\Component\Mailer\Transport\Smtp\SmtpTransport;
1819
use Symfony\Component\Mailer\Transport\Smtp\Stream\AbstractStream;
1920
use Symfony\Component\Mailer\Transport\Smtp\Stream\ProcessStream;

‎src/Symfony/Component/Mailer/Transport/SendmailTransportFactory.php renamed to ‎src/Symfony/Component/Mailer/Transport/Sendmail/SendmailTransportFactory.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99
* file that was distributed with this source code.
1010
*/
1111

12-
namespace Symfony\Component\Mailer\Transport;
12+
namespace Symfony\Component\Mailer\Transport\Sendmail;
1313

1414
use Symfony\Component\Mailer\Exception\UnsupportedSchemeException;
15+
use Symfony\Component\Mailer\Transport\AbstractTransportFactory;
16+
use Symfony\Component\Mailer\Transport\Dsn;
17+
use Symfony\Component\Mailer\Transport\TransportInterface;
1518

1619
/**
1720
* @author Konstantin Myakshin <[email protected]>

0 commit comments

Comments
 (0)