Move `Cake\Network\Email` to `Cake\Mailer`

Also moved all transports into `Cake\Mailer\Transport`.

config/bootstrap.php

@@ -19,6 +19,11 @@ define('TIME_START', microtime(true));
 
 // @deprecated Backward compatibility with 2.x series
 if (PHP_VERSION_ID < 70000) {
+    class_alias('Cake\Mailer\AbstractTransport', 'Cake\Network\Email\AbstractTransport');
+    class_alias('Cake\Mailer\Transport\DebugTransport', 'Cake\Network\Email\DebugTransport');
+    class_alias('Cake\Mailer\Email', 'Cake\Network\Email\Email');
+    class_alias('Cake\Mailer\Transport\MailTransport', 'Cake\Network\Email\MailTransport');
+    class_alias('Cake\Mailer\Transport\SmtpTransport', 'Cake\Network\Email\SmtpTransport');
     class_alias('Cake\Utility\Text', 'Cake\Utility\String');
 }
 

src/Network/Email/AbstractTransport.php

@@ -12,7 +12,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Network\Email;
+namespace Cake\Mailer;
 
 use Cake\Core\InstanceConfigTrait;
 
@@ -35,7 +35,7 @@ abstract class AbstractTransport
     /**
      * Send mail
      *
-     * @param \Cake\Network\Email\Email $email Email instance.
+     * @param \Cake\Mailer\Email $email Email instance.
      * @return array
      */
     abstract public function send(Email $email);

src/Network/Email/Email.php

@@ -12,7 +12,7 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Network\Email;
+namespace Cake\Mailer;
 
 use BadMethodCallException;
 use Cake\Core\App;
@@ -262,7 +262,7 @@ class Email implements JsonSerializable, Serializable
     /**
      * The transport instance to use for sending mail.
      *
-     * @var \Cake\Network\Email\AbstractTransport
+     * @var \Cake\Mailer\Transport\AbstractTransport
      */
     protected $_transport = null;
 
@@ -310,9 +310,9 @@ class Email implements JsonSerializable, Serializable
      * @var array
      */
     protected static $_dsnClassMap = [
-        'debug' => 'Cake\Network\Email\DebugTransport',
-        'mail' => 'Cake\Network\Email\MailTransport',
-        'smtp' => 'Cake\Network\Email\SmtpTransport',
+        'debug' => 'Cake\Mailer\Transport\DebugTransport',
+        'mail' => 'Cake\Mailer\Transport\MailTransport',
+        'smtp' => 'Cake\Mailer\Transport\SmtpTransport',
     ];
 
     /**
@@ -977,7 +977,7 @@ class Email implements JsonSerializable, Serializable
      *
      * @param string|AbstractTransport|null $name Either the name of a configured
      *   transport, or a transport instance.
-     * @return \Cake\Network\Email\AbstractTransport|$this
+     * @return \Cake\Mailer\Transport\AbstractTransport|$this
      * @throws \LogicException When the chosen transport lacks a send method.
      * @throws \InvalidArgumentException When $name is neither a string nor an object.
      */
@@ -1008,7 +1008,7 @@ class Email implements JsonSerializable, Serializable
      * Build a transport instance from configuration data.
      *
      * @param string $name The transport configuration name to build.
-     * @return \Cake\Network\Email\AbstractTransport
+     * @return \Cake\Mailer\AbstractTransport
      * @throws \InvalidArgumentException When transport configuration is missing or invalid.
      */
     protected function _constructTransport($name)
@@ -1023,7 +1023,7 @@ class Email implements JsonSerializable, Serializable
             return $config['className'];
         }
 
