Browse Source

Fix getComposer() yii\BaseYii::createObject(null) BaseMailer.php #16327

3.0
cjtterabyte 6 years ago
parent
commit
1c2320fd32
No known key found for this signature in database
GPG Key ID: 7A7928651F1866A0
  1. 4
      framework/mail/BaseMailer.php

4
framework/mail/BaseMailer.php

@ -84,7 +84,7 @@ abstract class BaseMailer extends Component implements MailerInterface
* @var Composer|array|string|callable message composer. * @var Composer|array|string|callable message composer.
* @since 2.1 * @since 2.1
*/ */
private $_composer; private $_composer = [];
/** /**
@ -94,7 +94,7 @@ abstract class BaseMailer extends Component implements MailerInterface
public function getComposer() public function getComposer()
{ {
if (!is_object($this->_composer) || $this->_composer instanceof \Closure) { if (!is_object($this->_composer) || $this->_composer instanceof \Closure) {
if (!is_array($this->_composer) && !isset($this->_composer['__class'])) { if (is_array($this->_composer) && !isset($this->_composer['__class'])) {
$this->_composer['__class'] = Composer::class; $this->_composer['__class'] = Composer::class;
} }
$this->_composer = Yii::createObject($this->_composer); $this->_composer = Yii::createObject($this->_composer);

Loading…
Cancel
Save