@@ -641,7 +641,7 @@ |
||
| 641 | 641 | * |
| 642 | 642 | * @param string $field |
| 643 | 643 | * |
| 644 | - * @return null|string[]|string |
|
| 644 | + * @return string |
|
| 645 | 645 | */ |
| 646 | 646 | protected function _getHeaderFieldModel($field) |
| 647 | 647 | { |
@@ -520,6 +520,9 @@ |
||
| 520 | 520 | $this->_hash = hash_final($this->_hashHandler, true); |
| 521 | 521 | } |
| 522 | 522 | |
| 523 | + /** |
|
| 524 | + * @param string $string |
|
| 525 | + */ |
|
| 523 | 526 | private function _addToHash($string) |
| 524 | 527 | { |
| 525 | 528 | $this->_canonData .= $string; |
@@ -262,7 +262,7 @@ |
||
| 262 | 262 | * |
| 263 | 263 | * @param Swift_Mime_Message $message |
| 264 | 264 | * |
| 265 | - * @return mixed|null|string |
|
| 265 | + * @return string|null |
|
| 266 | 266 | */ |
| 267 | 267 | private function _getReversePath(Swift_Mime_Message $message) |
| 268 | 268 | { |
@@ -158,8 +158,8 @@ discard block |
||
| 158 | 158 | $address = array($address => $name); |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - if (!$this->_setHeaderFieldModel('Sender', (array)$address)) { |
|
| 162 | - $this->getHeaders()->addMailboxHeader('Sender', (array)$address); |
|
| 161 | + if (!$this->_setHeaderFieldModel('Sender', (array) $address)) { |
|
| 162 | + $this->getHeaders()->addMailboxHeader('Sender', (array) $address); |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | return $this; |
@@ -212,8 +212,8 @@ discard block |
||
| 212 | 212 | $addresses = array($addresses => $name); |
| 213 | 213 | } |
| 214 | 214 | |
| 215 | - if (!$this->_setHeaderFieldModel('From', (array)$addresses)) { |
|
| 216 | - $this->getHeaders()->addMailboxHeader('From', (array)$addresses); |
|
| 215 | + if (!$this->_setHeaderFieldModel('From', (array) $addresses)) { |
|
| 216 | + $this->getHeaders()->addMailboxHeader('From', (array) $addresses); |
|
| 217 | 217 | } |
| 218 | 218 | |
| 219 | 219 | return $this; |
@@ -266,8 +266,8 @@ discard block |
||
| 266 | 266 | $addresses = array($addresses => $name); |
| 267 | 267 | } |
| 268 | 268 | |
| 269 | - if (!$this->_setHeaderFieldModel('Reply-To', (array)$addresses)) { |
|
| 270 | - $this->getHeaders()->addMailboxHeader('Reply-To', (array)$addresses); |
|
| 269 | + if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses)) { |
|
| 270 | + $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | return $this; |
@@ -321,8 +321,8 @@ discard block |
||
| 321 | 321 | $addresses = array($addresses => $name); |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | - if (!$this->_setHeaderFieldModel('To', (array)$addresses)) { |
|
| 325 | - $this->getHeaders()->addMailboxHeader('To', (array)$addresses); |
|
| 324 | + if (!$this->_setHeaderFieldModel('To', (array) $addresses)) { |
|
| 325 | + $this->getHeaders()->addMailboxHeader('To', (array) $addresses); |
|
| 326 | 326 | } |
| 327 | 327 | |
| 328 | 328 | return $this; |
@@ -373,8 +373,8 @@ discard block |
||
| 373 | 373 | $addresses = array($addresses => $name); |
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - if (!$this->_setHeaderFieldModel('Cc', (array)$addresses)) { |
|
| 377 | - $this->getHeaders()->addMailboxHeader('Cc', (array)$addresses); |
|
| 376 | + if (!$this->_setHeaderFieldModel('Cc', (array) $addresses)) { |
|
| 377 | + $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses); |
|
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | return $this; |
@@ -425,8 +425,8 @@ discard block |
||
| 425 | 425 | $addresses = array($addresses => $name); |
| 426 | 426 | } |
| 427 | 427 | |
| 428 | - if (!$this->_setHeaderFieldModel('Bcc', (array)$addresses)) { |
|
| 429 | - $this->getHeaders()->addMailboxHeader('Bcc', (array)$addresses); |
|
| 428 | + if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses)) { |
|
| 429 | + $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses); |
|
| 430 | 430 | } |
| 431 | 431 | |
| 432 | 432 | return $this; |
@@ -564,7 +564,7 @@ discard block |
||
| 564 | 564 | { |
| 565 | 565 | $this->attach($entity); |
| 566 | 566 | |
| 567 | - return 'cid:' . $entity->getId(); |
|
| 567 | + return 'cid:'.$entity->getId(); |
|
| 568 | 568 | } |
| 569 | 569 | |
| 570 | 570 | /** |