Skip to content

Commit 95f37b2

Browse files
committed
Update usage of deprecated methods.
1 parent 8a038cf commit 95f37b2

File tree

4 files changed

+20
-16
lines changed

4 files changed

+20
-16
lines changed

src/TestSuite/TestEmailTransport.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
use Cake\Mailer\AbstractTransport;
1818
use Cake\Mailer\Email;
19+
use Cake\Mailer\TransportFactory;
1920

2021
/**
2122
* TestEmailTransport
@@ -48,13 +49,13 @@ public function send(Email $email)
4849
*/
4950
public static function replaceAllTransports()
5051
{
51-
$configuredTransports = Email::configuredTransport();
52+
$configuredTransports = TransportFactory::configured();
5253

5354
foreach ($configuredTransports as $configuredTransport) {
54-
$config = Email::getConfigTransport($configuredTransport);
55+
$config = TransportFactory::getConfig($configuredTransport);
5556
$config['className'] = self::class;
56-
Email::dropTransport($configuredTransport);
57-
Email::setConfigTransport($configuredTransport, $config);
57+
TransportFactory::drop($configuredTransport);
58+
TransportFactory::setConfig($configuredTransport, $config);
5859
}
5960
}
6061

tests/TestCase/TestSuite/EmailAssertTraitTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
namespace Cake\Test\TestCase\TestSuite;
1616

1717
use Cake\Mailer\Email;
18+
use Cake\Mailer\TransportFactory;
1819
use Cake\Mailer\Transport\DebugTransport;
1920
use Cake\TestSuite\EmailAssertTrait;
2021
use Cake\TestSuite\TestCase;
@@ -28,13 +29,13 @@ class EmailAssertTraitTest extends TestCase
2829
public function setUp()
2930
{
3031
parent::setUp();
31-
Email::setConfigTransport('debug', ['className' => DebugTransport::class]);
32+
TransportFactory::setConfig('debug', ['className' => DebugTransport::class]);
3233
}
3334

3435
public function tearDown()
3536
{
3637
parent::tearDown();
37-
Email::dropTransport('debug');
38+
TransportFactory::drop('debug');
3839
}
3940

4041
public function testFunctional()

tests/TestCase/TestSuite/EmailTraitTest.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
namespace Cake\Test\TestCase\TestSuite;
1616

1717
use Cake\Mailer\Email;
18+
use Cake\Mailer\TransportFactory;
1819
use Cake\TestSuite\EmailTrait;
1920
use Cake\TestSuite\TestCase;
2021
use Cake\TestSuite\TestEmailTransport;
@@ -47,7 +48,7 @@ public function setUp()
4748
'transport' => 'test_tools',
4849
'from' => 'alternate@example.com',
4950
]);
50-
Email::setConfigTransport('test_tools', [
51+
TransportFactory::setConfig('test_tools', [
5152
'className' => TestEmailTransport::class
5253
]);
5354

@@ -65,7 +66,7 @@ public function tearDown()
6566

6667
Email::drop('default');
6768
Email::drop('alternate');
68-
Email::dropTransport('test_tools');
69+
TransportFactory::drop('test_tools');
6970

7071
TestEmailTransport::clearEmails();
7172
}

tests/TestCase/TestSuite/TestEmailTransportTest.php

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
namespace Cake\Test\TestCase\TestSuite;
1616

1717
use Cake\Mailer\Email;
18+
use Cake\Mailer\TransportFactory;
1819
use Cake\Network\Email\DebugTransport;
1920
use Cake\TestSuite\TestCase;
2021
use Cake\TestSuite\TestEmailTransport;
@@ -32,13 +33,13 @@ public function setUp()
3233

3334
Email::drop('default');
3435
Email::drop('alternate');
35-
Email::dropTransport('transport_default');
36-
Email::dropTransport('transport_alternate');
36+
TransportFactory::drop('transport_default');
37+
TransportFactory::drop('transport_alternate');
3738

38-
Email::setConfigTransport('transport_default', [
39+
TransportFactory::setConfig('transport_default', [
3940
'className' => DebugTransport::class
4041
]);
41-
Email::setConfigTransport('transport_alternate', [
42+
TransportFactory::setConfig('transport_alternate', [
4243
'className' => DebugTransport::class
4344
]);
4445

@@ -63,8 +64,8 @@ public function tearDown()
6364

6465
Email::drop('default');
6566
Email::drop('alternate');
66-
Email::dropTransport('transport_default');
67-
Email::dropTransport('transport_alternate');
67+
TransportFactory::drop('transport_default');
68+
TransportFactory::drop('transport_alternate');
6869
}
6970

7071
/**
@@ -76,10 +77,10 @@ public function testReplaceAllTransports()
7677
{
7778
TestEmailTransport::replaceAllTransports();
7879

79-
$config = Email::getConfigTransport('transport_default');
80+
$config = TransportFactory::getConfig('transport_default');
8081
$this->assertSame(TestEmailTransport::class, $config['className']);
8182

82-
$config = Email::getConfigTransport('transport_alternate');
83+
$config = TransportFactory::getConfig('transport_alternate');
8384
$this->assertSame(TestEmailTransport::class, $config['className']);
8485
}
8586

0 commit comments

Comments
 (0)