@@ -18,7 +18,6 @@ |
||
18 | 18 | * |
19 | 19 | * @param string $messageObjectId |
20 | 20 | * @param PartBuilder $partBuilder |
21 | - * @param PartStreamFilterManager $partStreamFilterManager |
|
22 | 21 | * @return \ZBateson\MailMimeParser\Message\Part\NonMimePart |
23 | 22 | */ |
24 | 23 | public function newInstance( |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | * Sets the specified property denoted by $name to $value. |
162 | 162 | * |
163 | 163 | * @param string $name |
164 | - * @param mixed $value |
|
164 | + * @param string $value |
|
165 | 165 | */ |
166 | 166 | public function setProperty($name, $value) |
167 | 167 | { |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | * Returns the value of the property with the given $name. |
173 | 173 | * |
174 | 174 | * @param string $name |
175 | - * @return mixed |
|
175 | + * @return null|string |
|
176 | 176 | */ |
177 | 177 | public function getProperty($name) |
178 | 178 | { |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | /** |
186 | 186 | * Registers the passed PartBuilder as a child of the current PartBuilder. |
187 | 187 | * |
188 | - * @param \ZBateson\MailMimeParser\Message\PartBuilder $partBuilder |
|
188 | + * @param PartBuilder $partBuilder |
|
189 | 189 | */ |
190 | 190 | public function addChild(PartBuilder $partBuilder) |
191 | 191 | { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | /** |
197 | 197 | * Returns all children PartBuilder objects. |
198 | 198 | * |
199 | - * @return \ZBateson\MailMimeParser\Message\PartBuilder[] |
|
199 | + * @return PartBuilder[] |
|
200 | 200 | */ |
201 | 201 | public function getChildren() |
202 | 202 | { |
@@ -339,8 +339,8 @@ discard block |
||
339 | 339 | if ($this->streamPartEndPos === 0) { |
340 | 340 | return null; |
341 | 341 | } |
342 | - return $this->streamWrapperProtocol . '://' . $messageObjectId |
|
343 | - . '?start=' . $this->streamPartStartPos . '&end=' |
|
342 | + return $this->streamWrapperProtocol.'://'.$messageObjectId |
|
343 | + . '?start='.$this->streamPartStartPos.'&end=' |
|
344 | 344 | . $this->streamPartEndPos; |
345 | 345 | } |
346 | 346 | |
@@ -356,8 +356,8 @@ discard block |
||
356 | 356 | if ($this->streamContentEndPos === 0) { |
357 | 357 | return null; |
358 | 358 | } |
359 | - return $this->streamWrapperProtocol . '://' . $messageObjectId |
|
360 | - . '?start=' . $this->streamContentStartPos . '&end=' |
|
359 | + return $this->streamWrapperProtocol.'://'.$messageObjectId |
|
360 | + . '?start='.$this->streamContentStartPos.'&end=' |
|
361 | 361 | . $this->streamContentEndPos; |
362 | 362 | } |
363 | 363 |
@@ -228,8 +228,8 @@ discard block |
||
228 | 228 | * Removes the 'inline' part with the passed contentType, at the given index |
229 | 229 | * defaulting to the first |
230 | 230 | * |
231 | - * @param string $contentType |
|
232 | 231 | * @param int $index |
232 | + * @param string $mimeType |
|
233 | 233 | * @return boolean true on success |
234 | 234 | */ |
235 | 235 | protected function removePartByMimeType($mimeType, $index = 0) |
@@ -342,7 +342,7 @@ discard block |
||
342 | 342 | * used for something else (e.g. changing a non-mime message to a multipart |
343 | 343 | * mime message). |
344 | 344 | * |
345 | - * @param MimePart $part |
|
345 | + * @param WritableMessage $part |
|
346 | 346 | * @return MimePart the newly-created MimePart |
347 | 347 | */ |
348 | 348 | private function createNewContentPartFromPart(MimePart $part) |
@@ -6,10 +6,6 @@ |
||
6 | 6 | */ |
7 | 7 | namespace ZBateson\MailMimeParser\Message; |
8 | 8 | |
9 | -use ZBateson\MailMimeParser\Header\HeaderFactory; |
|
10 | -use ZBateson\MailMimeParser\Header\ParameterHeader; |
|
11 | -use ZBateson\MailMimeParser\Message\Writer\MimePartWriter; |
|
12 | - |
|
13 | 9 | /** |
14 | 10 | * Represents a single part of a multi-part mime message. |
15 | 11 | * |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | $part->setRawHeader( |
50 | 50 | 'Content-Type', |
51 | 51 | "$mimeType;\r\n\tboundary=\"" |
52 | - . $this->getUniqueBoundary($mimeType) . '"' |
|
52 | + . $this->getUniqueBoundary($mimeType).'"' |
|
53 | 53 | ); |
54 | 54 | } |
55 | 55 | |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | private function getUniqueBoundary($mimeType) |
133 | 133 | { |
134 | 134 | $type = ltrim(strtoupper(preg_replace('/^(multipart\/(.{3}).*|.*)$/i', '$2-', $mimeType)), '-'); |
135 | - return uniqid('----=MMP-' . $type . $this->messageObjectId . '.', true); |
|
135 | + return uniqid('----=MMP-'.$type.$this->messageObjectId.'.', true); |
|
136 | 136 | } |
137 | 137 | |
138 | 138 | /** |
@@ -425,9 +425,9 @@ discard block |
||
425 | 425 | private function overwrite8bitContentEncoding() |
426 | 426 | { |
427 | 427 | $parts = $this->getAllParts(new PartFilter([ |
428 | - 'headers' => [ PartFilter::FILTER_INCLUDE => [ |
|
428 | + 'headers' => [PartFilter::FILTER_INCLUDE => [ |
|
429 | 429 | 'Content-Transfer-Encoding' => '8bit' |
430 | - ] ] |
|
430 | + ]] |
|
431 | 431 | ])); |
432 | 432 | foreach ($parts as $part) { |
433 | 433 | $contentType = strtolower($part->getHeaderValue('Content-Type', 'text/plain')); |
@@ -491,7 +491,7 @@ discard block |
||
491 | 491 | */ |
492 | 492 | public function getSignaturePart() |
493 | 493 | { |
494 | - return $this->getChild(0, new PartFilter([ 'signedpart' => PartFilter::FILTER_INCLUDE ])); |
|
494 | + return $this->getChild(0, new PartFilter(['signedpart' => PartFilter::FILTER_INCLUDE])); |
|
495 | 495 | } |
496 | 496 | |
497 | 497 | /** |
@@ -730,7 +730,7 @@ discard block |
||
730 | 730 | public function addAttachmentPart($stringOrHandle, $mimeType, $filename = null, $disposition = 'attachment') |
731 | 731 | { |
732 | 732 | if ($filename === null) { |
733 | - $filename = 'file' . uniqid(); |
|
733 | + $filename = 'file'.uniqid(); |
|
734 | 734 | } |
735 | 735 | $filename = iconv('UTF-8', 'US-ASCII//translit//ignore', $filename); |
736 | 736 | $part = $this->createPartForAttachment(); |
@@ -179,7 +179,7 @@ |
||
179 | 179 | |
180 | 180 | /** |
181 | 181 | * |
182 | - * @return type |
|
182 | + * @return PartFactoryService |
|
183 | 183 | */ |
184 | 184 | public function getPartFactoryService() |
185 | 185 | { |
@@ -7,7 +7,6 @@ |
||
7 | 7 | namespace ZBateson\MailMimeParser; |
8 | 8 | |
9 | 9 | use ZBateson\MailMimeParser\Message\MessageParser; |
10 | -use ZBateson\MailMimeParser\Message\Part\MimePartFactory; |
|
11 | 10 | use ZBateson\MailMimeParser\Message\Part\PartBuilderFactory; |
12 | 11 | use ZBateson\MailMimeParser\Message\Part\PartFactoryService; |
13 | 12 | use ZBateson\MailMimeParser\Message\Writer\MessageWriterService; |
@@ -173,7 +173,7 @@ discard block |
||
173 | 173 | { |
174 | 174 | return $this->getInstance( |
175 | 175 | 'partFilterFactory', |
176 | - __NAMESPACE__ . '\Message\PartFilterFactory' |
|
176 | + __NAMESPACE__.'\Message\PartFilterFactory' |
|
177 | 177 | ); |
178 | 178 | } |
179 | 179 | |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | { |
222 | 222 | return $this->getInstance( |
223 | 223 | 'partStreamFilterManagerFactory', |
224 | - __NAMESPACE__ . '\Message\Part\PartStreamFilterManagerFactory' |
|
224 | + __NAMESPACE__.'\Message\Part\PartStreamFilterManagerFactory' |
|
225 | 225 | ); |
226 | 226 | } |
227 | 227 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | if ($this->partStreamRegistry === null) { |
237 | 237 | $this->registerStreamExtensions(); |
238 | 238 | } |
239 | - return $this->getInstance('partStreamRegistry', __NAMESPACE__ . '\Stream\PartStreamRegistry'); |
|
239 | + return $this->getInstance('partStreamRegistry', __NAMESPACE__.'\Stream\PartStreamRegistry'); |
|
240 | 240 | } |
241 | 241 | |
242 | 242 | /** |
@@ -246,7 +246,7 @@ discard block |
||
246 | 246 | */ |
247 | 247 | public function getHeaderPartFactory() |
248 | 248 | { |
249 | - return $this->getInstance('headerPartFactory', __NAMESPACE__ . '\Header\Part\HeaderPartFactory'); |
|
249 | + return $this->getInstance('headerPartFactory', __NAMESPACE__.'\Header\Part\HeaderPartFactory'); |
|
250 | 250 | } |
251 | 251 | |
252 | 252 | /** |
@@ -256,7 +256,7 @@ discard block |
||
256 | 256 | */ |
257 | 257 | public function getMimeLiteralPartFactory() |
258 | 258 | { |
259 | - return $this->getInstance('mimeLiteralPartFactory', __NAMESPACE__ . '\Header\Part\MimeLiteralPartFactory'); |
|
259 | + return $this->getInstance('mimeLiteralPartFactory', __NAMESPACE__.'\Header\Part\MimeLiteralPartFactory'); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 | /** |
@@ -283,10 +283,10 @@ discard block |
||
283 | 283 | */ |
284 | 284 | protected function registerStreamExtensions() |
285 | 285 | { |
286 | - stream_filter_register(UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\UUDecodeStreamFilter'); |
|
287 | - stream_filter_register(UUEncodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\UUEncodeStreamFilter'); |
|
288 | - stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\CharsetStreamFilter'); |
|
289 | - stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__ . '\Stream\PartStream'); |
|
286 | + stream_filter_register(UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\UUDecodeStreamFilter'); |
|
287 | + stream_filter_register(UUEncodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\UUEncodeStreamFilter'); |
|
288 | + stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\CharsetStreamFilter'); |
|
289 | + stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__.'\Stream\PartStream'); |
|
290 | 290 | |
291 | 291 | // originally created for HHVM compatibility, but decided to use them |
292 | 292 | // instead of built-in stream filters for reliability -- it seems the |
@@ -300,19 +300,19 @@ discard block |
||
300 | 300 | // filters, so now they're all named mmp-convert.* |
301 | 301 | stream_filter_register( |
302 | 302 | 'mmp-convert.quoted-printable-decode', |
303 | - __NAMESPACE__ . '\Stream\ConvertStreamFilter' |
|
303 | + __NAMESPACE__.'\Stream\ConvertStreamFilter' |
|
304 | 304 | ); |
305 | 305 | stream_filter_register( |
306 | 306 | 'mmp-convert.quoted-printable-encode', |
307 | - __NAMESPACE__ . '\Stream\ConvertStreamFilter' |
|
307 | + __NAMESPACE__.'\Stream\ConvertStreamFilter' |
|
308 | 308 | ); |
309 | 309 | stream_filter_register( |
310 | 310 | Base64EncodeStreamFilter::STREAM_FILTER_NAME, |
311 | - __NAMESPACE__ . '\Stream\Base64EncodeStreamFilter' |
|
311 | + __NAMESPACE__.'\Stream\Base64EncodeStreamFilter' |
|
312 | 312 | ); |
313 | 313 | stream_filter_register( |
314 | 314 | Base64DecodeStreamFilter::STREAM_FILTER_NAME, |
315 | - __NAMESPACE__ . '\Stream\Base64DecodeStreamFilter' |
|
315 | + __NAMESPACE__.'\Stream\Base64DecodeStreamFilter' |
|
316 | 316 | ); |
317 | 317 | } |
318 | 318 | } |
@@ -101,7 +101,7 @@ |
||
101 | 101 | $this->addRawHeaderToPart($header, $partBuilder); |
102 | 102 | $header = ''; |
103 | 103 | } else { |
104 | - $line = "\r\n" . $line; |
|
104 | + $line = "\r\n".$line; |
|
105 | 105 | } |
106 | 106 | $header .= rtrim($line, "\r\n"); |
107 | 107 | } while ($header !== ''); |
@@ -107,7 +107,7 @@ |
||
107 | 107 | $handle, |
108 | 108 | 'mailmimeparser-encode', |
109 | 109 | STREAM_FILTER_READ, |
110 | - [ 'charset' => $charset ] |
|
110 | + ['charset' => $charset] |
|
111 | 111 | ); |
112 | 112 | } |
113 | 113 | $this->charset['type'] = $charset; |
@@ -34,7 +34,7 @@ |
||
34 | 34 | { |
35 | 35 | if ($part !== $this) { |
36 | 36 | $part->setParent($this); |
37 | - array_splice($this->parts, ($position === null) ? count($this->parts) : $position, 0, [ $part ]); |
|
37 | + array_splice($this->parts, ($position === null) ? count($this->parts) : $position, 0, [$part]); |
|
38 | 38 | } |
39 | 39 | } |
40 | 40 |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | |
81 | 81 | $pbChildren = $partBuilder->getChildren(); |
82 | 82 | if (!empty($pbChildren)) { |
83 | - $this->children = array_map(function ($child) use ($messageObjectId) { |
|
83 | + $this->children = array_map(function($child) use ($messageObjectId) { |
|
84 | 84 | $childPart = $child->createMessagePart($messageObjectId); |
85 | 85 | $childPart->parent = $this; |
86 | 86 | return $childPart; |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | */ |
124 | 124 | public function getAllParts(PartFilter $filter = null) |
125 | 125 | { |
126 | - $aParts = [ $this ]; |
|
126 | + $aParts = [$this]; |
|
127 | 127 | foreach ($this->children as $part) { |
128 | 128 | if ($part instanceof MimePart) { |
129 | 129 | $aParts = array_merge($aParts, $part->getAllParts(null, true)); |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | if (!empty($filter)) { |
135 | 135 | return array_values(array_filter( |
136 | 136 | $aParts, |
137 | - [ $filter, 'filter' ] |
|
137 | + [$filter, 'filter'] |
|
138 | 138 | )); |
139 | 139 | } |
140 | 140 | return $aParts; |
@@ -182,7 +182,7 @@ discard block |
||
182 | 182 | public function getChildParts(PartFilter $filter = null) |
183 | 183 | { |
184 | 184 | if ($filter !== null) { |
185 | - return array_values(array_filter($this->children, [ $filter, 'filter' ])); |
|
185 | + return array_values(array_filter($this->children, [$filter, 'filter'])); |
|
186 | 186 | } |
187 | 187 | return $this->children; |
188 | 188 | } |
@@ -181,7 +181,7 @@ |
||
181 | 181 | ); |
182 | 182 | return array_values(array_filter( |
183 | 183 | $parts, |
184 | - function ($part) { |
|
184 | + function($part) { |
|
185 | 185 | return !( |
186 | 186 | $part->isTextPart() |
187 | 187 | && $part->getContentDisposition() === 'inline' |