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

BaseMailer::defaultMessageConfig published as BaseMailer::messageConfig

Browse Source
This commit is contained in:
Paul Klimov
2013-10-25 17:03:33 +03:00
parent d33519e3e5
commit 73a8e77c3d
3 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
framework/yii/mail/BaseMailer.php
View File

@@ -48,7 +48,7 @@ abstract class BaseMailer extends Component
* ) * )
* ~~~ * ~~~
*/ */
private $_defaultMessageConfig = []; public $messageConfig = [];
/** /**
* @param array|\yii\base\View $view view instance or its array configuration. * @param array|\yii\base\View $view view instance or its array configuration.
@@ -96,22 +96,6 @@ abstract class BaseMailer extends Component
return $this->_viewResolver; return $this->_viewResolver;
} }
/**
* @param array $defaultMessageConfig default message config
*/
public function setDefaultMessageConfig(array $defaultMessageConfig)
{
$this->_defaultMessageConfig = $defaultMessageConfig;
}
/**
* @return array default message config
*/
public function getDefaultMessageConfig()
{
return $this->_defaultMessageConfig;
}
/** /**
* Creates view instance from given configuration. * Creates view instance from given configuration.
* @param array $config view configuration. * @param array $config view configuration.

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

@@ -49,7 +49,7 @@ abstract class BaseMessage extends Object implements MessageInterface
*/ */
public function init() public function init()
{ {
Yii::configure($this, $this->getMailer()->getDefaultMessageConfig()); Yii::configure($this, $this->getMailer()->messageConfig);
} }
/** /**

6
tests/unit/framework/mail/BaseMailerTest.php
View File

@@ -111,15 +111,15 @@ class BaseMailerTest extends TestCase
public function testDefaultMessageConfig() public function testDefaultMessageConfig()
{ {
$defaultMessageConfig = array( $messageConfig = array(
'id' => 'test-id', 'id' => 'test-id',
'encoding' => 'test-encoding', 'encoding' => 'test-encoding',
); );
Yii::$app->getComponent('email')->setDefaultMessageConfig($defaultMessageConfig); Yii::$app->getComponent('email')->messageConfig = $messageConfig;
$message = new Message(); $message = new Message();
foreach ($defaultMessageConfig as $name => $value) { foreach ($messageConfig as $name => $value) {
$this->assertEquals($value, $message->$name); $this->assertEquals($value, $message->$name);
} }
} }