diff options
| author | Alex Rock Ancelet <pierstoval@gmail.com> | 2017-05-31 21:40:53 +0200 |
|---|---|---|
| committer | Jordi Boggiano <j.boggiano@seld.be> | 2017-06-19 01:59:54 +0200 |
| commit | d84af8db3ca6d4432d95b1abb9f0542f1a17f4cb (patch) | |
| tree | 8301055022398ec7443072abb10a75784e28e151 | |
| parent | 6fdf686a023c28e1ccf554224feebc8b56b24ca2 (diff) | |
| download | monolog-d84af8db3ca6d4432d95b1abb9f0542f1a17f4cb.zip monolog-d84af8db3ca6d4432d95b1abb9f0542f1a17f4cb.tar.gz monolog-d84af8db3ca6d4432d95b1abb9f0542f1a17f4cb.tar.bz2 | |
Fix SwiftMailerHandler support for Swiftmailer 6.0+
| -rw-r--r-- | composer.json | 2 | ||||
| -rw-r--r-- | src/Monolog/Handler/SwiftMailerHandler.php | 7 | ||||
| -rw-r--r-- | tests/Monolog/Handler/SwiftMailerHandlerTest.php | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/composer.json b/composer.json index f74b7b9..3b0c880 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "doctrine/couchdb": "~1.0@dev", "aws/aws-sdk-php": "^2.4.9 || ^3.0", "php-amqplib/php-amqplib": "~2.4", - "swiftmailer/swiftmailer": "~5.3", + "swiftmailer/swiftmailer": "^5.3|^6.0", "php-console/php-console": "^3.1.3", "phpunit/phpunit-mock-objects": "2.3.0", "jakub-onderka/php-parallel-lint": "0.9" diff --git a/src/Monolog/Handler/SwiftMailerHandler.php b/src/Monolog/Handler/SwiftMailerHandler.php index aba1396..72f44a5 100644 --- a/src/Monolog/Handler/SwiftMailerHandler.php +++ b/src/Monolog/Handler/SwiftMailerHandler.php @@ -13,6 +13,7 @@ namespace Monolog\Handler; use Monolog\Logger; use Monolog\Formatter\LineFormatter; +use Swift; /** * SwiftMailerHandler uses Swift_Mailer to send the emails @@ -73,7 +74,11 @@ class SwiftMailerHandler extends MailHandler } $message->setBody($content); - $message->setDate(time()); + if (version_compare(Swift::VERSION, '6.0.0', '>=')) { + $message->setDate(new \DateTimeImmutable()); + } else { + $message->setDate(time()); + } return $message; } diff --git a/tests/Monolog/Handler/SwiftMailerHandlerTest.php b/tests/Monolog/Handler/SwiftMailerHandlerTest.php index 8588691..1d62940 100644 --- a/tests/Monolog/Handler/SwiftMailerHandlerTest.php +++ b/tests/Monolog/Handler/SwiftMailerHandlerTest.php @@ -98,7 +98,7 @@ class SwiftMailerHandlerTest extends TestCase public function testMessageHaveUniqueId() { - $messageTemplate = \Swift_Message::newInstance(); + $messageTemplate = new \Swift_Message(); $handler = new SwiftMailerHandler($this->mailer, $messageTemplate); $method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage'); |