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

Merge pull request #644 from a-a-shmelev/bugfix

Browse Source 
SwiftMailerHandler bugfix
This commit is contained in:
Jordi Boggiano
2015-09-14 16:11:37 +01:00
parent c7d6a9b424 aaa2854b10
commit ec7f7001bd
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,6 +57,7 @@ class SwiftMailerHandler extends MailHandler
$message = null; $message = null;
if ($this->messageTemplate instanceof \Swift_Message) { if ($this->messageTemplate instanceof \Swift_Message) {
$message = clone $this->messageTemplate; $message = clone $this->messageTemplate;
$message->generateId();
} elseif (is_callable($this->messageTemplate)) { } elseif (is_callable($this->messageTemplate)) {
$message = call_user_func($this->messageTemplate, $content, $records); $message = call_user_func($this->messageTemplate, $content, $records);
} }

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

@@ -62,4 +62,18 @@ class SwiftMailerHandlerTest extends TestCase
); );
$handler->handleBatch($records); $handler->handleBatch($records);
} }
public function testMessageHaveUniqueId() {
$messageTemplate = \Swift_Message::newInstance();
$handler = new SwiftMailerHandler($this->mailer, $messageTemplate);
$method = new \ReflectionMethod('Monolog\Handler\SwiftMailerHandler', 'buildMessage');
$method->setAccessible(true);
$method->invokeArgs($handler, array($messageTemplate, array()));
$builtMessage1 = $method->invoke($handler, $messageTemplate, array());
$builtMessage2 = $method->invoke($handler, $messageTemplate, array());
$this->assertFalse($builtMessage1->getId() === $builtMessage2->getId(), 'Two different messages have the same id');
}
} }