Remove deprecated calls in Cake\Mailer

cakephp · Jan 11, 2017 · cce7909 · cce7909
1 parent 9422f62
commit cce7909
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/src/Mailer/Email.php b/src/Mailer/Email.php
@@ -2080,7 +2080,7 @@ public static function deliver($to = null, $subject = null, $message = null, $tr
         if (is_array($message)) {
             $instance->setViewVars($message);
             $message = null;
-        } elseif ($message === null && array_key_exists('message', $config = $instance->profile())) {
+        } elseif ($message === null && array_key_exists('message', $config = $instance->getProfile())) {
             $message = $config['message'];
         }
 

diff --git a/src/Mailer/Transport/MailTransport.php b/src/Mailer/Transport/MailTransport.php
@@ -45,7 +45,7 @@ public function send(Email $email)
             $headers[$key] = str_replace(["\r", "\n"], '', $header);
         }
         $headers = $this->_headersToString($headers, $eol);
-        $subject = str_replace(["\r", "\n"], '', $email->subject());
+        $subject = str_replace(["\r", "\n"], '', $email->getSubject());
         $to = str_replace(["\r", "\n"], '', $to);
 
         $message = implode($eol, $email->message());

diff --git a/src/Mailer/Transport/SmtpTransport.php b/src/Mailer/Transport/SmtpTransport.php
@@ -297,9 +297,9 @@ protected function _prepareRcptCmd($email)
      */
     protected function _prepareFromAddress($email)
     {
-        $from = $email->returnPath();
+        $from = $email->getReturnPath();
         if (empty($from)) {
-            $from = $email->from();
+            $from = $email->getFrom();
         }
 
         return $from;
@@ -313,9 +313,9 @@ protected function _prepareFromAddress($email)
      */
     protected function _prepareRecipientAddresses($email)
     {
-        $to = $email->to();
-        $cc = $email->cc();
-        $bcc = $email->bcc();
+        $to = $email->getTo();
+        $cc = $email->getCc();
+        $bcc = $email->getBcc();
 
         return array_merge(array_keys($to), array_keys($cc), array_keys($bcc));
     }

diff --git a/src/TestSuite/EmailAssertTrait.php b/src/TestSuite/EmailAssertTrait.php
@@ -53,7 +53,7 @@ public function email($new = false)
     {
         if ($new || !$this->_email) {
             $this->_email = new Email();
-            $this->_email->profile(['transport' => 'debug'] + $this->_email->profile());
+            $this->_email->getProfile(['transport' => 'debug'] + $this->_email->getProfile());
         }
 
         return $this->_email;
@@ -135,7 +135,7 @@ public function assertEmailTextMessageContains($needle, $message = null)
      */
     public function assertEmailSubject($expected, $message = null)
     {
-        $result = $this->email()->subject();
+        $result = $this->email()->getSubject();
         $this->assertSame($expected, $result, $message);
     }
 
@@ -154,7 +154,7 @@ public function assertEmailFrom($email, $name = null, $message = null)
         }
 
         $expected = [$email => $name];
-        $result = $this->email()->from();
+        $result = $this->email()->getFrom();
         $this->assertSame($expected, $result, $message);
     }
 
@@ -173,7 +173,7 @@ public function assertEmailCc($email, $name = null, $message = null)
         }
 
         $expected = [$email => $name];
-        $result = $this->email()->cc();
+        $result = $this->email()->getCc();
         $this->assertSame($expected, $result, $message);
     }
 
@@ -188,7 +188,7 @@ public function assertEmailCc($email, $name = null, $message = null)
      */
     public function assertEmailCcContains($email, $name = null, $message = null)
     {
-        $result = $this->email()->cc();
+        $result = $this->email()->getCc();
         $this->assertNotEmpty($result[$email], $message);
         if ($name !== null) {
             $this->assertEquals($result[$email], $name, $message);
@@ -210,7 +210,7 @@ public function assertEmailBcc($email, $name = null, $message = null)
         }
 
         $expected = [$email => $name];
-        $result = $this->email()->bcc();
+        $result = $this->email()->getBcc();
         $this->assertSame($expected, $result, $message);
     }
 
@@ -225,7 +225,7 @@ public function assertEmailBcc($email, $name = null, $message = null)
      */
     public function assertEmailBccContains($email, $name = null, $message = null)
     {
-        $result = $this->email()->bcc();
+        $result = $this->email()->getBcc();
         $this->assertNotEmpty($result[$email], $message);
         if ($name !== null) {
             $this->assertEquals($result[$email], $name, $message);
@@ -248,7 +248,7 @@ public function assertEmailTo($email, $name = null, $message = null)
         }
 
         $expected = [$email => $name];
-        $result = $this->email()->to();
+        $result = $this->email()->getTo();
         $this->assertSame($expected, $result, $message);
     }
 
@@ -263,7 +263,7 @@ public function assertEmailTo($email, $name = null, $message = null)
      */
     public function assertEmailToContains($email, $name = null, $message = null)
     {
-        $result = $this->email()->to();
+        $result = $this->email()->getTo();
         $this->assertNotEmpty($result[$email], $message);
         if ($name !== null) {
             $this->assertEquals($result[$email], $name, $message);
@@ -281,7 +281,7 @@ public function assertEmailToContains($email, $name = null, $message = null)
      */
     public function assertEmailAttachmentsContains($filename, array $file = null, $message = null)
     {
-        $result = $this->email()->attachments();
+        $result = $this->email()->getAttachments();
         $this->assertNotEmpty($result[$filename], $message);
         if ($file === null) {
             return;