hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1542 from jygaulier/PHRAS-772_clone-760

Browse Source 
PHRAS-772 #time 15m
This commit is contained in:
jygaulier
2015-10-19 10:31:37 +02:00
parent 88cfcd20b0 f55bc774be
commit b6b04ab101
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Alchemy/Phrasea/Notification/Deliverer.php
View File

@@ -76,7 +76,11 @@ class Deliverer
$message->setReadReceiptTo([$mail->getEmitter()->getEmail() => $mail->getEmitter()->getName()]); $message->setReadReceiptTo([$mail->getEmitter()->getEmail() => $mail->getEmitter()->getName()]);
} }
if(!$this->mailer->getTransport()->isStarted()) {
$this->mailer->getTransport()->start();
}
$ret = $this->mailer->send($message); $ret = $this->mailer->send($message);
$this->mailer->getTransport()->stop();
$this->dispatcher->dispatch('phraseanet.notification.sent'); $this->dispatcher->dispatch('phraseanet.notification.sent');

15
tests/Alchemy/Tests/Phrasea/Notification/DelivererTest.php
View File

@@ -337,7 +337,20 @@ class DelivererTest extends \PhraseanetTestCase
private function getMailerMock() private function getMailerMock()
{ {
return $this->getMockBuilder('\Swift_Mailer')->disableOriginalConstructor()->getMock(); $mailer = $this->getMockBuilder('\Swift_Mailer')
->disableOriginalConstructor()
->getMock();
$transport = $this->getMock('Swift_Transport');
$transport->expects($this->any())
->method('isStarted')
->willReturn(true);
$mailer->expects($this->any())
->method('getTransport')
->willReturn($transport);
return $mailer;
} }
private function getEmitterMock() private function getEmitterMock()