Browse Source

Method names "yii\mail\MessageInterface" simplified.

tags/2.0.0-alpha
Paul Klimov 12 years ago
parent
commit
4ac139c7a9
  1. 16
      yii/swiftmailer/Message.php

16
yii/swiftmailer/Message.php

@ -42,21 +42,13 @@ class Message extends BaseMessage
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function setCharset($charset) public function charset($charset)
{ {
$this->getSwiftMessage()->setCharset($charset); $this->getSwiftMessage()->setCharset($charset);
return $this; return $this;
} }
/** /**
* @return string the character set of this message.
*/
public function getCharset()
{
return $this->getSwiftMessage()->getCharset();
}
/**
* @inheritdoc * @inheritdoc
*/ */
public function from($from) public function from($from)
@ -167,7 +159,7 @@ class Message extends BaseMessage
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function attachFile($fileName, array $options = []) public function attach($fileName, array $options = [])
{ {
$attachment = \Swift_Attachment::fromPath($fileName); $attachment = \Swift_Attachment::fromPath($fileName);
if (!empty($options['fileName'])) { if (!empty($options['fileName'])) {
@ -199,7 +191,7 @@ class Message extends BaseMessage
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function embedFile($fileName, array $options = []) public function embed($fileName, array $options = [])
{ {
$embedFile = \Swift_EmbeddedFile::fromPath($fileName); $embedFile = \Swift_EmbeddedFile::fromPath($fileName);
if (!empty($options['fileName'])) { if (!empty($options['fileName'])) {
@ -229,7 +221,7 @@ class Message extends BaseMessage
/** /**
* @inheritdoc * @inheritdoc
*/ */
public function __toString() public function toString()
{ {
return $this->getSwiftMessage()->toString(); return $this->getSwiftMessage()->toString();
} }

Loading…
Cancel
Save