-        $className = App::className($config['className'], 'Network/Email', 'Transport');
+        $className = App::className($config['className'], 'Mailer/Transport', 'Transport');
         if (!$className) {
             throw new InvalidArgumentException(sprintf('Transport class "%s" not found.', $name));
         } elseif (!method_exists($className, 'send')) {
@@ -1164,7 +1164,7 @@ class Email implements JsonSerializable, Serializable
      * @param string|array $attachments String with the filename or array with filenames
      * @return $this
      * @throws \InvalidArgumentException
-     * @see \Cake\Network\Email\Email::attachments()
+     * @see \Cake\Mailer\Email::attachments()
      */
     public function addAttachments($attachments)
     {
@@ -1332,14 +1332,14 @@ class Email implements JsonSerializable, Serializable
     }
 
     /**
-     * Static method to fast create an instance of \Cake\Network\Email\Email
+     * Static method to fast create an instance of \Cake\Mailer\Email
      *
-     * @param string|array $to Address to send (see Cake\Network\Email\Email::to()). If null, will try to use 'to' from transport config
+     * @param string|array $to Address to send (see Cake\Mailer\Email::to()). If null, will try to use 'to' from transport config
      * @param string $subject String of subject or null to use 'subject' from transport config
      * @param string|array $message String with message or array with variables to be used in render
      * @param string|array $transportConfig String to use config from EmailConfig or array with configs
      * @param bool $send Send the email or just return the instance pre-configured
-     * @return \Cake\Network\Email\Email Instance of Cake\Network\Email\Email
+     * @return \Cake\Mailer\Email Instance of Cake\Mailer\Email
      * @throws \InvalidArgumentException
      */
     public static function deliver($to = null, $subject = null, $message = null, $transportConfig = 'fast', $send = true)
@@ -1965,7 +1965,7 @@ class Email implements JsonSerializable, Serializable
      * Configures an email instance object from serialized config.
      *
      * @param array $config Email configuration array.
-     * @return \Cake\Network\Email\Email Configured email instance.
+     * @return \Cake\Mailer\Email Configured email instance.
      */
     public function createFromArray($config)
     {
@@ -1996,7 +1996,7 @@ class Email implements JsonSerializable, Serializable
      * Unserializes the Email object.
      *
      * @param string $data Serialized string.
-     * @return \Cake\Network\Email\Email Configured email instance.
+     * @return \Cake\Mailer\Email Configured email instance.
      */
     public function unserialize($data)
     {

src/Network/Email/DebugTransport.php

@@ -14,7 +14,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Network\Email;
+namespace Cake\Mailer\Transport;
+
+use Cake\Mailer\AbstractTransport;
+use Cake\Mailer\Email;
 
 /**
  * Debug Transport class, useful for emulate the email sending process and inspect the resulted
@@ -27,7 +30,7 @@ class DebugTransport extends AbstractTransport
     /**
      * Send mail
      *
-     * @param \Cake\Network\Email\Email $email Cake Email
+     * @param \Cake\Mailer\Email $email Cake Email
      * @return array
      */
     public function send(Email $email)

src/Network/Email/MailTransport.php

@@ -14,8 +14,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Network\Email;
+namespace Cake\Mailer\Transport;
 
+use Cake\Mailer\AbstractTransport;
+use Cake\Mailer\Email;
 use Cake\Network\Exception\SocketException;
 
 /**
@@ -28,7 +30,7 @@ class MailTransport extends AbstractTransport
     /**
      * Send mail
      *
-     * @param \Cake\Network\Email\Email $email Cake Email
+     * @param \Cake\Mailer\Email $email Cake Email
      * @return array
      */
     public function send(Email $email)

src/Network/Email/SmtpTransport.php

@@ -12,8 +12,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Network\Email;
+namespace Cake\Mailer\Transport;
 
+use Cake\Mailer\AbstractTransport;
+use Cake\Mailer\Email;
 use Cake\Network\Exception\SocketException;
 use Cake\Network\Socket;
 
@@ -149,7 +151,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Send mail
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return array
      * @throws \Cake\Network\Exception\SocketException
      */
@@ -289,7 +291,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Prepares the `from` email address.
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return array
      */
     protected function _prepareFromAddress($email)
@@ -304,7 +306,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Prepares the recipient email addresses.
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return array
      */
     protected function _prepareRecipientAddresses($email)
@@ -318,7 +320,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Prepares the message headers.
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return array
      */
     protected function _prepareMessageHeaders($email)
@@ -329,7 +331,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Prepares the message body.
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return string
      */
     protected function _prepareMessage($email)
@@ -350,7 +352,7 @@ class SmtpTransport extends AbstractTransport
      * Send emails
      *
      * @return void
-     * @param \Cake\Network\Email\Email $email Cake Email
+     * @param \Cake\Mailer\Email $email Cake Email
      * @throws \Cake\Network\Exception\SocketException
      */
     protected function _sendRcpt($email)
@@ -367,7 +369,7 @@ class SmtpTransport extends AbstractTransport
     /**
      * Send Data
      *
-     * @param \Cake\Network\Email\Email $email Email instance
+     * @param \Cake\Mailer\Email $email Email instance
      * @return void
      * @throws \Cake\Network\Exception\SocketException
      */

tests/TestCase/Core/StaticConfigTraitTest.php

@@ -101,9 +101,9 @@ class TestEmailStaticConfig
      * @var array
      */
     protected static $_dsnClassMap = [
-        'debug' => 'Cake\Network\Email\DebugTransport',
-        'mail' => 'Cake\Network\Email\MailTransport',
-        'smtp' => 'Cake\Network\Email\SmtpTransport',
+        'debug' => 'Cake\Mailer\Transport\DebugTransport',
+        'mail' => 'Cake\Mailer\Transport\MailTransport',
+        'smtp' => 'Cake\Mailer\Transport\SmtpTransport',
     ];
 }
 
@@ -353,7 +353,7 @@ class StaticConfigTraitTest extends TestCase
 
         $dsn = 'mail:///?timeout=30&key=true&key2=false&client=null&tls=null';
         $expected = [
-            'className' => 'Cake\Network\Email\MailTransport',
+            'className' => 'Cake\Mailer\Transport\MailTransport',
             'client' => null,
             'key' => true,
             'key2' => false,
@@ -366,7 +366,7 @@ class StaticConfigTraitTest extends TestCase
 
         $dsn = 'mail://true:false@null/1?timeout=30&key=true&key2=false&client=null&tls=null';
         $expected = [
-            'className' => 'Cake\Network\Email\MailTransport',
+            'className' => 'Cake\Mailer\Transport\MailTransport',
             'client' => null,
             'host' => 'null',
             'key' => true,
@@ -382,7 +382,7 @@ class StaticConfigTraitTest extends TestCase
 
         $dsn = 'mail://user:secret@localhost:25?timeout=30&client=null&tls=null';
         $expected = [
-            'className' => 'Cake\Network\Email\MailTransport',
+            'className' => 'Cake\Mailer\Transport\MailTransport',
             'client' => null,
             'host' => 'localhost',
             'password' => 'secret',

tests/TestCase/Network/Email/EmailTest.php

@@ -12,13 +12,13 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Network\Email;
+namespace Cake\Test\TestCase\Mailer;
 
 use Cake\Core\Configure;
 use Cake\Core\Plugin;
 use Cake\Log\Log;
-use Cake\Network\Email\DebugTransport;
-use Cake\Network\Email\Email;
+use Cake\Mailer\Email;
+use Cake\Mailer\Transport\DebugTransport;
 use Cake\ORM\TableRegistry;
 use Cake\TestSuite\TestCase;
 use Exception;
@@ -660,7 +660,7 @@ class EmailTest extends TestCase
         $this->assertSame($expected, $this->CakeEmail->getHeaders(['from' => true, 'to' => true]));
 
         $result = $this->CakeEmail->setHeaders([]);
-        $this->assertInstanceOf('Cake\Network\Email\Email', $result);
+        $this->assertInstanceOf('Cake\Mailer\Email', $result);
     }
 
     /**
@@ -771,9 +771,9 @@ class EmailTest extends TestCase
         $this->assertSame($this->CakeEmail, $result);
 
         $result = $this->CakeEmail->transport();
-        $this->assertInstanceOf('Cake\Network\Email\DebugTransport', $result);
+        $this->assertInstanceOf('Cake\Mailer\Transport\DebugTransport', $result);
 
-        $instance = $this->getMock('Cake\Network\Email\DebugTransport');
+        $instance = $this->getMock('Cake\Mailer\Transport\DebugTransport');
         $this->CakeEmail->transport($instance);
         $this->assertSame($instance, $this->CakeEmail->transport());
     }
@@ -988,7 +988,7 @@ class EmailTest extends TestCase
         $this->assertEquals($config['theme'], $result);
 
         $result = $this->CakeEmail->transport();
-        $this->assertInstanceOf('Cake\Network\Email\DebugTransport', $result);
+        $this->assertInstanceOf('Cake\Mailer\Transport\DebugTransport', $result);
 
         $result = $this->CakeEmail->helpers();
         $this->assertEquals($config['helpers'], $result);
@@ -1646,7 +1646,7 @@ class EmailTest extends TestCase
         $this->CakeEmail->viewVars(['time' => $timestamp]);
 
         $result = $this->CakeEmail->helpers(['Time']);
-        $this->assertInstanceOf('Cake\Network\Email\Email', $result);
+        $this->assertInstanceOf('Cake\Mailer\Email', $result);
 
         $result = $this->CakeEmail->send();
         $dateTime = new \DateTime;
@@ -1823,7 +1823,7 @@ class EmailTest extends TestCase
     public function testDeliver()
     {
         $instance = Email::deliver('all@cakephp.org', 'About', 'Everything ok', ['from' => 'root@cakephp.org'], false);
-        $this->assertInstanceOf('Cake\Network\Email\Email', $instance);
+        $this->assertInstanceOf('Cake\Mailer\Email', $instance);
         $this->assertSame($instance->to(), ['all@cakephp.org' => 'all@cakephp.org']);
         $this->assertSame($instance->subject(), 'About');
         $this->assertSame($instance->from(), ['root@cakephp.org' => 'root@cakephp.org']);
@@ -2032,7 +2032,7 @@ class EmailTest extends TestCase
         $this->assertEquals($configs['subject'], $result);
 
         $result = $this->CakeEmail->transport();
-        $this->assertInstanceOf('Cake\Network\Email\DebugTransport', $result);
+        $this->assertInstanceOf('Cake\Mailer\Transport\DebugTransport', $result);
 
         $result = $this->CakeEmail->send('This is the message');
 
@@ -2088,7 +2088,7 @@ class EmailTest extends TestCase
         $this->assertEquals($configs['subject'], $result);
 
         $result = $this->CakeEmail->transport();
-        $this->assertInstanceOf('Cake\Network\Email\DebugTransport', $result);
+        $this->assertInstanceOf('Cake\Mailer\Transport\DebugTransport', $result);
 
         $result = $this->CakeEmail->send('This is the message');
 
@@ -2107,7 +2107,7 @@ class EmailTest extends TestCase
         $this->assertEquals('Cake\View\View', $result);
 
         $result = $this->CakeEmail->viewRender('Cake\View\ThemeView');
-        $this->assertInstanceOf('Cake\Network\Email\Email', $result);
+        $this->assertInstanceOf('Cake\Mailer\Email', $result);
 
         $result = $this->CakeEmail->viewRender();
         $this->assertEquals('Cake\View\ThemeView', $result);
@@ -2124,7 +2124,7 @@ class EmailTest extends TestCase
         $this->assertEquals('text', $result);
 
         $result = $this->CakeEmail->emailFormat('html');
-        $this->assertInstanceOf('Cake\Network\Email\Email', $result);
+        $this->assertInstanceOf('Cake\Mailer\Email', $result);
 
         $result = $this->CakeEmail->emailFormat();
         $this->assertEquals('html', $result);
@@ -2563,7 +2563,7 @@ HTML;
      */
     public function testMockTransport()
     {
-        $mock = $this->getMock('\Cake\Network\Email\AbstractTransport');
+        $mock = $this->getMock('\Cake\Mailer\AbstractTransport');
         $config = ['from' => 'tester@example.org', 'transport' => 'default'];
 
         Email::config('default', $config);

tests/TestCase/Network/Email/DebugTransportTest.php

@@ -14,10 +14,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Network\Email;
+namespace Cake\Test\TestCase\Mailer\Transport;
 
-use Cake\Network\Email\DebugTransport;
-use Cake\Network\Email\Email;
+use Cake\Mailer\Email;
+use Cake\Mailer\Transport\DebugTransport;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -45,7 +45,7 @@ class DebugTransportTest extends TestCase
      */
     public function testSend()
     {
-        $email = $this->getMock('Cake\Network\Email\Email', ['message']);
+        $email = $this->getMock('Cake\Mailer\Email', ['message']);
         $email->from('noreply@cakephp.org', 'CakePHP Test');
         $email->to('cake@cakephp.org', 'CakePHP');
         $email->cc(['mark@cakephp.org' => 'Mark Story', 'juan@cakephp.org' => 'Juan Basso']);

tests/TestCase/Network/Email/MailTransportTest.php

@@ -14,10 +14,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Network\Email;
+namespace Cake\Test\TestCase\Mailer\Transport;
 
-use Cake\Network\Email\Email;
-use Cake\Network\Email\MailTransport;
+use Cake\Mailer\Email;
+use Cake\Mailer\Transport\MailTransport;
 use Cake\TestSuite\TestCase;
 
 /**
@@ -35,7 +35,7 @@ class MailTransportTest extends TestCase
     public function setUp()
     {
         parent::setUp();
-        $this->MailTransport = $this->getMock('Cake\Network\Email\MailTransport', ['_mail']);
+        $this->MailTransport = $this->getMock('Cake\Mailer\Transport\MailTransport', ['_mail']);
         $this->MailTransport->config(['additionalParameters' => '-f']);
     }
 
@@ -46,7 +46,7 @@ class MailTransportTest extends TestCase
      */
     public function testSendData()
     {
-        $email = $this->getMock('Cake\Network\Email\Email', ['message'], []);
+        $email = $this->getMock('Cake\Mailer\Email', ['message'], []);
         $email->from('noreply@cakephp.org', 'CakePHP Test');
         $email->returnPath('pleasereply@cakephp.org', 'CakePHP Return');
         $email->to('cake@cakephp.org', 'CakePHP');

tests/TestCase/Network/Email/SmtpTransportTest.php

@@ -12,10 +12,10 @@
  * @since         2.0.0
  * @license       http://www.opensource.org/licenses/mit-license.php MIT License
  */
-namespace Cake\Test\TestCase\Network\Email;
+namespace Cake\Test\TestCase\Mailer\Transport;
 
-use Cake\Network\Email\Email;
-use Cake\Network\Email\SmtpTransport;
+use Cake\Mailer\Email;
+use Cake\Mailer\Transport\SmtpTransport;
 use Cake\Network\Socket;
 use Cake\TestSuite\TestCase;
 
@@ -379,7 +379,7 @@ class SmtpTransportTest extends TestCase
      */
     public function testSendData()
     {
-        $email = $this->getMock('Cake\Network\Email\Email', ['message']);
+        $email = $this->getMock('Cake\Mailer\Email', ['message']);
         $email->from('noreply@cakephp.org', 'CakePHP Test');
         $email->returnPath('pleasereply@cakephp.org', 'CakePHP Return');
         $email->to('cake@cakephp.org', 'CakePHP');
@@ -618,7 +618,7 @@ class SmtpTransportTest extends TestCase
     {
         $this->SmtpTransport->config(['keepAlive' => true]);
 
-        $email = $this->getMock('Cake\Network\Email\Email', ['message']);
+        $email = $this->getMock('Cake\Mailer\Email', ['message']);
         $email->from('noreply@cakephp.org', 'CakePHP Test');
         $email->to('cake@cakephp.org', 'CakePHP');
         $email->expects($this->exactly(2))->method('message')->will($this->returnValue(['First Line']));
@@ -680,7 +680,7 @@ class SmtpTransportTest extends TestCase
      */
     public function testSendDefaults()
     {
-        $email = $this->getMock('Cake\Network\Email\Email', ['message']);
+        $email = $this->getMock('Cake\Mailer\Email', ['message']);
         $email->from('noreply@cakephp.org', 'CakePHP Test');
         $email->to('cake@cakephp.org', 'CakePHP');
         $email->expects($this->once())->method('message')->will($this->returnValue(['First Line']));