@@ -19,7 +19,6 @@ |
||
19 | 19 | use Postmark\PostmarkClient; |
20 | 20 | use yii\base\InvalidConfigException; |
21 | 21 | use yii\mail\BaseMailer; |
22 | -use Yii; |
|
23 | 22 | |
24 | 23 | /** |
25 | 24 | * This component allow user to send an email |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | } |
231 | 231 | |
232 | 232 | /** |
233 | - * @return string|null text body of the message |
|
233 | + * @return string text body of the message |
|
234 | 234 | * @since XXX |
235 | 235 | */ |
236 | 236 | public function getTextBody() |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | } |
249 | 249 | |
250 | 250 | /** |
251 | - * @return string|null html body of the message |
|
251 | + * @return string html body of the message |
|
252 | 252 | * @since XXX |
253 | 253 | */ |
254 | 254 | public function getHtmlBody() |
@@ -317,7 +317,7 @@ discard block |
||
317 | 317 | } |
318 | 318 | |
319 | 319 | /** |
320 | - * @return integer|null current templateId |
|
320 | + * @return string current templateId |
|
321 | 321 | * @since XXX |
322 | 322 | */ |
323 | 323 | public function getTemplateId() |
@@ -15,13 +15,9 @@ |
||
15 | 15 | namespace sweelix\postmark; |
16 | 16 | |
17 | 17 | |
18 | -use yii\base\InvalidConfigException; |
|
19 | 18 | use yii\base\InvalidParamException; |
20 | 19 | use yii\base\NotSupportedException; |
21 | -use yii\helpers\ArrayHelper; |
|
22 | 20 | use yii\mail\BaseMessage; |
23 | -use Yii; |
|
24 | -use yii\mail\MailerInterface; |
|
25 | 21 | |
26 | 22 | /** |
27 | 23 | * This component allow user to send an email |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | } else { |
449 | 449 | $embed['ContentType'] = 'application/octet-stream'; |
450 | 450 | } |
451 | - $embed['ContentID'] = 'cid:' . uniqid(); |
|
451 | + $embed['ContentID'] = 'cid:'.uniqid(); |
|
452 | 452 | $this->attachments[] = $embed; |
453 | 453 | return $embed['ContentID']; |
454 | 454 | } |
@@ -469,7 +469,7 @@ discard block |
||
469 | 469 | } else { |
470 | 470 | $embed['ContentType'] = 'application/octet-stream'; |
471 | 471 | } |
472 | - $embed['ContentID'] = 'cid:' . uniqid(); |
|
472 | + $embed['ContentID'] = 'cid:'.uniqid(); |
|
473 | 473 | $this->attachments[] = $embed; |
474 | 474 | return $embed['ContentID']; |
475 | 475 | } |
@@ -500,9 +500,9 @@ discard block |
||
500 | 500 | $emails[] = $email; |
501 | 501 | } else { |
502 | 502 | if (preg_match('/[.,:]/', $email) > 0) { |
503 | - $email = '"'. $email .'"'; |
|
503 | + $email = '"'.$email.'"'; |
|
504 | 504 | } |
505 | - $emails[] = $email . ' ' . '<' . $key . '>'; |
|
505 | + $emails[] = $email.' '.'<'.$key.'>'; |
|
506 | 506 | } |
507 | 507 | } |
508 | 508 | $emails = implode(', ', $emails); |