@@ -46,7 +46,7 @@ discard block |
||
| 46 | 46 | $numBytes = strlen($converted); |
| 47 | 47 | if ($this->numBytesWritten != 0) { |
| 48 | 48 | $next = 76 - ($this->numBytesWritten % 76); |
| 49 | - $converted = substr($converted, 0, $next) . "\r\n" . rtrim(chunk_split(substr($converted, $next))); |
|
| 49 | + $converted = substr($converted, 0, $next)."\r\n".rtrim(chunk_split(substr($converted, $next))); |
|
| 50 | 50 | } else { |
| 51 | 51 | $converted = rtrim(chunk_split($converted)); |
| 52 | 52 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | private function readAndConvert($in, $out, &$consumed) |
| 66 | 66 | { |
| 67 | 67 | while ($bucket = stream_bucket_make_writeable($in)) { |
| 68 | - $data = $this->leftovers->value . $bucket->data; |
|
| 68 | + $data = $this->leftovers->value.$bucket->data; |
|
| 69 | 69 | $consumed += $bucket->datalen; |
| 70 | 70 | $nRemain = strlen($data) % 3; |
| 71 | 71 | $toConvert = $data; |
@@ -74,7 +74,7 @@ discard block |
||
| 74 | 74 | $this->leftovers->encodedValue = ''; |
| 75 | 75 | } else { |
| 76 | 76 | $this->leftovers->value = substr($data, -$nRemain); |
| 77 | - $this->leftovers->encodedValue = base64_encode($this->leftovers->value) . "\r\n"; |
|
| 77 | + $this->leftovers->encodedValue = base64_encode($this->leftovers->value)."\r\n"; |
|
| 78 | 78 | $toConvert = substr($data, 0, -$nRemain); |
| 79 | 79 | } |
| 80 | 80 | $this->convertAndAppend($toConvert, $out); |
@@ -39,11 +39,11 @@ discard block |
||
| 39 | 39 | private function convertAndAppend($data, $out) |
| 40 | 40 | { |
| 41 | 41 | $converted = convert_uuencode($data); |
| 42 | - $cleaned = rtrim(substr(rtrim($converted), 0, -1)); // remove end line ` character |
|
| 42 | + $cleaned = rtrim(substr(rtrim($converted), 0, -1)); // remove end line ` character |
|
| 43 | 43 | if (empty($cleaned)) { |
| 44 | 44 | return; |
| 45 | 45 | } |
| 46 | - $cleaned = "\r\n" . $cleaned; |
|
| 46 | + $cleaned = "\r\n".$cleaned; |
|
| 47 | 47 | stream_bucket_append($out, stream_bucket_new($this->stream, $cleaned)); |
| 48 | 48 | } |
| 49 | 49 | |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | private function readAndConvert($in, $out, &$consumed) |
| 86 | 86 | { |
| 87 | 87 | while ($bucket = stream_bucket_make_writeable($in)) { |
| 88 | - $data = $this->leftovers->value . $bucket->data; |
|
| 88 | + $data = $this->leftovers->value.$bucket->data; |
|
| 89 | 89 | if (!$this->headerWritten) { |
| 90 | 90 | $this->writeUUEncodingHeader($out); |
| 91 | 91 | $this->headerWritten = true; |
@@ -98,7 +98,7 @@ discard block |
||
| 98 | 98 | $this->leftovers->encodedValue = $this->getUUEncodingFooter(); |
| 99 | 99 | } else { |
| 100 | 100 | $this->leftovers->value = substr($data, -$nRemain); |
| 101 | - $this->leftovers->encodedValue = "\r\n" . |
|
| 101 | + $this->leftovers->encodedValue = "\r\n". |
|
| 102 | 102 | rtrim(substr(rtrim(convert_uuencode($this->leftovers->value)), 0, -1)) |
| 103 | 103 | . $this->getUUEncodingFooter(); |
| 104 | 104 | $toConvert = substr($data, 0, -$nRemain); |
@@ -180,7 +180,7 @@ discard block |
||
| 180 | 180 | if ($this->partStreamRegistry === null) { |
| 181 | 181 | $this->registerStreamExtensions(); |
| 182 | 182 | } |
| 183 | - return $this->getInstance('partStreamRegistry', __NAMESPACE__ . '\Stream\PartStreamRegistry'); |
|
| 183 | + return $this->getInstance('partStreamRegistry', __NAMESPACE__.'\Stream\PartStreamRegistry'); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | */ |
| 191 | 191 | public function getHeaderPartFactory() |
| 192 | 192 | { |
| 193 | - return $this->getInstance('headerPartFactory', __NAMESPACE__ . '\Header\Part\HeaderPartFactory'); |
|
| 193 | + return $this->getInstance('headerPartFactory', __NAMESPACE__.'\Header\Part\HeaderPartFactory'); |
|
| 194 | 194 | } |
| 195 | 195 | |
| 196 | 196 | /** |
@@ -200,7 +200,7 @@ discard block |
||
| 200 | 200 | */ |
| 201 | 201 | public function getMimeLiteralPartFactory() |
| 202 | 202 | { |
| 203 | - return $this->getInstance('mimeLiteralPartFactory', __NAMESPACE__ . '\Header\Part\MimeLiteralPartFactory'); |
|
| 203 | + return $this->getInstance('mimeLiteralPartFactory', __NAMESPACE__.'\Header\Part\MimeLiteralPartFactory'); |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -227,10 +227,10 @@ discard block |
||
| 227 | 227 | */ |
| 228 | 228 | protected function registerStreamExtensions() |
| 229 | 229 | { |
| 230 | - stream_filter_register(UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\UUDecodeStreamFilter'); |
|
| 231 | - stream_filter_register(UUEncodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\UUEncodeStreamFilter'); |
|
| 232 | - stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\CharsetStreamFilter'); |
|
| 233 | - stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__ . '\Stream\PartStream'); |
|
| 230 | + stream_filter_register(UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\UUDecodeStreamFilter'); |
|
| 231 | + stream_filter_register(UUEncodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\UUEncodeStreamFilter'); |
|
| 232 | + stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\CharsetStreamFilter'); |
|
| 233 | + stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__.'\Stream\PartStream'); |
|
| 234 | 234 | |
| 235 | 235 | // originally created for HHVM compatibility, but decided to use them |
| 236 | 236 | // instead of built-in stream filters for reliability -- it seems the |
@@ -242,21 +242,21 @@ discard block |
||
| 242 | 242 | if (!in_array('convert.*', $filters)) { |
| 243 | 243 | stream_filter_register( |
| 244 | 244 | 'convert.quoted-printable-decode', |
| 245 | - __NAMESPACE__ . '\Stream\ConvertStreamFilter' |
|
| 245 | + __NAMESPACE__.'\Stream\ConvertStreamFilter' |
|
| 246 | 246 | ); |
| 247 | 247 | stream_filter_register( |
| 248 | 248 | 'convert.quoted-printable-encode', |
| 249 | - __NAMESPACE__ . '\Stream\ConvertStreamFilter' |
|
| 249 | + __NAMESPACE__.'\Stream\ConvertStreamFilter' |
|
| 250 | 250 | ); |
| 251 | 251 | } |
| 252 | 252 | // @codeCoverageIgnoreEnd |
| 253 | 253 | stream_filter_register( |
| 254 | 254 | Base64EncodeStreamFilter::STREAM_FILTER_NAME, |
| 255 | - __NAMESPACE__ . '\Stream\Base64EncodeStreamFilter' |
|
| 255 | + __NAMESPACE__.'\Stream\Base64EncodeStreamFilter' |
|
| 256 | 256 | ); |
| 257 | 257 | stream_filter_register( |
| 258 | 258 | Base64DecodeStreamFilter::STREAM_FILTER_NAME, |
| 259 | - __NAMESPACE__ . '\Stream\Base64DecodeStreamFilter' |
|
| 259 | + __NAMESPACE__.'\Stream\Base64DecodeStreamFilter' |
|
| 260 | 260 | ); |
| 261 | 261 | } |
| 262 | 262 | } |
@@ -342,7 +342,7 @@ discard block |
||
| 342 | 342 | */ |
| 343 | 343 | private function getUniqueBoundary() |
| 344 | 344 | { |
| 345 | - return uniqid('----=MMP-' . $this->objectId . '.', true); |
|
| 345 | + return uniqid('----=MMP-'.$this->objectId.'.', true); |
|
| 346 | 346 | } |
| 347 | 347 | |
| 348 | 348 | /** |
@@ -357,7 +357,7 @@ discard block |
||
| 357 | 357 | $part->setRawHeader( |
| 358 | 358 | 'Content-Type', |
| 359 | 359 | "$mimeType;\r\n\tboundary=\"" |
| 360 | - . $this->getUniqueBoundary() . "\"" |
|
| 360 | + . $this->getUniqueBoundary()."\"" |
|
| 361 | 361 | ); |
| 362 | 362 | } |
| 363 | 363 | |
@@ -830,7 +830,7 @@ discard block |
||
| 830 | 830 | public function addAttachmentPart($stringOrHandle, $mimeType, $filename = null, $disposition = 'attachment') |
| 831 | 831 | { |
| 832 | 832 | if ($filename === null) { |
| 833 | - $filename = 'file' . uniqid(); |
|
| 833 | + $filename = 'file'.uniqid(); |
|
| 834 | 834 | } |
| 835 | 835 | $filename = iconv('UTF-8', 'US-ASCII//translit//ignore', $filename); |
| 836 | 836 | $part = $this->createPartForAttachment(); |
@@ -974,7 +974,7 @@ discard block |
||
| 974 | 974 | * @param \ZBateson\MailMimeParser\MimePart $boundaryParent |
| 975 | 975 | * @param string $boundary |
| 976 | 976 | */ |
| 977 | - private function writePartBoundaries($handle, MimePart $part, MimePart $parent, MimePart &$boundaryParent, $boundary) |
|
| 977 | + private function writePartBoundaries($handle, MimePart $part, MimePart $parent, MimePart & $boundaryParent, $boundary) |
|
| 978 | 978 | { |
| 979 | 979 | if ($boundaryParent !== $parent && $boundaryParent !== $part) { |
| 980 | 980 | if ($boundaryParent !== null && $parent->getParent() !== $boundaryParent) { |
@@ -997,7 +997,7 @@ discard block |
||
| 997 | 997 | * @param \ZBateson\MailMimeParser\MimePart $parent |
| 998 | 998 | * @param \ZBateson\MailMimeParser\MimePart $boundaryParent |
| 999 | 999 | */ |
| 1000 | - private function writePartTo($handle, MimePart $part, MimePart $parent, MimePart &$boundaryParent) |
|
| 1000 | + private function writePartTo($handle, MimePart $part, MimePart $parent, MimePart & $boundaryParent) |
|
| 1001 | 1001 | { |
| 1002 | 1002 | $boundary = $boundaryParent->getHeaderParameter('Content-Type', 'boundary'); |
| 1003 | 1003 | if (!empty($boundary)) { |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | $this->addRawHeaderToPart($header, $part); |
| 96 | 96 | $header = ''; |
| 97 | 97 | } else { |
| 98 | - $line = "\r\n" . $line; |
|
| 98 | + $line = "\r\n".$line; |
|
| 99 | 99 | } |
| 100 | 100 | $header .= rtrim($line, "\r\n"); |
| 101 | 101 | } while (!empty($header)); |
@@ -178,8 +178,7 @@ discard block |
||
| 178 | 178 | private function getParentBoundary($curBoundary, MimePart $parent = null) |
| 179 | 179 | { |
| 180 | 180 | return $parent !== null ? |
| 181 | - $parent->getHeaderParameter('Content-Type', 'boundary') : |
|
| 182 | - $curBoundary; |
|
| 181 | + $parent->getHeaderParameter('Content-Type', 'boundary') : $curBoundary; |
|
| 183 | 182 | } |
| 184 | 183 | |
| 185 | 184 | /** |