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

Fix SwiftMailerHandler support for Swiftmailer 6.0+

Browse Source
This commit is contained in:
Alex Rock Ancelet
2017-05-31 21:40:53 +02:00
committed by Jordi Boggiano
parent 6fdf686a02
commit d84af8db3c
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -24,7 +24,7 @@
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"aws/aws-sdk-php": "^2.4.9 || ^3.0", "aws/aws-sdk-php": "^2.4.9 || ^3.0",
"php-amqplib/php-amqplib": "~2.4", "php-amqplib/php-amqplib": "~2.4",
"swiftmailer/swiftmailer": "~5.3", "swiftmailer/swiftmailer": "^5.3|^6.0",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",
"phpunit/phpunit-mock-objects": "2.3.0", "phpunit/phpunit-mock-objects": "2.3.0",
"jakub-onderka/php-parallel-lint": "0.9" "jakub-onderka/php-parallel-lint": "0.9"

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

@@ -13,6 +13,7 @@ namespace Monolog\Handler;
use Monolog\Logger; use Monolog\Logger;
use Monolog\Formatter\LineFormatter; use Monolog\Formatter\LineFormatter;
use Swift;
/** /**
* SwiftMailerHandler uses Swift_Mailer to send the emails * SwiftMailerHandler uses Swift_Mailer to send the emails
@@ -73,7 +74,11 @@ class SwiftMailerHandler extends MailHandler
} }
$message->setBody($content); $message->setBody($content);
$message->setDate(time()); if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
$message->setDate(new \DateTimeImmutable());
} else {
$message->setDate(time());
}
return $message; return $message;
} }

2
tests/Monolog/Handler/SwiftMailerHandlerTest.php
View File

@@ -98,7 +98,7 @@ class SwiftMailerHandlerTest extends TestCase
public function testMessageHaveUniqueId() public function testMessageHaveUniqueId()
{ {
$messageTemplate = \Swift_Message::newInstance(); $messageTemplate = new \Swift_Message();
$handler = new SwiftMailerHandler($this->mailer, $messageTemplate); $handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
$method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage'); $method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');