@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | /** |
| 19 | 19 | * |
| 20 | 20 | * @param ServiceManager $serviceManager |
| 21 | - * @return AbstractService |
|
| 21 | + * @return Message |
|
| 22 | 22 | */ |
| 23 | 23 | public function setServiceManager(ServiceManager $serviceManager) |
| 24 | 24 | { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * Either the template to use, or a ViewModel |
| 62 | 62 | * @param null|array $values |
| 63 | 63 | * Values to use when the template is rendered |
| 64 | - * @return Message |
|
| 64 | + * @return MailMessage |
|
| 65 | 65 | */ |
| 66 | 66 | public function createHtmlMessage($from, $to, $subject, $nameOrModel, $values = array()) |
| 67 | 67 | { |
@@ -121,7 +121,7 @@ discard block |
||
| 121 | 121 | * Either the template to use, or a ViewModel |
| 122 | 122 | * @param null|array $values |
| 123 | 123 | * Values to use when the template is rendered |
| 124 | - * @return Message |
|
| 124 | + * @return MailMessage |
|
| 125 | 125 | */ |
| 126 | 126 | public function createTextMessage($from, $to, $subject, $nameOrModel, $values = array()) |
| 127 | 127 | { |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | /** |
| 135 | 135 | * Send the message |
| 136 | 136 | * |
| 137 | - * @param Message $message |
|
| 137 | + * @param MailMessage $message |
|
| 138 | 138 | */ |
| 139 | 139 | public function send(MailMessage $message) |
| 140 | 140 | { |
@@ -174,7 +174,10 @@ discard block |
||
| 174 | 174 | |
| 175 | 175 | /** |
| 176 | 176 | * |
| 177 | - * @return Message |
|
| 177 | + * @param string $encoding |
|
| 178 | + * @param string $subject |
|
| 179 | + * @param string $body |
|
| 180 | + * @return MailMessage |
|
| 178 | 181 | */ |
| 179 | 182 | protected function getDefaultMessage($from, $encoding, $to, $subject, $body) |
| 180 | 183 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use Zend\ServiceManager\ServiceManagerAwareInterface; |
| 6 | 6 | use Zend\Mail\Message as MailMessage; |
| 7 | 7 | use Zend\Mime\Message as MimeMessage; |
| 8 | -use Zend\Mime\Part as MimePart; |
|
| 9 | 8 | |
| 10 | 9 | class Message implements ServiceManagerAwareInterface |
| 11 | 10 | { |
@@ -72,8 +72,8 @@ discard block |
||
| 72 | 72 | $content = $renderer->render($nameOrModel, $values); |
| 73 | 73 | $resolver = $this->getServiceManager()->get('Zend\View\Resolver\TemplatePathStack'); |
| 74 | 74 | // check if plain text email template exist |
| 75 | - if ($resolver->resolve($nameOrModel . '-plain')) { |
|
| 76 | - $contentText = $renderer->render($nameOrModel . '-plain', $values); |
|
| 75 | + if ($resolver->resolve($nameOrModel.'-plain')) { |
|
| 76 | + $contentText = $renderer->render($nameOrModel.'-plain', $values); |
|
| 77 | 77 | } else { |
| 78 | 78 | $contentText = ''; |
| 79 | 79 | } |
@@ -92,7 +92,7 @@ discard block |
||
| 92 | 92 | $html->encoding = Mime::ENCODING_QUOTEDPRINTABLE; |
| 93 | 93 | $html->disposition = Mime::DISPOSITION_INLINE; |
| 94 | 94 | $html->charset = 'UTF-8'; |
| 95 | - $bodyMessage = new MimeMessage(); |
|
| 95 | + $bodyMessage = new MimeMessage(); |
|
| 96 | 96 | |
| 97 | 97 | $multiPartContentMessage = new MimeMessage(); |
| 98 | 98 | $multiPartContentMessage->addPart($text); |