@@ -65,19 +65,19 @@ discard block |
||
65 | 65 | public function queueMessage(Swift_Mime_Message $message) |
66 | 66 | { |
67 | 67 | $email = new Email(); |
68 | - $email->setFromEmail(implode('; ', array_keys($message->getFrom())) ); |
|
68 | + $email->setFromEmail(implode('; ', array_keys($message->getFrom()))); |
|
69 | 69 | |
70 | - if($message->getTo() !== null ){ |
|
71 | - $email->setToEmail(implode('; ', array_keys($message->getTo())) ); |
|
70 | + if ($message->getTo() !== null) { |
|
71 | + $email->setToEmail(implode('; ', array_keys($message->getTo()))); |
|
72 | 72 | } |
73 | - if($message->getCc() !== null ){ |
|
74 | - $email->setCcEmail(implode('; ', array_keys($message->getCc())) ); |
|
73 | + if ($message->getCc() !== null) { |
|
74 | + $email->setCcEmail(implode('; ', array_keys($message->getCc()))); |
|
75 | 75 | } |
76 | - if($message->getBcc() !== null ){ |
|
77 | - $email->setBccEmail(implode('; ', array_keys($message->getBcc())) ); |
|
76 | + if ($message->getBcc() !== null) { |
|
77 | + $email->setBccEmail(implode('; ', array_keys($message->getBcc()))); |
|
78 | 78 | } |
79 | - if($message->getReplyTo() !== null ){ |
|
80 | - $email->setReplyToEmail(implode('; ', array_keys($message->getReplyTo())) ); |
|
79 | + if ($message->getReplyTo() !== null) { |
|
80 | + $email->setReplyToEmail(implode('; ', array_keys($message->getReplyTo()))); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | $email->setBody($message->getBody()); |
@@ -105,17 +105,17 @@ discard block |
||
105 | 105 | $count = 0; |
106 | 106 | $emails = $this->repository->getEmailQueue($this->getMessageLimit()); |
107 | 107 | |
108 | - foreach($emails as $email){ |
|
108 | + foreach ($emails as $email) { |
|
109 | 109 | /*@var $message \Swift_Mime_Message */ |
110 | 110 | $message = $email->getMessage(); |
111 | - try{ |
|
112 | - $count+= $transport->send($message, $failedRecipients); |
|
113 | - if($count > 0){ |
|
111 | + try { |
|
112 | + $count += $transport->send($message, $failedRecipients); |
|
113 | + if ($count > 0) { |
|
114 | 114 | $this->repository->markCompleteSending($email); |
115 | - }else{ |
|
115 | + }else { |
|
116 | 116 | throw new \Swift_SwiftException('The email was not sent.'); |
117 | 117 | } |
118 | - }catch(\Swift_SwiftException $ex){ |
|
118 | + }catch (\Swift_SwiftException $ex) { |
|
119 | 119 | $this->repository->markFailedSending($email, $ex); |
120 | 120 | } |
121 | 121 | } |
@@ -112,10 +112,10 @@ |
||
112 | 112 | $count+= $transport->send($message, $failedRecipients); |
113 | 113 | if($count > 0){ |
114 | 114 | $this->repository->markCompleteSending($email); |
115 | - }else{ |
|
115 | + } else{ |
|
116 | 116 | throw new \Swift_SwiftException('The email was not sent.'); |
117 | 117 | } |
118 | - }catch(\Swift_SwiftException $ex){ |
|
118 | + } catch(\Swift_SwiftException $ex){ |
|
119 | 119 | $this->repository->markFailedSending($email, $ex); |
120 | 120 | } |
121 | 121 | } |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | foreach ($emails as $email) { |
51 | 51 | $ids[] = $email->getId(); |
52 | 52 | } |
53 | - $query = $this->_em->createQuery("UPDATE CitraxDatabaseSwiftMailerBundle:Email e SET e.status = '" . Email::STATUS_PROCESSING . "' WHERE e.id IN (:ids)"); |
|
53 | + $query = $this->_em->createQuery("UPDATE CitraxDatabaseSwiftMailerBundle:Email e SET e.status = '".Email::STATUS_PROCESSING."' WHERE e.id IN (:ids)"); |
|
54 | 54 | $query->setParameter(':ids', $ids); |
55 | 55 | $query->execute(); |
56 | 56 | } |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | { |
63 | 63 | $email->setErrorMessage($ex->getMessage()); |
64 | 64 | $email->setStatus(Email::STATUS_FAILED); |
65 | - $email->setRetries($email->getRetries() + 1); |
|
65 | + $email->setRetries($email->getRetries()+1); |
|
66 | 66 | $em = $this->getEntityManager(); |
67 | 67 | $em->persist($email); |
68 | 68 | $em->flush(); |