@@ -101,7 +101,7 @@ discard block |
||
| 101 | 101 | array $parts, |
| 102 | 102 | array &$retParts, |
| 103 | 103 | $curIndex, |
| 104 | - HeaderPart &$spacePart, |
|
| 104 | + HeaderPart & $spacePart, |
|
| 105 | 105 | HeaderPart $lastPart |
| 106 | 106 | ) { |
| 107 | 107 | $count = count($parts); |
@@ -127,7 +127,7 @@ discard block |
||
| 127 | 127 | * @param int $curIndex |
| 128 | 128 | * @param \ZBateson\MailMimeParser\Header\Part\HeaderPart $spacePart |
| 129 | 129 | */ |
| 130 | - private function addSpaces(array $parts, array &$retParts, $curIndex, HeaderPart &$spacePart = null) |
|
| 130 | + private function addSpaces(array $parts, array &$retParts, $curIndex, HeaderPart & $spacePart = null) |
|
| 131 | 131 | { |
| 132 | 132 | $lastPart = end($retParts); |
| 133 | 133 | if ($spacePart !== null && $parts[$curIndex]->getValue() !== '' && $lastPart !== false) { |
@@ -39,7 +39,7 @@ |
||
| 39 | 39 | { |
| 40 | 40 | $raw = preg_replace('/\s+/', '', $bucket->data); |
| 41 | 41 | if (!empty($this->leftover)) { |
| 42 | - $raw = $this->leftover . $raw; |
|
| 42 | + $raw = $this->leftover.$raw; |
|
| 43 | 43 | $this->leftover = ''; |
| 44 | 44 | } |
| 45 | 45 | $nLeftover = strlen($raw) % 3; |
@@ -323,7 +323,7 @@ |
||
| 323 | 323 | if ($this->fromCharsetMbSupported && $this->toCharsetMbSupported) { |
| 324 | 324 | return mb_convert_encoding($str, $this->toCharset, $this->fromCharset); |
| 325 | 325 | } |
| 326 | - return iconv($this->fromCharset, $this->toCharset . '//TRANSLIT//IGNORE', $str); |
|
| 326 | + return iconv($this->fromCharset, $this->toCharset.'//TRANSLIT//IGNORE', $str); |
|
| 327 | 327 | } |
| 328 | 328 | return $str; |
| 329 | 329 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $handle, |
| 141 | 141 | 'mailmimeparser-encode', |
| 142 | 142 | STREAM_FILTER_READ, |
| 143 | - [ 'charset' => $part->getHeaderParameter('Content-Type', 'charset') ] |
|
| 143 | + ['charset' => $part->getHeaderParameter('Content-Type', 'charset')] |
|
| 144 | 144 | ); |
| 145 | 145 | } |
| 146 | 146 | } |
@@ -160,8 +160,8 @@ discard block |
||
| 160 | 160 | if (empty($this->registeredHandles[$id])) { |
| 161 | 161 | return null; |
| 162 | 162 | } |
| 163 | - $handle = fopen('mmp-mime-message://' . $id . '?start=' . |
|
| 164 | - $start . '&end=' . $end, 'r'); |
|
| 163 | + $handle = fopen('mmp-mime-message://'.$id.'?start='. |
|
| 164 | + $start.'&end='.$end, 'r'); |
|
| 165 | 165 | |
| 166 | 166 | $this->attachEncodingFilterToStream($part, $handle); |
| 167 | 167 | $this->attachCharsetFilterToStream($part, $handle); |
@@ -50,11 +50,11 @@ |
||
| 50 | 50 | |
| 51 | 51 | $this->setRawHeader( |
| 52 | 52 | 'Content-Type', |
| 53 | - 'application/octet-stream; name="' . addcslashes($filename, '"') . '"' |
|
| 53 | + 'application/octet-stream; name="'.addcslashes($filename, '"').'"' |
|
| 54 | 54 | ); |
| 55 | 55 | $this->setRawHeader( |
| 56 | 56 | 'Content-Disposition', |
| 57 | - 'attachment; filename="' . addcslashes($filename, '"') . '"' |
|
| 57 | + 'attachment; filename="'.addcslashes($filename, '"').'"' |
|
| 58 | 58 | ); |
| 59 | 59 | $this->setRawHeader('Content-Transfer-Encoding', 'x-uuencode'); |
| 60 | 60 | } |
@@ -164,7 +164,7 @@ |
||
| 164 | 164 | protected function getTokenSplitPattern() |
| 165 | 165 | { |
| 166 | 166 | $sChars = implode('|', $this->getAllTokenSeparators()); |
| 167 | - return '~(\\\\.|' . $sChars . ')~'; |
|
| 167 | + return '~(\\\\.|'.$sChars.')~'; |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
@@ -109,9 +109,9 @@ |
||
| 109 | 109 | foreach ($parts as $part) { |
| 110 | 110 | // order is important here - CommentPart extends LiteralPart |
| 111 | 111 | if ($part instanceof CommentPart) { |
| 112 | - $comment .= '(' . $part->getComment() . ')'; |
|
| 112 | + $comment .= '('.$part->getComment().')'; |
|
| 113 | 113 | } elseif ($part instanceof LiteralPart) { |
| 114 | - $comment .= '"' . $part->getValue() . '"'; |
|
| 114 | + $comment .= '"'.$part->getValue().'"'; |
|
| 115 | 115 | } else { |
| 116 | 116 | $comment .= $part->getValue(); |
| 117 | 117 | } |
@@ -502,7 +502,6 @@ discard block |
||
| 502 | 502 | * Creates and returns a new MimePart for the signature part of a |
| 503 | 503 | * multipart/signed message and assigns it to $this->signedSignaturePart. |
| 504 | 504 | * |
| 505 | - * @param string $protocol |
|
| 506 | 505 | * @param string $body |
| 507 | 506 | */ |
| 508 | 507 | public function createSignaturePart($body) |
@@ -522,7 +521,6 @@ discard block |
||
| 522 | 521 | * Creates a multipart/mixed MimePart assigns it to $this->signedMixedPart |
| 523 | 522 | * if the message contains attachments. |
| 524 | 523 | * |
| 525 | - * @param array $parts |
|
| 526 | 524 | */ |
| 527 | 525 | private function createMultipartMixedForSignedMessage() |
| 528 | 526 | { |
@@ -590,8 +588,6 @@ discard block |
||
| 590 | 588 | * |
| 591 | 589 | * @param string $micalg The Message Integrity Check algorithm being used |
| 592 | 590 | * @param string $protocol The mime-type of the signature body |
| 593 | - * @param string $body The signature signed according to the value of |
|
| 594 | - * $protocol |
|
| 595 | 591 | */ |
| 596 | 592 | public function setAsMultipartSigned($micalg, $protocol) |
| 597 | 593 | { |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | */ |
| 349 | 349 | private function getUniqueBoundary() |
| 350 | 350 | { |
| 351 | - return uniqid('----=MMP-' . $this->objectId . '.', true); |
|
| 351 | + return uniqid('----=MMP-'.$this->objectId.'.', true); |
|
| 352 | 352 | } |
| 353 | 353 | |
| 354 | 354 | /** |
@@ -363,7 +363,7 @@ discard block |
||
| 363 | 363 | $part->setRawHeader( |
| 364 | 364 | 'Content-Type', |
| 365 | 365 | "$mimeType;\r\n\tboundary=\"" |
| 366 | - . $this->getUniqueBoundary() . "\"" |
|
| 366 | + . $this->getUniqueBoundary()."\"" |
|
| 367 | 367 | ); |
| 368 | 368 | } |
| 369 | 369 | |
@@ -602,7 +602,7 @@ discard block |
||
| 602 | 602 | public function setAsMultipartSigned($micalg, $protocol) |
| 603 | 603 | { |
| 604 | 604 | $contentType = $this->getHeaderValue('Content-Type', 'text/plain'); |
| 605 | - if (strcasecmp($contentType, 'multipart/signed') !== 0 && strcasecmp($contentType,'multipart/mixed') !== 0) { |
|
| 605 | + if (strcasecmp($contentType, 'multipart/signed') !== 0 && strcasecmp($contentType, 'multipart/mixed') !== 0) { |
|
| 606 | 606 | $this->makeSpaceForMultipartSignedMessage(); |
| 607 | 607 | } |
| 608 | 608 | $boundary = $this->getUniqueBoundary(); |
@@ -837,7 +837,7 @@ discard block |
||
| 837 | 837 | public function addAttachmentPart($stringOrHandle, $mimeType, $filename = null, $disposition = 'attachment') |
| 838 | 838 | { |
| 839 | 839 | if ($filename === null) { |
| 840 | - $filename = 'file' . uniqid(); |
|
| 840 | + $filename = 'file'.uniqid(); |
|
| 841 | 841 | } |
| 842 | 842 | $filename = iconv('UTF-8', 'US-ASCII//translit//ignore', $filename); |
| 843 | 843 | $part = $this->createPartForAttachment(); |
@@ -986,7 +986,7 @@ discard block |
||
| 986 | 986 | * @param \ZBateson\MailMimeParser\MimePart $boundaryParent |
| 987 | 987 | * @param string $boundary |
| 988 | 988 | */ |
| 989 | - private function writePartBoundaries($handle, MimePart $part, MimePart $parent, MimePart &$boundaryParent, $boundary) |
|
| 989 | + private function writePartBoundaries($handle, MimePart $part, MimePart $parent, MimePart & $boundaryParent, $boundary) |
|
| 990 | 990 | { |
| 991 | 991 | if ($boundaryParent !== $parent && $boundaryParent !== $part) { |
| 992 | 992 | if ($boundaryParent !== null && $parent->getParent() !== $boundaryParent) { |
@@ -1009,7 +1009,7 @@ discard block |
||
| 1009 | 1009 | * @param \ZBateson\MailMimeParser\MimePart $parent |
| 1010 | 1010 | * @param \ZBateson\MailMimeParser\MimePart $boundaryParent |
| 1011 | 1011 | */ |
| 1012 | - private function writePartTo($handle, MimePart $part, MimePart $parent, MimePart &$boundaryParent) |
|
| 1012 | + private function writePartTo($handle, MimePart $part, MimePart $parent, MimePart & $boundaryParent) |
|
| 1013 | 1013 | { |
| 1014 | 1014 | $boundary = $boundaryParent->getHeaderParameter('Content-Type', 'boundary'); |
| 1015 | 1015 | if (!empty($boundary)) { |
@@ -102,7 +102,7 @@ |
||
| 102 | 102 | * Filters the lines in the passed $lines array, returning a concatenated |
| 103 | 103 | * string of decoded lines. |
| 104 | 104 | * |
| 105 | - * @param array $lines |
|
| 105 | + * @param string[] $lines |
|
| 106 | 106 | * @param int $consumed |
| 107 | 107 | * @return string |
| 108 | 108 | */ |
@@ -44,7 +44,7 @@ |
||
| 44 | 44 | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY |
| 45 | 45 | ); |
| 46 | 46 | if (!empty($this->leftover)) { |
| 47 | - $lines[0] = $this->leftover . $lines[0]; |
|
| 47 | + $lines[0] = $this->leftover.$lines[0]; |
|
| 48 | 48 | $this->leftover = ''; |
| 49 | 49 | } |
| 50 | 50 | $last = end($lines); |