@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | } |
93 | 93 | |
94 | - throw new MethodNotFoundException("Method " . self::class . '::' . $method . '() is not supported'); |
|
94 | + throw new MethodNotFoundException("Method ".self::class.'::'.$method.'() is not supported'); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -130,20 +130,20 @@ discard block |
||
130 | 130 | if (isset($this->attributes[$name]) && $strict === false) { |
131 | 131 | if ($this->attributize) { |
132 | 132 | $this->attributes[$name]->add($value, true); |
133 | - } else { |
|
133 | + }else { |
|
134 | 134 | if (isset($this->attributes[$name])) { |
135 | 135 | if (is_array($this->attributes[$name]) == false) { |
136 | 136 | $this->attributes[$name] = [$this->attributes[$name], $value]; |
137 | - } else { |
|
137 | + }else { |
|
138 | 138 | $this->attributes[$name][] = $value; |
139 | 139 | } |
140 | - } else { |
|
140 | + }else { |
|
141 | 141 | $this->attributes[$name] = $value; |
142 | 142 | } |
143 | 143 | } |
144 | 144 | } elseif ($this->attributize == false) { |
145 | 145 | $this->attributes[$name] = $value; |
146 | - } else { |
|
146 | + }else { |
|
147 | 147 | $this->attributes[$name] = new Attribute($name, $value); |
148 | 148 | } |
149 | 149 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | $headers = []; |
237 | 237 | $imap_headers = []; |
238 | 238 | if (extension_loaded('imap') && $this->config["rfc822"]) { |
239 | - $raw_imap_headers = (array)\imap_rfc822_parse_headers($this->raw); |
|
239 | + $raw_imap_headers = (array) \imap_rfc822_parse_headers($this->raw); |
|
240 | 240 | foreach ($raw_imap_headers as $key => $values) { |
241 | 241 | $key = str_replace("-", "_", $key); |
242 | 242 | $imap_headers[$key] = $values; |
@@ -264,11 +264,11 @@ discard block |
||
264 | 264 | } |
265 | 265 | if (is_array($headers[$prev_header])) { |
266 | 266 | $headers[$prev_header][] = $line; |
267 | - } else { |
|
267 | + }else { |
|
268 | 268 | $headers[$prev_header] .= $line; |
269 | 269 | } |
270 | 270 | } |
271 | - } else { |
|
271 | + }else { |
|
272 | 272 | if (($pos = strpos($line, ":")) > 0) { |
273 | 273 | $key = trim(rtrim(strtolower(substr($line, 0, $pos)))); |
274 | 274 | $key = str_replace("-", "_", $key); |
@@ -276,7 +276,7 @@ discard block |
||
276 | 276 | $value = trim(rtrim(substr($line, $pos + 1))); |
277 | 277 | if (isset($headers[$key])) { |
278 | 278 | $headers[$key][] = $value; |
279 | - } else { |
|
279 | + }else { |
|
280 | 280 | $headers[$key] = [$value]; |
281 | 281 | } |
282 | 282 | $prev_header = $key; |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | case 'reply_to': |
296 | 296 | case 'sender': |
297 | 297 | $value = $this->decodeAddresses($values); |
298 | - $headers[$key . "address"] = implode(", ", $values); |
|
298 | + $headers[$key."address"] = implode(", ", $values); |
|
299 | 299 | break; |
300 | 300 | case 'subject': |
301 | 301 | $value = implode(" ", $values); |
@@ -314,7 +314,7 @@ discard block |
||
314 | 314 | $value = implode(" ", $values); |
315 | 315 | } elseif ($available_values > 2) { |
316 | 316 | $value = array_values($values); |
317 | - } else { |
|
317 | + }else { |
|
318 | 318 | $value = ""; |
319 | 319 | } |
320 | 320 | } |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | $headers[$key] = $value; |
324 | 324 | } |
325 | 325 | |
326 | - return (object)array_merge($headers, $imap_headers); |
|
326 | + return (object) array_merge($headers, $imap_headers); |
|
327 | 327 | } |
328 | 328 | |
329 | 329 | /** |
@@ -339,7 +339,7 @@ discard block |
||
339 | 339 | return \imap_mime_header_decode($text); |
340 | 340 | } |
341 | 341 | $charset = $this->getEncoding($text); |
342 | - return [(object)[ |
|
342 | + return [(object) [ |
|
343 | 343 | "charset" => $charset, |
344 | 344 | "text" => $this->convertEncoding($text, $charset) |
345 | 345 | ]]; |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | try { |
394 | 394 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
395 | 395 | return iconv($from, $to, $str); |
396 | - } else { |
|
396 | + }else { |
|
397 | 397 | if (!$from) { |
398 | 398 | return mb_convert_encoding($str, $to); |
399 | 399 | } |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | if (strstr($from, '-')) { |
404 | 404 | $from = str_replace('-', '', $from); |
405 | 405 | return $this->convertEncoding($str, $from, $to); |
406 | - } else { |
|
406 | + }else { |
|
407 | 407 | return $str; |
408 | 408 | } |
409 | 409 | } |
@@ -507,7 +507,7 @@ discard block |
||
507 | 507 | */ |
508 | 508 | private function findPriority() { |
509 | 509 | if (($priority = $this->get("x_priority")) === null) return; |
510 | - switch ((int)"$priority") { |
|
510 | + switch ((int) "$priority") { |
|
511 | 511 | case IMAP::MESSAGE_PRIORITY_HIGHEST; |
512 | 512 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; |
513 | 513 | break; |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | if (isset($parsed_address['address'])) { |
547 | 547 | $mail_address = explode('@', $parsed_address['address']); |
548 | 548 | if (count($mail_address) == 2) { |
549 | - $addresses[] = (object)[ |
|
549 | + $addresses[] = (object) [ |
|
550 | 550 | "personal" => isset($parsed_address['display']) ? $parsed_address['display'] : '', |
551 | 551 | "mailbox" => $mail_address[0], |
552 | 552 | "host" => $mail_address[1], |
@@ -574,7 +574,7 @@ discard block |
||
574 | 574 | $name = trim(rtrim($matches["name"])); |
575 | 575 | $email = trim(rtrim($matches["email"])); |
576 | 576 | list($mailbox, $host) = array_pad(explode("@", $email), 2, null); |
577 | - $addresses[] = (object)[ |
|
577 | + $addresses[] = (object) [ |
|
578 | 578 | "personal" => $name, |
579 | 579 | "mailbox" => $mailbox, |
580 | 580 | "host" => $host, |
@@ -612,7 +612,7 @@ discard block |
||
612 | 612 | } |
613 | 613 | |
614 | 614 | foreach ($list as $item) { |
615 | - $address = (object)$item; |
|
615 | + $address = (object) $item; |
|
616 | 616 | |
617 | 617 | if (!property_exists($address, 'mailbox')) { |
618 | 618 | $address->mailbox = false; |
@@ -622,7 +622,7 @@ discard block |
||
622 | 622 | } |
623 | 623 | if (!property_exists($address, 'personal')) { |
624 | 624 | $address->personal = false; |
625 | - } else { |
|
625 | + }else { |
|
626 | 626 | $personalParts = $this->mime_header_decode($address->personal); |
627 | 627 | |
628 | 628 | if (is_array($personalParts)) { |
@@ -637,8 +637,8 @@ discard block |
||
637 | 637 | } |
638 | 638 | } |
639 | 639 | |
640 | - $address->mail = ($address->mailbox && $address->host) ? $address->mailbox . '@' . $address->host : false; |
|
641 | - $address->full = ($address->personal) ? $address->personal . ' <' . $address->mail . '>' : $address->mail; |
|
640 | + $address->mail = ($address->mailbox && $address->host) ? $address->mailbox.'@'.$address->host : false; |
|
641 | + $address->full = ($address->personal) ? $address->personal.' <'.$address->mail.'>' : $address->mail; |
|
642 | 642 | |
643 | 643 | $addresses[] = new Address($address); |
644 | 644 | } |
@@ -653,8 +653,8 @@ discard block |
||
653 | 653 | foreach ($this->attributes as $key => $value) { |
654 | 654 | if (is_array($value)) { |
655 | 655 | $value = implode(", ", $value); |
656 | - } else { |
|
657 | - $value = (string)$value; |
|
656 | + }else { |
|
657 | + $value = (string) $value; |
|
658 | 658 | } |
659 | 659 | // Only parse strings and don't parse any attributes like the user-agent |
660 | 660 | if (in_array($key, ["user_agent"]) === false) { |
@@ -735,8 +735,8 @@ discard block |
||
735 | 735 | $parsed_date = Carbon::parse($date); |
736 | 736 | } catch (\Exception $_e) { |
737 | 737 | if (!isset($this->config["fallback_date"])) { |
738 | - throw new InvalidMessageDateException("Invalid message date. ID:" . $this->get("message_id") . " Date:" . $header->date . "/" . $date, 1100, $e); |
|
739 | - } else { |
|
738 | + throw new InvalidMessageDateException("Invalid message date. ID:".$this->get("message_id")." Date:".$header->date."/".$date, 1100, $e); |
|
739 | + }else { |
|
740 | 740 | $parsed_date = Carbon::parse($this->config["fallback_date"]); |
741 | 741 | } |
742 | 742 | } |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | * |
160 | 160 | * @throws InvalidMessageDateException |
161 | 161 | */ |
162 | - protected function parse(){ |
|
162 | + protected function parse() { |
|
163 | 163 | if ($this->header === null) { |
164 | 164 | $body = $this->findHeaders(); |
165 | - }else{ |
|
165 | + }else { |
|
166 | 166 | $body = $this->raw; |
167 | 167 | } |
168 | 168 | |
@@ -174,11 +174,11 @@ discard block |
||
174 | 174 | $this->name = $this->header->get("name"); |
175 | 175 | $this->filename = $this->header->get("filename"); |
176 | 176 | |
177 | - if(!empty($this->header->get("id"))) { |
|
177 | + if (!empty($this->header->get("id"))) { |
|
178 | 178 | $this->id = $this->header->get("id"); |
179 | - } else if(!empty($this->header->get("x_attachment_id"))){ |
|
179 | + }else if (!empty($this->header->get("x_attachment_id"))) { |
|
180 | 180 | $this->id = $this->header->get("x_attachment_id"); |
181 | - } else if(!empty($this->header->get("content_id"))){ |
|
181 | + }else if (!empty($this->header->get("content_id"))) { |
|
182 | 182 | $this->id = strtr($this->header->get("content_id"), [ |
183 | 183 | '<' => '', |
184 | 184 | '>' => '' |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | $content_types = $this->header->get("content_type"); |
189 | - if(!empty($content_types)){ |
|
189 | + if (!empty($content_types)) { |
|
190 | 190 | $this->subtype = $this->parseSubtype($content_types); |
191 | 191 | $content_type = $content_types; |
192 | 192 | if (is_array($content_types)) { |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | * @return string |
208 | 208 | * @throws InvalidMessageDateException |
209 | 209 | */ |
210 | - private function findHeaders(){ |
|
210 | + private function findHeaders() { |
|
211 | 211 | $body = $this->raw; |
212 | 212 | while (($pos = strpos($body, "\r\n")) > 0) { |
213 | 213 | $body = substr($body, $pos + 2); |
@@ -226,16 +226,16 @@ discard block |
||
226 | 226 | * |
227 | 227 | * @return string |
228 | 228 | */ |
229 | - private function parseSubtype($content_type){ |
|
229 | + private function parseSubtype($content_type) { |
|
230 | 230 | if (is_array($content_type)) { |
231 | - foreach ($content_type as $part){ |
|
232 | - if ((strpos($part, "/")) !== false){ |
|
231 | + foreach ($content_type as $part) { |
|
232 | + if ((strpos($part, "/")) !== false) { |
|
233 | 233 | return $this->parseSubtype($part); |
234 | 234 | } |
235 | 235 | } |
236 | 236 | return null; |
237 | 237 | } |
238 | - if (($pos = strpos($content_type, "/")) !== false){ |
|
238 | + if (($pos = strpos($content_type, "/")) !== false) { |
|
239 | 239 | return substr($content_type, $pos + 1); |
240 | 240 | } |
241 | 241 | return null; |
@@ -244,9 +244,9 @@ discard block |
||
244 | 244 | /** |
245 | 245 | * Try to parse the disposition if any is present |
246 | 246 | */ |
247 | - private function parseDisposition(){ |
|
247 | + private function parseDisposition() { |
|
248 | 248 | $content_disposition = $this->header->get("content_disposition"); |
249 | - if($content_disposition !== null) { |
|
249 | + if ($content_disposition !== null) { |
|
250 | 250 | $this->ifdisposition = true; |
251 | 251 | $this->disposition = (is_array($content_disposition)) ? implode(' ', $content_disposition) : $content_disposition; |
252 | 252 | } |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | /** |
256 | 256 | * Try to parse the description if any is present |
257 | 257 | */ |
258 | - private function parseDescription(){ |
|
258 | + private function parseDescription() { |
|
259 | 259 | $content_description = $this->header->get("content_description"); |
260 | - if($content_description !== null) { |
|
260 | + if ($content_description !== null) { |
|
261 | 261 | $this->ifdescription = true; |
262 | 262 | $this->description = $content_description; |
263 | 263 | } |
@@ -266,9 +266,9 @@ discard block |
||
266 | 266 | /** |
267 | 267 | * Try to parse the encoding if any is present |
268 | 268 | */ |
269 | - private function parseEncoding(){ |
|
269 | + private function parseEncoding() { |
|
270 | 270 | $encoding = $this->header->get("content_transfer_encoding"); |
271 | - if($encoding !== null) { |
|
271 | + if ($encoding !== null) { |
|
272 | 272 | switch (strtolower($encoding)) { |
273 | 273 | case "quoted-printable": |
274 | 274 | $this->encoding = IMAP::MESSAGE_ENC_QUOTED_PRINTABLE; |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | * |
299 | 299 | * @return bool |
300 | 300 | */ |
301 | - public function isAttachment(){ |
|
301 | + public function isAttachment() { |
|
302 | 302 | $valid_disposition = in_array(strtolower($this->disposition ?? ''), ClientManager::get('options.dispositions')); |
303 | 303 | |
304 | 304 | if ($this->type == IMAP::MESSAGE_TYPE_TEXT && ($this->ifdisposition == 0 || empty($this->disposition) || !$valid_disposition)) { |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | * |
58 | 58 | * @return string |
59 | 59 | */ |
60 | - public function toString(){ |
|
60 | + public function toString() { |
|
61 | 61 | return $this->__toString(); |
62 | 62 | } |
63 | 63 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @return array |
68 | 68 | */ |
69 | - public function toArray(){ |
|
69 | + public function toArray() { |
|
70 | 70 | return $this->values; |
71 | 71 | } |
72 | 72 | |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * |
76 | 76 | * @return Carbon|null |
77 | 77 | */ |
78 | - public function toDate(){ |
|
78 | + public function toDate() { |
|
79 | 79 | $date = $this->first(); |
80 | 80 | if ($date instanceof Carbon) return $date; |
81 | 81 | |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | public function offsetSet($key, $value): void { |
114 | 114 | if (is_null($key)) { |
115 | 115 | $this->values[] = $value; |
116 | - } else { |
|
116 | + }else { |
|
117 | 117 | $this->values[$key] = $value; |
118 | 118 | } |
119 | 119 | } |
@@ -187,7 +187,7 @@ discard block |
||
187 | 187 | if ($this->contains($value) === false) { |
188 | 188 | $this->values[] = $value; |
189 | 189 | } |
190 | - }else{ |
|
190 | + }else { |
|
191 | 191 | $this->values[] = $value; |
192 | 192 | } |
193 | 193 | } |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | * |
199 | 199 | * @return Attribute |
200 | 200 | */ |
201 | - public function setName($name){ |
|
201 | + public function setName($name) { |
|
202 | 202 | $this->name = $name; |
203 | 203 | |
204 | 204 | return $this; |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | * |
210 | 210 | * @return string |
211 | 211 | */ |
212 | - public function getName(){ |
|
212 | + public function getName() { |
|
213 | 213 | return $this->name; |
214 | 214 | } |
215 | 215 | |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | * |
219 | 219 | * @return array |
220 | 220 | */ |
221 | - public function get(){ |
|
221 | + public function get() { |
|
222 | 222 | return $this->values; |
223 | 223 | } |
224 | 224 | |
@@ -227,7 +227,7 @@ discard block |
||
227 | 227 | * |
228 | 228 | * @return array |
229 | 229 | */ |
230 | - public function all(){ |
|
230 | + public function all() { |
|
231 | 231 | return $this->get(); |
232 | 232 | } |
233 | 233 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * |
237 | 237 | * @return mixed|null |
238 | 238 | */ |
239 | - public function first(){ |
|
239 | + public function first() { |
|
240 | 240 | if ($this->offsetExists(0)) { |
241 | 241 | return $this->values[0]; |
242 | 242 | } |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | * |
249 | 249 | * @return mixed|null |
250 | 250 | */ |
251 | - public function last(){ |
|
251 | + public function last() { |
|
252 | 252 | if (($cnt = $this->count()) > 0) { |
253 | 253 | return $this->values[$cnt - 1]; |
254 | 254 | } |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | * |
261 | 261 | * @return int |
262 | 262 | */ |
263 | - public function count(){ |
|
263 | + public function count() { |
|
264 | 264 | return count($this->values); |
265 | 265 | } |
266 | 266 | } |
267 | 267 | \ No newline at end of file |