@@ -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) { |
@@ -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 | } |
@@ -58,7 +58,7 @@ |
||
58 | 58 | * Filters the lines in the passed $lines array, returning a concatenated |
59 | 59 | * string of decoded lines. |
60 | 60 | * |
61 | - * @param array $lines |
|
61 | + * @param string[] $lines |
|
62 | 62 | * @param int $consumed |
63 | 63 | * @return string |
64 | 64 | */ |
@@ -46,7 +46,7 @@ |
||
46 | 46 | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY |
47 | 47 | ); |
48 | 48 | if ($this->leftover !== '') { |
49 | - $lines[0] = $this->leftover . $lines[0]; |
|
49 | + $lines[0] = $this->leftover.$lines[0]; |
|
50 | 50 | $this->leftover = ''; |
51 | 51 | } |
52 | 52 | $last = end($lines); |
@@ -47,7 +47,7 @@ |
||
47 | 47 | { |
48 | 48 | $raw = preg_replace('/\s+/', '', $bucket->data); |
49 | 49 | if ($this->leftover !== '') { |
50 | - $raw = $this->leftover . $raw; |
|
50 | + $raw = $this->leftover.$raw; |
|
51 | 51 | $this->leftover = ''; |
52 | 52 | } |
53 | 53 | $nLeftover = strlen($raw) % 4; |
@@ -63,6 +63,6 @@ |
||
63 | 63 | protected function getTokenSplitPattern() |
64 | 64 | { |
65 | 65 | $sChars = implode('|', $this->getAllTokenSeparators()); |
66 | - return '~(' . $sChars . ')~'; |
|
66 | + return '~('.$sChars.')~'; |
|
67 | 67 | } |
68 | 68 | } |
@@ -170,7 +170,7 @@ |
||
170 | 170 | * |
171 | 171 | * @param string $name Name of the member variable |
172 | 172 | * @param string $value The value to test |
173 | - * @param array $valid an array of valid values |
|
173 | + * @param integer[] $valid an array of valid values |
|
174 | 174 | * @throws InvalidArgumentException |
175 | 175 | */ |
176 | 176 | private function validateArgument($name, $value, array $valid) |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | */ |
157 | 157 | public function __construct(array $filter = []) |
158 | 158 | { |
159 | - $params = [ 'multipart', 'textpart', 'signedpart', 'headers' ]; |
|
159 | + $params = ['multipart', 'textpart', 'signedpart', 'headers']; |
|
160 | 160 | foreach ($params as $param) { |
161 | 161 | if (isset($filter[$param])) { |
162 | 162 | $this->__set($param, $filter[$param]); |
@@ -178,8 +178,8 @@ discard block |
||
178 | 178 | if (!in_array($value, $valid)) { |
179 | 179 | $last = array_pop($valid); |
180 | 180 | throw new InvalidArgumentException( |
181 | - '$value parameter for ' . $name . ' must be one of ' |
|
182 | - . join(', ', $valid) . ' or ' . $last . ' - "' . $value |
|
181 | + '$value parameter for '.$name.' must be one of ' |
|
182 | + . join(', ', $valid).' or '.$last.' - "'.$value |
|
183 | 183 | . '" provided' |
184 | 184 | ); |
185 | 185 | } |
@@ -194,11 +194,11 @@ discard block |
||
194 | 194 | */ |
195 | 195 | public function setHeaders(array $headers) |
196 | 196 | { |
197 | - array_walk($headers, function ($v, $k) { |
|
197 | + array_walk($headers, function($v, $k) { |
|
198 | 198 | $this->validateArgument( |
199 | 199 | 'headers', |
200 | 200 | $k, |
201 | - [ static::FILTER_EXCLUDE, static::FILTER_INCLUDE ] |
|
201 | + [static::FILTER_EXCLUDE, static::FILTER_INCLUDE] |
|
202 | 202 | ); |
203 | 203 | if (!is_array($v)) { |
204 | 204 | throw new InvalidArgumentException( |
@@ -225,7 +225,7 @@ discard block |
||
225 | 225 | $this->validateArgument( |
226 | 226 | $name, |
227 | 227 | $value, |
228 | - [ static::FILTER_OFF, static::FILTER_EXCLUDE, static::FILTER_INCLUDE ] |
|
228 | + [static::FILTER_OFF, static::FILTER_EXCLUDE, static::FILTER_INCLUDE] |
|
229 | 229 | ); |
230 | 230 | $this->$name = $value; |
231 | 231 | } elseif ($name === 'headers') { |
@@ -166,7 +166,7 @@ |
||
166 | 166 | { |
167 | 167 | $sChars = implode('|', $this->getAllTokenSeparators()); |
168 | 168 | $mimePartPattern = MimeLiteralPart::MIME_PART_PATTERN; |
169 | - return '~(' . $mimePartPattern . '|\\\\.|' . $sChars . ')~'; |
|
169 | + return '~('.$mimePartPattern.'|\\\\.|'.$sChars.')~'; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
@@ -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( |
@@ -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 | { |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | { |
168 | 168 | return $this->getInstance( |
169 | 169 | 'partFilterFactory', |
170 | - __NAMESPACE__ . '\Message\PartFilterFactory' |
|
170 | + __NAMESPACE__.'\Message\PartFilterFactory' |
|
171 | 171 | ); |
172 | 172 | } |
173 | 173 | |
@@ -223,7 +223,7 @@ discard block |
||
223 | 223 | } |
224 | 224 | return $this->getInstance( |
225 | 225 | 'partStreamFilterManagerFactory', |
226 | - __NAMESPACE__ . '\Message\Part\PartStreamFilterManagerFactory' |
|
226 | + __NAMESPACE__.'\Message\Part\PartStreamFilterManagerFactory' |
|
227 | 227 | ); |
228 | 228 | } |
229 | 229 | |
@@ -238,7 +238,7 @@ discard block |
||
238 | 238 | if ($this->partStreamRegistry === null) { |
239 | 239 | $this->registerStreamExtensions(); |
240 | 240 | } |
241 | - return $this->getInstance('partStreamRegistry', __NAMESPACE__ . '\Stream\PartStreamRegistry'); |
|
241 | + return $this->getInstance('partStreamRegistry', __NAMESPACE__.'\Stream\PartStreamRegistry'); |
|
242 | 242 | } |
243 | 243 | |
244 | 244 | public function getCharsetConverter() |
@@ -297,9 +297,9 @@ discard block |
||
297 | 297 | protected function registerStreamExtensions() |
298 | 298 | { |
299 | 299 | stream_filter_register( |
300 | - UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\UUDecodeStreamFilter'); |
|
301 | - stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__ . '\Stream\CharsetStreamFilter'); |
|
302 | - stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__ . '\Stream\PartStream'); |
|
300 | + UUDecodeStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\UUDecodeStreamFilter'); |
|
301 | + stream_filter_register(CharsetStreamFilter::STREAM_FILTER_NAME, __NAMESPACE__.'\Stream\CharsetStreamFilter'); |
|
302 | + stream_wrapper_register(PartStream::STREAM_WRAPPER_PROTOCOL, __NAMESPACE__.'\Stream\PartStream'); |
|
303 | 303 | |
304 | 304 | // originally created for HHVM compatibility, but decided to use them |
305 | 305 | // instead of built-in stream filters for reliability -- it seems the |
@@ -313,11 +313,11 @@ discard block |
||
313 | 313 | // filters, so now they're all named mmp-convert.* |
314 | 314 | stream_filter_register( |
315 | 315 | ConvertStreamFilter::STREAM_DECODER_FILTER_NAME, |
316 | - __NAMESPACE__ . '\Stream\ConvertStreamFilter' |
|
316 | + __NAMESPACE__.'\Stream\ConvertStreamFilter' |
|
317 | 317 | ); |
318 | 318 | stream_filter_register( |
319 | 319 | Base64DecodeStreamFilter::STREAM_FILTER_NAME, |
320 | - __NAMESPACE__ . '\Stream\Base64DecodeStreamFilter' |
|
320 | + __NAMESPACE__.'\Stream\Base64DecodeStreamFilter' |
|
321 | 321 | ); |
322 | 322 | } |
323 | 323 | } |