php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-17 14:57:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Method 'yii\mail\MessageInterface::body()' added.

Browse Source
This commit is contained in:
Klimov Paul
2013-11-05 15:45:27 +02:00
parent 87af95f712
commit 45d02d07a0
3 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
framework/yii/mail/BaseMessage.php
View File

@@ -61,4 +61,20 @@ abstract class BaseMessage extends Object implements MessageInterface
$this->text($this->getMailer()->render($view, $params, $this->getMailer()->textLayout));
return $this;
}
/**
* @inheritdoc
*/
public function body($view, $params = [])
{
if (is_array($view)) {
$this->renderHtml($view['html'], $params);
$this->renderText($view['text'], $params);
} else {
$html = $this->getMailer()->render($view, $params, $this->getMailer()->htmlLayout);
$this->html($html);
$this->text(strip_tags($html));
}
return $this;
}
}

11
framework/yii/mail/MessageInterface.php
View File

@@ -166,6 +166,17 @@ interface MessageInterface
*/
public function renderText($view, $params = []);
/**
* Composes the message HTML and plain text body.
* @param string|array $view varies method behavior depending on type:
* - string - the view name or the path alias of the HTML body view file, in this case
* text body will be composed from html one using [[strip_tags()]] function.
* - array - list of views for each body type in format: ['html' => 'htmlView', 'text' => 'textView']
* @param array $params the parameters (name-value pairs) that will be extracted and made available in the view file.
* @return static self reference.
*/
public function body($view, $params = []);
/**
* String output.
* This is PHP magic method that returns string representation of an object.

26
tests/unit/framework/mail/BaseMessageTest.php
View File

@@ -53,7 +53,31 @@ class BaseMessageTest extends TestCase
$viewName = 'test/html/view';
$message->renderHtml($viewName);
$expectedHtml = 'view=' . $viewName . ' layout=' . $mailer->htmlLayout;
$this->assertEquals($expectedHtml, $message->html, 'Unable to render text!');
$this->assertEquals($expectedHtml, $message->html, 'Unable to render html!');
}
/**
* @depends testRender
*/
public function testComposeBody()
{
$mailer = $this->getMailer();
$message = $mailer->compose();
$viewName = 'test/html/view';
$message->body($viewName);
$expectedHtml = 'view=' . $viewName . ' layout=' . $mailer->htmlLayout;
$this->assertEquals($expectedHtml, $message->html, 'Unable to compose html!');
$expectedText = strip_tags($expectedHtml);
$this->assertEquals($expectedText, $message->text, 'Unable to compose text from html!');
$textViewName = 'test/text/view';
$htmlViewName = 'test/html/view';
$message->body(['text' => $textViewName, 'html' => $htmlViewName]);
$expectedHtml = 'view=' . $htmlViewName . ' layout=' . $mailer->htmlLayout;
$this->assertEquals($expectedHtml, $message->html, 'Unable to compose html from separated view!');
$expectedText = 'view=' . $textViewName . ' layout=' . $mailer->textLayout;
$this->assertEquals($expectedText, $message->text, 'Unable to compose text from separated view!');
}
public function testSend()