From 73a8e77c3d1dde759d01f95073c0124554fb1f58 Mon Sep 17 00:00:00 2001
From: Paul Klimov <klimov.paul@gmail.com>
Date: Fri, 25 Oct 2013 17:03:33 +0300
Subject: [PATCH] BaseMailer::defaultMessageConfig published as
 BaseMailer::messageConfig

---
 framework/yii/mail/BaseMailer.php            | 18 +-----------------
 framework/yii/mail/BaseMessage.php           |  2 +-
 tests/unit/framework/mail/BaseMailerTest.php |  6 +++---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/framework/yii/mail/BaseMailer.php b/framework/yii/mail/BaseMailer.php
index 8e88749b6d..a78b6fce8a 100644
--- a/framework/yii/mail/BaseMailer.php
+++ b/framework/yii/mail/BaseMailer.php
@@ -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.
@@ -96,22 +96,6 @@ abstract class BaseMailer extends Component
 		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.
 	 * @param array $config view configuration.
diff --git a/framework/yii/mail/BaseMessage.php b/framework/yii/mail/BaseMessage.php
index 5593cec3cc..f48310c39f 100644
--- a/framework/yii/mail/BaseMessage.php
+++ b/framework/yii/mail/BaseMessage.php
@@ -49,7 +49,7 @@ abstract class BaseMessage extends Object implements MessageInterface
 	 */
 	public function init()
 	{
-		Yii::configure($this, $this->getMailer()->getDefaultMessageConfig());
+		Yii::configure($this, $this->getMailer()->messageConfig);
 	}
 
 	/**
diff --git a/tests/unit/framework/mail/BaseMailerTest.php b/tests/unit/framework/mail/BaseMailerTest.php
index e80ca0c0ba..84bb293653 100644
--- a/tests/unit/framework/mail/BaseMailerTest.php
+++ b/tests/unit/framework/mail/BaseMailerTest.php
@@ -111,15 +111,15 @@ class BaseMailerTest extends TestCase
 
 	public function testDefaultMessageConfig()
 	{
-		$defaultMessageConfig = array(
+		$messageConfig = array(
 			'id' => 'test-id',
 			'encoding' => 'test-encoding',
 		);
-		Yii::$app->getComponent('email')->setDefaultMessageConfig($defaultMessageConfig);
+		Yii::$app->getComponent('email')->messageConfig = $messageConfig;
 
 		$message = new Message();
 
-		foreach ($defaultMessageConfig as $name => $value) {
+		foreach ($messageConfig as $name => $value) {
 			$this->assertEquals($value, $message->$name);
 		}
 	}