mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-08 14:16:42 +02:00
Code Issues Releases Wiki Activity

Add BC layer for the message property, refs #519

Browse Source
This commit is contained in:
Jordi Boggiano
2015-03-05 00:52:15 +00:00
parent 50b6a4d216
commit 4a794ed5f8
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Monolog/Handler/SwiftMailerHandler.php
View File

@@ -21,7 +21,7 @@ use Monolog\Logger;
class SwiftMailerHandler extends MailHandler class SwiftMailerHandler extends MailHandler
{ {
protected $mailer; protected $mailer;
protected $message; private $messageTemplate;
/** /**
* @param \Swift_Mailer $mailer The mailer to use * @param \Swift_Mailer $mailer The mailer to use
@@ -34,7 +34,7 @@ class SwiftMailerHandler extends MailHandler
parent::__construct($level, $bubble); parent::__construct($level, $bubble);
$this->mailer = $mailer; $this->mailer = $mailer;
$this->message = $message; $this->messageTemplate = $message;
} }
/** /**
@@ -55,10 +55,10 @@ class SwiftMailerHandler extends MailHandler
protected function buildMessage($content, array $records) protected function buildMessage($content, array $records)
{ {
$message = null; $message = null;
if ($this->message instanceof \Swift_Message) { if ($this->messageTemplate instanceof \Swift_Message) {
$message = clone $this->message; $message = clone $this->messageTemplate;
} else if (is_callable($this->message)) { } else if (is_callable($this->messageTemplate)) {
$message = call_user_func($this->message, $content, $records); $message = call_user_func($this->messageTemplate, $content, $records);
} }
if (!$message instanceof \Swift_Message) { if (!$message instanceof \Swift_Message) {
@@ -70,4 +70,18 @@ class SwiftMailerHandler extends MailHandler
return $message; return $message;
} }
/**
* BC getter, to be removed in 2.0
*/
public function __get($name)
{
if ($name === 'message') {
trigger_error('SwiftMailerHandler->message is deprecated, use ->buildMessage() instead to retrieve the message', E_USER_DEPRECATED);
return $this->buildMessage(null, array());
}
throw new \InvalidArgumentException('Invalid property '.$name);
}
} }