Update usage of deprecated methods.

cakephp · Aug 21, 2018 · 95f37b2 · 95f37b2
1 parent 8a038cf
commit 95f37b2
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 16 deletions.
diff --git a/src/TestSuite/TestEmailTransport.php b/src/TestSuite/TestEmailTransport.php
@@ -16,6 +16,7 @@
 
 use Cake\Mailer\AbstractTransport;
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 
 /**
  * TestEmailTransport
@@ -48,13 +49,13 @@ public function send(Email $email)
      */
     public static function replaceAllTransports()
     {
-        $configuredTransports = Email::configuredTransport();
+        $configuredTransports = TransportFactory::configured();
 
         foreach ($configuredTransports as $configuredTransport) {
-            $config = Email::getConfigTransport($configuredTransport);
+            $config = TransportFactory::getConfig($configuredTransport);
             $config['className'] = self::class;
-            Email::dropTransport($configuredTransport);
-            Email::setConfigTransport($configuredTransport, $config);
+            TransportFactory::drop($configuredTransport);
+            TransportFactory::setConfig($configuredTransport, $config);
         }
     }
 

diff --git a/tests/TestCase/TestSuite/EmailAssertTraitTest.php b/tests/TestCase/TestSuite/EmailAssertTraitTest.php
@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 use Cake\Mailer\Transport\DebugTransport;
 use Cake\TestSuite\EmailAssertTrait;
 use Cake\TestSuite\TestCase;
@@ -28,13 +29,13 @@ class EmailAssertTraitTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        Email::setConfigTransport('debug', ['className' => DebugTransport::class]);
+        TransportFactory::setConfig('debug', ['className' => DebugTransport::class]);
     }
 
     public function tearDown()
     {
         parent::tearDown();
-        Email::dropTransport('debug');
+        TransportFactory::drop('debug');
     }
 
     public function testFunctional()

diff --git a/tests/TestCase/TestSuite/EmailTraitTest.php b/tests/TestCase/TestSuite/EmailTraitTest.php
@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 use Cake\TestSuite\EmailTrait;
 use Cake\TestSuite\TestCase;
 use Cake\TestSuite\TestEmailTransport;
@@ -47,7 +48,7 @@ public function setUp()
             'transport' => 'test_tools',
             'from' => 'alternate@example.com',
         ]);
-        Email::setConfigTransport('test_tools', [
+        TransportFactory::setConfig('test_tools', [
             'className' => TestEmailTransport::class
         ]);
 
@@ -65,7 +66,7 @@ public function tearDown()
 
         Email::drop('default');
         Email::drop('alternate');
-        Email::dropTransport('test_tools');
+        TransportFactory::drop('test_tools');
 
         TestEmailTransport::clearEmails();
     }

diff --git a/tests/TestCase/TestSuite/TestEmailTransportTest.php b/tests/TestCase/TestSuite/TestEmailTransportTest.php
@@ -15,6 +15,7 @@
 namespace Cake\Test\TestCase\TestSuite;
 
 use Cake\Mailer\Email;
+use Cake\Mailer\TransportFactory;
 use Cake\Network\Email\DebugTransport;
 use Cake\TestSuite\TestCase;
 use Cake\TestSuite\TestEmailTransport;
@@ -32,13 +33,13 @@ public function setUp()
 
         Email::drop('default');
         Email::drop('alternate');
-        Email::dropTransport('transport_default');
-        Email::dropTransport('transport_alternate');
+        TransportFactory::drop('transport_default');
+        TransportFactory::drop('transport_alternate');
 
-        Email::setConfigTransport('transport_default', [
+        TransportFactory::setConfig('transport_default', [
             'className' => DebugTransport::class
         ]);
-        Email::setConfigTransport('transport_alternate', [
+        TransportFactory::setConfig('transport_alternate', [
             'className' => DebugTransport::class
         ]);
 
@@ -63,8 +64,8 @@ public function tearDown()
 
         Email::drop('default');
         Email::drop('alternate');
-        Email::dropTransport('transport_default');
-        Email::dropTransport('transport_alternate');
+        TransportFactory::drop('transport_default');
+        TransportFactory::drop('transport_alternate');
     }
 
     /**
@@ -76,10 +77,10 @@ public function testReplaceAllTransports()
     {
         TestEmailTransport::replaceAllTransports();
 
-        $config = Email::getConfigTransport('transport_default');
+        $config = TransportFactory::getConfig('transport_default');
         $this->assertSame(TestEmailTransport::class, $config['className']);
 
-        $config = Email::getConfigTransport('transport_alternate');
+        $config = TransportFactory::getConfig('transport_alternate');
         $this->assertSame(TestEmailTransport::class, $config['className']);
     }