Browse Source

Method 'MessageInterface::__toString()' added

tags/2.0.0-beta
Paul Klimov 11 years ago
parent
commit
d33519e3e5
  1. 48
      extensions/swiftmailer/yii/swiftmailer/Message.php
  2. 7
      framework/yii/mail/MessageInterface.php
  3. 5
      tests/unit/framework/mail/BaseMailerTest.php

48
extensions/swiftmailer/yii/swiftmailer/Message.php

@ -49,6 +49,14 @@ class Message extends BaseMessage
} }
/** /**
* @return string from address of this message.
*/
public function getFrom()
{
return $this->getSwiftMessage()->getFrom();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function setTo($to) public function setTo($to)
@ -57,6 +65,14 @@ class Message extends BaseMessage
} }
/** /**
* @return array To addresses of this message.
*/
public function getTo()
{
return $this->getSwiftMessage()->getTo();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function setCc($cc) public function setCc($cc)
@ -65,6 +81,14 @@ class Message extends BaseMessage
} }
/** /**
* @return array Cc address of this message.
*/
public function getCc()
{
return $this->getSwiftMessage()->getCc();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function setBcc($bcc) public function setBcc($bcc)
@ -73,6 +97,14 @@ class Message extends BaseMessage
} }
/** /**
* @return array Bcc addresses of this message.
*/
public function getBcc()
{
return $this->getSwiftMessage()->getBcc();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function setSubject($subject) public function setSubject($subject)
@ -81,6 +113,14 @@ class Message extends BaseMessage
} }
/** /**
* @return string the subject of this message.
*/
public function getSubject()
{
return $this->getSwiftMessage()->getSubject();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function setText($text) public function setText($text)
@ -123,4 +163,12 @@ class Message extends BaseMessage
$attachment = \Swift_Attachment::newInstance($content, $fileName, $contentType); $attachment = \Swift_Attachment::newInstance($content, $fileName, $contentType);
$this->getSwiftMessage()->attach($attachment); $this->getSwiftMessage()->attach($attachment);
} }
/**
* @inheritdoc
*/
public function __toString()
{
return $this->getSwiftMessage()->toString();
}
} }

7
framework/yii/mail/MessageInterface.php

@ -113,4 +113,11 @@ interface MessageInterface
* @return string string the rendering result * @return string string the rendering result
*/ */
public function render($view, $params = []); public function render($view, $params = []);
/**
* String output.
* This is PHP magic method that returns string representation of an object.
* @return string the string representation of the object
*/
public function __toString();
} }

5
tests/unit/framework/mail/BaseMailerTest.php

@ -188,4 +188,9 @@ class Message extends BaseMessage
public function addHtml($html) {} public function addHtml($html) {}
public function attachContentAsFile($content, $fileName, $contentType = 'application/octet-stream') {} public function attachContentAsFile($content, $fileName, $contentType = 'application/octet-stream') {}
public function __toString()
{
return get_class($this);
}
} }
Loading…
Cancel
Save