@@ -305,7 +305,7 @@ discard block |
||
305 | 305 | if(strtolower(substr($method, 0, 3)) === 'get') { |
306 | 306 | $name = Str::snake(substr($method, 3)); |
307 | 307 | return $this->get($name); |
308 | - }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
308 | + } elseif (strtolower(substr($method, 0, 3)) === 'set') { |
|
309 | 309 | $name = Str::snake(substr($method, 3)); |
310 | 310 | |
311 | 311 | if(in_array($name, array_keys($this->attributes))) { |
@@ -508,7 +508,7 @@ discard block |
||
508 | 508 | if ($this->getFlags()->get("seen") == null) { |
509 | 509 | $this->unsetFlag("Seen"); |
510 | 510 | } |
511 | - }elseif ($this->getFlags()->get("seen") != null) { |
|
511 | + } elseif ($this->getFlags()->get("seen") != null) { |
|
512 | 512 | $this->setFlag("Seen"); |
513 | 513 | } |
514 | 514 | } |
@@ -550,7 +550,7 @@ discard block |
||
550 | 550 | private function fetchPart(Part $part) { |
551 | 551 | if ($part->isAttachment()) { |
552 | 552 | $this->fetchAttachment($part); |
553 | - }else{ |
|
553 | + } else{ |
|
554 | 554 | $encoding = $this->getEncoding($part); |
555 | 555 | |
556 | 556 | $content = $this->decodeString($part->content, $part->encoding); |
@@ -742,9 +742,9 @@ discard block |
||
742 | 742 | return EncodingAliases::get($parameter->value); |
743 | 743 | } |
744 | 744 | } |
745 | - }elseif (property_exists($structure, 'charset')){ |
|
745 | + } elseif (property_exists($structure, 'charset')){ |
|
746 | 746 | return EncodingAliases::get($structure->charset); |
747 | - }elseif (is_string($structure) === true){ |
|
747 | + } elseif (is_string($structure) === true){ |
|
748 | 748 | return mb_detect_encoding($structure); |
749 | 749 | } |
750 | 750 | |
@@ -924,13 +924,15 @@ discard block |
||
924 | 924 | * @throws MessageHeaderFetchingException |
925 | 925 | */ |
926 | 926 | protected function fetchNewMail($folder, $next_uid, $event, $expunge){ |
927 | - if($expunge) $this->client->expunge(); |
|
927 | + if($expunge) { |
|
928 | + $this->client->expunge(); |
|
929 | + } |
|
928 | 930 | |
929 | 931 | $this->client->openFolder($folder->path); |
930 | 932 | |
931 | 933 | if ($this->sequence === IMAP::ST_UID) { |
932 | 934 | $sequence_id = $next_uid; |
933 | - }else{ |
|
935 | + } else{ |
|
934 | 936 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
935 | 937 | } |
936 | 938 | |
@@ -952,7 +954,9 @@ discard block |
||
952 | 954 | */ |
953 | 955 | public function delete($expunge = true) { |
954 | 956 | $status = $this->setFlag("Deleted"); |
955 | - if($expunge) $this->client->expunge(); |
|
957 | + if($expunge) { |
|
958 | + $this->client->expunge(); |
|
959 | + } |
|
956 | 960 | |
957 | 961 | $event = $this->getEvent("message", "deleted"); |
958 | 962 | $event::dispatch($this); |
@@ -971,7 +975,9 @@ discard block |
||
971 | 975 | */ |
972 | 976 | public function restore($expunge = true) { |
973 | 977 | $status = $this->unsetFlag("Deleted"); |
974 | - if($expunge) $this->client->expunge(); |
|
978 | + if($expunge) { |
|
979 | + $this->client->expunge(); |
|
980 | + } |
|
975 | 981 | |
976 | 982 | $event = $this->getEvent("message", "restored"); |
977 | 983 | $event::dispatch($this); |
@@ -1384,7 +1390,7 @@ discard block |
||
1384 | 1390 | if ($this->getSequence() === IMAP::ST_UID) { |
1385 | 1391 | $this->setUid($uid); |
1386 | 1392 | $this->setMsglist($msglist); |
1387 | - }else{ |
|
1393 | + } else{ |
|
1388 | 1394 | $this->setMsgn($uid, $msglist); |
1389 | 1395 | } |
1390 | 1396 | } |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false, $sequence = null) { |
203 | 203 | |
204 | 204 | $default_mask = $client->getDefaultMessageMask(); |
205 | - if($default_mask != null) { |
|
205 | + if ($default_mask != null) { |
|
206 | 206 | $this->mask = $default_mask; |
207 | 207 | } |
208 | 208 | $this->events["message"] = $client->getDefaultEvents("message"); |
@@ -261,13 +261,13 @@ discard block |
||
261 | 261 | * @throws MessageFlagException |
262 | 262 | * @throws Exceptions\RuntimeException |
263 | 263 | */ |
264 | - public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null){ |
|
264 | + public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null) { |
|
265 | 265 | $reflection = new \ReflectionClass(self::class); |
266 | 266 | /** @var self $instance */ |
267 | 267 | $instance = $reflection->newInstanceWithoutConstructor(); |
268 | 268 | |
269 | 269 | $default_mask = $client->getDefaultMessageMask(); |
270 | - if($default_mask != null) { |
|
270 | + if ($default_mask != null) { |
|
271 | 271 | $instance->setMask($default_mask); |
272 | 272 | } |
273 | 273 | $instance->setEvents([ |
@@ -302,13 +302,13 @@ discard block |
||
302 | 302 | * @throws MethodNotFoundException |
303 | 303 | */ |
304 | 304 | public function __call($method, $arguments) { |
305 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
305 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
306 | 306 | $name = Str::snake(substr($method, 3)); |
307 | 307 | return $this->get($name); |
308 | 308 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
309 | 309 | $name = Str::snake(substr($method, 3)); |
310 | 310 | |
311 | - if(in_array($name, array_keys($this->attributes))) { |
|
311 | + if (in_array($name, array_keys($this->attributes))) { |
|
312 | 312 | return $this->__set($name, array_pop($arguments)); |
313 | 313 | } |
314 | 314 | |
@@ -347,7 +347,7 @@ discard block |
||
347 | 347 | * @return mixed|null |
348 | 348 | */ |
349 | 349 | public function get($name) { |
350 | - if(isset($this->attributes[$name])) { |
|
350 | + if (isset($this->attributes[$name])) { |
|
351 | 351 | return $this->attributes[$name]; |
352 | 352 | } |
353 | 353 | |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | * |
422 | 422 | * @throws InvalidMessageDateException |
423 | 423 | */ |
424 | - public function parseRawHeader($raw_header){ |
|
424 | + public function parseRawHeader($raw_header) { |
|
425 | 425 | $this->header = new Header($raw_header); |
426 | 426 | } |
427 | 427 | |
@@ -432,8 +432,8 @@ discard block |
||
432 | 432 | public function parseRawFlags($raw_flags) { |
433 | 433 | $this->flags = FlagCollection::make([]); |
434 | 434 | |
435 | - foreach($raw_flags as $flag) { |
|
436 | - if (strpos($flag, "\\") === 0){ |
|
435 | + foreach ($raw_flags as $flag) { |
|
436 | + if (strpos($flag, "\\") === 0) { |
|
437 | 437 | $flag = substr($flag, 1); |
438 | 438 | } |
439 | 439 | $flag_key = strtolower($flag); |
@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | * @throws MessageFlagException |
507 | 507 | * @throws Exceptions\RuntimeException |
508 | 508 | */ |
509 | - public function peek(){ |
|
509 | + public function peek() { |
|
510 | 510 | if ($this->fetch_options == IMAP::FT_PEEK) { |
511 | 511 | if ($this->getFlags()->get("seen") == null) { |
512 | 512 | $this->unsetFlag("Seen"); |
@@ -555,7 +555,7 @@ discard block |
||
555 | 555 | private function fetchPart(Part $part) { |
556 | 556 | if ($part->isAttachment()) { |
557 | 557 | $this->fetchAttachment($part); |
558 | - }else{ |
|
558 | + }else { |
|
559 | 559 | $encoding = $this->getEncoding($part); |
560 | 560 | |
561 | 561 | $content = $this->decodeString($part->content, $part->encoding); |
@@ -592,7 +592,7 @@ discard block |
||
592 | 592 | if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) { |
593 | 593 | if ($oAttachment->getId() !== null) { |
594 | 594 | $this->attachments->put($oAttachment->getId(), $oAttachment); |
595 | - } else { |
|
595 | + }else { |
|
596 | 596 | $this->attachments->push($oAttachment); |
597 | 597 | } |
598 | 598 | } |
@@ -726,7 +726,7 @@ discard block |
||
726 | 726 | |
727 | 727 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
728 | 728 | return @iconv($from, $to.'//IGNORE', $str); |
729 | - } else { |
|
729 | + }else { |
|
730 | 730 | if (!$from) { |
731 | 731 | return mb_convert_encoding($str, $to); |
732 | 732 | } |
@@ -747,9 +747,9 @@ discard block |
||
747 | 747 | return EncodingAliases::get($parameter->value); |
748 | 748 | } |
749 | 749 | } |
750 | - }elseif (property_exists($structure, 'charset')){ |
|
750 | + }elseif (property_exists($structure, 'charset')) { |
|
751 | 751 | return EncodingAliases::get($structure->charset); |
752 | - }elseif (is_string($structure) === true){ |
|
752 | + }elseif (is_string($structure) === true) { |
|
753 | 753 | return mb_detect_encoding($structure); |
754 | 754 | } |
755 | 755 | |
@@ -764,7 +764,7 @@ discard block |
||
764 | 764 | * @throws Exceptions\FolderFetchingException |
765 | 765 | * @throws Exceptions\RuntimeException |
766 | 766 | */ |
767 | - public function getFolder(){ |
|
767 | + public function getFolder() { |
|
768 | 768 | return $this->client->getFolder($this->folder_path); |
769 | 769 | } |
770 | 770 | |
@@ -780,13 +780,13 @@ discard block |
||
780 | 780 | * @throws Exceptions\GetMessagesFailedException |
781 | 781 | * @throws Exceptions\RuntimeException |
782 | 782 | */ |
783 | - public function thread($sent_folder = null, &$thread = null, $folder = null){ |
|
783 | + public function thread($sent_folder = null, &$thread = null, $folder = null) { |
|
784 | 784 | $thread = $thread ? $thread : MessageCollection::make([]); |
785 | - $folder = $folder ? $folder : $this->getFolder(); |
|
785 | + $folder = $folder ? $folder : $this->getFolder(); |
|
786 | 786 | $sent_folder = $sent_folder ? $sent_folder : $this->client->getFolder(ClientManager::get("options.common_folders.sent", "INBOX/Sent")); |
787 | 787 | |
788 | 788 | /** @var Message $message */ |
789 | - foreach($thread as $message) { |
|
789 | + foreach ($thread as $message) { |
|
790 | 790 | if ($message->message_id == $this->message_id) { |
791 | 791 | return $thread; |
792 | 792 | } |
@@ -797,7 +797,7 @@ discard block |
||
797 | 797 | $this->fetchThreadByInReplyTo($thread, $this->message_id, $sent_folder, $folder, $sent_folder); |
798 | 798 | |
799 | 799 | if (is_array($this->in_reply_to)) { |
800 | - foreach($this->in_reply_to as $in_reply_to) { |
|
800 | + foreach ($this->in_reply_to as $in_reply_to) { |
|
801 | 801 | $this->fetchThreadByMessageId($thread, $in_reply_to, $folder, $folder, $sent_folder); |
802 | 802 | $this->fetchThreadByMessageId($thread, $in_reply_to, $sent_folder, $folder, $sent_folder); |
803 | 803 | } |
@@ -818,7 +818,7 @@ discard block |
||
818 | 818 | * @throws Exceptions\GetMessagesFailedException |
819 | 819 | * @throws Exceptions\RuntimeException |
820 | 820 | */ |
821 | - protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder){ |
|
821 | + protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder) { |
|
822 | 822 | $primary_folder->query()->inReplyTo($in_reply_to) |
823 | 823 | ->setFetchBody($this->getFetchBodyOption()) |
824 | 824 | ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){ |
@@ -839,7 +839,7 @@ discard block |
||
839 | 839 | * @throws Exceptions\GetMessagesFailedException |
840 | 840 | * @throws Exceptions\RuntimeException |
841 | 841 | */ |
842 | - protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder){ |
|
842 | + protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder) { |
|
843 | 843 | $primary_folder->query()->messageId($message_id) |
844 | 844 | ->setFetchBody($this->getFetchBodyOption()) |
845 | 845 | ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){ |
@@ -932,14 +932,14 @@ discard block |
||
932 | 932 | * @throws MessageFlagException |
933 | 933 | * @throws MessageHeaderFetchingException |
934 | 934 | */ |
935 | - protected function fetchNewMail($folder, $next_uid, $event, $expunge){ |
|
936 | - if($expunge) $this->client->expunge(); |
|
935 | + protected function fetchNewMail($folder, $next_uid, $event, $expunge) { |
|
936 | + if ($expunge) $this->client->expunge(); |
|
937 | 937 | |
938 | 938 | $this->client->openFolder($folder->path); |
939 | 939 | |
940 | 940 | if ($this->sequence === IMAP::ST_UID) { |
941 | 941 | $sequence_id = $next_uid; |
942 | - }else{ |
|
942 | + }else { |
|
943 | 943 | $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid); |
944 | 944 | } |
945 | 945 | |
@@ -962,7 +962,7 @@ discard block |
||
962 | 962 | */ |
963 | 963 | public function delete($expunge = true) { |
964 | 964 | $status = $this->setFlag("Deleted"); |
965 | - if($expunge) $this->client->expunge(); |
|
965 | + if ($expunge) $this->client->expunge(); |
|
966 | 966 | |
967 | 967 | $event = $this->getEvent("message", "deleted"); |
968 | 968 | $event::dispatch($this); |
@@ -982,7 +982,7 @@ discard block |
||
982 | 982 | */ |
983 | 983 | public function restore($expunge = true) { |
984 | 984 | $status = $this->unsetFlag("Deleted"); |
985 | - if($expunge) $this->client->expunge(); |
|
985 | + if ($expunge) $this->client->expunge(); |
|
986 | 986 | |
987 | 987 | $event = $this->getEvent("message", "restored"); |
988 | 988 | $event::dispatch($this); |
@@ -1087,7 +1087,7 @@ discard block |
||
1087 | 1087 | * |
1088 | 1088 | * @return AttachmentCollection |
1089 | 1089 | */ |
1090 | - public function attachments(){ |
|
1090 | + public function attachments() { |
|
1091 | 1091 | return $this->getAttachments(); |
1092 | 1092 | } |
1093 | 1093 | |
@@ -1185,7 +1185,7 @@ discard block |
||
1185 | 1185 | * |
1186 | 1186 | * @return FlagCollection |
1187 | 1187 | */ |
1188 | - public function flags(){ |
|
1188 | + public function flags() { |
|
1189 | 1189 | return $this->getFlags(); |
1190 | 1190 | } |
1191 | 1191 | |
@@ -1194,7 +1194,7 @@ discard block |
||
1194 | 1194 | * |
1195 | 1195 | * @return Structure|null |
1196 | 1196 | */ |
1197 | - public function getStructure(){ |
|
1197 | + public function getStructure() { |
|
1198 | 1198 | return $this->structure; |
1199 | 1199 | } |
1200 | 1200 | |
@@ -1220,7 +1220,7 @@ discard block |
||
1220 | 1220 | * |
1221 | 1221 | * @return array |
1222 | 1222 | */ |
1223 | - public function getAttributes(){ |
|
1223 | + public function getAttributes() { |
|
1224 | 1224 | return array_merge($this->attributes, $this->header->getAttributes()); |
1225 | 1225 | } |
1226 | 1226 | |
@@ -1230,8 +1230,8 @@ discard block |
||
1230 | 1230 | * |
1231 | 1231 | * @return $this |
1232 | 1232 | */ |
1233 | - public function setMask($mask){ |
|
1234 | - if(class_exists($mask)){ |
|
1233 | + public function setMask($mask) { |
|
1234 | + if (class_exists($mask)) { |
|
1235 | 1235 | $this->mask = $mask; |
1236 | 1236 | } |
1237 | 1237 | |
@@ -1243,7 +1243,7 @@ discard block |
||
1243 | 1243 | * |
1244 | 1244 | * @return string |
1245 | 1245 | */ |
1246 | - public function getMask(){ |
|
1246 | + public function getMask() { |
|
1247 | 1247 | return $this->mask; |
1248 | 1248 | } |
1249 | 1249 | |
@@ -1254,9 +1254,9 @@ discard block |
||
1254 | 1254 | * @return mixed |
1255 | 1255 | * @throws MaskNotFoundException |
1256 | 1256 | */ |
1257 | - public function mask($mask = null){ |
|
1257 | + public function mask($mask = null) { |
|
1258 | 1258 | $mask = $mask !== null ? $mask : $this->mask; |
1259 | - if(class_exists($mask)){ |
|
1259 | + if (class_exists($mask)) { |
|
1260 | 1260 | return new $mask($this); |
1261 | 1261 | } |
1262 | 1262 | |
@@ -1269,7 +1269,7 @@ discard block |
||
1269 | 1269 | * |
1270 | 1270 | * @return $this |
1271 | 1271 | */ |
1272 | - public function setFolderPath($folder_path){ |
|
1272 | + public function setFolderPath($folder_path) { |
|
1273 | 1273 | $this->folder_path = $folder_path; |
1274 | 1274 | |
1275 | 1275 | return $this; |
@@ -1281,7 +1281,7 @@ discard block |
||
1281 | 1281 | * |
1282 | 1282 | * @return $this |
1283 | 1283 | */ |
1284 | - public function setConfig($config){ |
|
1284 | + public function setConfig($config) { |
|
1285 | 1285 | $this->config = $config; |
1286 | 1286 | |
1287 | 1287 | return $this; |
@@ -1293,7 +1293,7 @@ discard block |
||
1293 | 1293 | * |
1294 | 1294 | * @return $this |
1295 | 1295 | */ |
1296 | - public function setAvailableFlags($available_flags){ |
|
1296 | + public function setAvailableFlags($available_flags) { |
|
1297 | 1297 | $this->available_flags = $available_flags; |
1298 | 1298 | |
1299 | 1299 | return $this; |
@@ -1305,7 +1305,7 @@ discard block |
||
1305 | 1305 | * |
1306 | 1306 | * @return $this |
1307 | 1307 | */ |
1308 | - public function setAttachments($attachments){ |
|
1308 | + public function setAttachments($attachments) { |
|
1309 | 1309 | $this->attachments = $attachments; |
1310 | 1310 | |
1311 | 1311 | return $this; |
@@ -1317,7 +1317,7 @@ discard block |
||
1317 | 1317 | * |
1318 | 1318 | * @return $this |
1319 | 1319 | */ |
1320 | - public function setFlags($flags){ |
|
1320 | + public function setFlags($flags) { |
|
1321 | 1321 | $this->flags = $flags; |
1322 | 1322 | |
1323 | 1323 | return $this; |
@@ -1331,7 +1331,7 @@ discard block |
||
1331 | 1331 | * @throws Exceptions\RuntimeException |
1332 | 1332 | * @throws Exceptions\ConnectionFailedException |
1333 | 1333 | */ |
1334 | - public function setClient($client){ |
|
1334 | + public function setClient($client) { |
|
1335 | 1335 | $this->client = $client; |
1336 | 1336 | $this->client->openFolder($this->folder_path); |
1337 | 1337 | |
@@ -1346,7 +1346,7 @@ discard block |
||
1346 | 1346 | * @throws Exceptions\RuntimeException |
1347 | 1347 | * @return $this |
1348 | 1348 | */ |
1349 | - public function setUid($uid){ |
|
1349 | + public function setUid($uid) { |
|
1350 | 1350 | $this->uid = $uid; |
1351 | 1351 | $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid); |
1352 | 1352 | $this->msglist = null; |
@@ -1363,7 +1363,7 @@ discard block |
||
1363 | 1363 | * @throws Exceptions\RuntimeException |
1364 | 1364 | * @return $this |
1365 | 1365 | */ |
1366 | - public function setMsgn($msgn, $msglist = null){ |
|
1366 | + public function setMsgn($msgn, $msglist = null) { |
|
1367 | 1367 | $this->msgn = $msgn; |
1368 | 1368 | $this->msglist = $msglist; |
1369 | 1369 | $this->uid = $this->client->getConnection()->getUid($this->msgn); |
@@ -1376,7 +1376,7 @@ discard block |
||
1376 | 1376 | * |
1377 | 1377 | * @return int |
1378 | 1378 | */ |
1379 | - public function getSequence(){ |
|
1379 | + public function getSequence() { |
|
1380 | 1380 | return $this->sequence; |
1381 | 1381 | } |
1382 | 1382 | |
@@ -1385,7 +1385,7 @@ discard block |
||
1385 | 1385 | * |
1386 | 1386 | * @return int |
1387 | 1387 | */ |
1388 | - public function getSequenceId(){ |
|
1388 | + public function getSequenceId() { |
|
1389 | 1389 | return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn; |
1390 | 1390 | } |
1391 | 1391 | |
@@ -1397,11 +1397,11 @@ discard block |
||
1397 | 1397 | * @throws Exceptions\ConnectionFailedException |
1398 | 1398 | * @throws Exceptions\RuntimeException |
1399 | 1399 | */ |
1400 | - public function setSequenceId($uid, $msglist = null){ |
|
1400 | + public function setSequenceId($uid, $msglist = null) { |
|
1401 | 1401 | if ($this->getSequence() === IMAP::ST_UID) { |
1402 | 1402 | $this->setUid($uid); |
1403 | 1403 | $this->setMsglist($msglist); |
1404 | - }else{ |
|
1404 | + }else { |
|
1405 | 1405 | $this->setMsgn($uid, $msglist); |
1406 | 1406 | } |
1407 | 1407 | } |
@@ -82,10 +82,10 @@ discard block |
||
82 | 82 | * @throws MethodNotFoundException |
83 | 83 | */ |
84 | 84 | public function __call($method, $arguments) { |
85 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
85 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
86 | 86 | $name = preg_replace('/(.)(?=[A-Z])/u', '$1_', substr(strtolower($method), 3)); |
87 | 87 | |
88 | - if(in_array($name, array_keys($this->attributes))) { |
|
88 | + if (in_array($name, array_keys($this->attributes))) { |
|
89 | 89 | return $this->attributes[$name]; |
90 | 90 | } |
91 | 91 | |
@@ -111,7 +111,7 @@ discard block |
||
111 | 111 | * @return Attribute|mixed |
112 | 112 | */ |
113 | 113 | public function get($name) { |
114 | - if(isset($this->attributes[$name])) { |
|
114 | + if (isset($this->attributes[$name])) { |
|
115 | 115 | return $this->attributes[$name]; |
116 | 116 | } |
117 | 117 | |
@@ -127,23 +127,23 @@ discard block |
||
127 | 127 | * @return Attribute |
128 | 128 | */ |
129 | 129 | public function set($name, $value, $strict = false) { |
130 | - if(isset($this->attributes[$name]) && $strict === false) { |
|
130 | + if (isset($this->attributes[$name]) && $strict === false) { |
|
131 | 131 | if ($this->attributize) { |
132 | 132 | $this->attributes[$name]->add($value, true); |
133 | - }else{ |
|
134 | - if(isset($this->attributes[$name])) { |
|
133 | + }else { |
|
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 | - }elseif($this->attributize == false){ |
|
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 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | public function find($pattern) { |
160 | 160 | if (preg_match_all($pattern, $this->raw, $matches)) { |
161 | 161 | if (isset($matches[1])) { |
162 | - if(count($matches[1]) > 0) { |
|
162 | + if (count($matches[1]) > 0) { |
|
163 | 163 | return $matches[1][0]; |
164 | 164 | } |
165 | 165 | } |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | * |
173 | 173 | * @throws InvalidMessageDateException |
174 | 174 | */ |
175 | - protected function parse(){ |
|
175 | + protected function parse() { |
|
176 | 176 | $header = $this->rfc822_parse_headers($this->raw); |
177 | 177 | |
178 | 178 | $this->extractAddresses($header); |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | $this->parseDate($header); |
191 | 191 | foreach ($header as $key => $value) { |
192 | 192 | $key = trim(rtrim(strtolower($key))); |
193 | - if(!isset($this->attributes[$key])){ |
|
193 | + if (!isset($this->attributes[$key])) { |
|
194 | 194 | $this->set($key, $value); |
195 | 195 | } |
196 | 196 | } |
@@ -206,12 +206,12 @@ discard block |
||
206 | 206 | * |
207 | 207 | * @return object |
208 | 208 | */ |
209 | - public function rfc822_parse_headers($raw_headers){ |
|
209 | + public function rfc822_parse_headers($raw_headers) { |
|
210 | 210 | $headers = []; |
211 | 211 | $imap_headers = []; |
212 | 212 | if (extension_loaded('imap')) { |
213 | 213 | $raw_imap_headers = (array) \imap_rfc822_parse_headers($this->raw); |
214 | - foreach($raw_imap_headers as $key => $values) { |
|
214 | + foreach ($raw_imap_headers as $key => $values) { |
|
215 | 215 | $key = str_replace("-", "_", $key); |
216 | 216 | $imap_headers[$key] = $values; |
217 | 217 | } |
@@ -219,7 +219,7 @@ discard block |
||
219 | 219 | |
220 | 220 | $lines = explode("\r\n", $raw_headers); |
221 | 221 | $prev_header = null; |
222 | - foreach($lines as $line) { |
|
222 | + foreach ($lines as $line) { |
|
223 | 223 | if (substr($line, 0, 1) === "\n") { |
224 | 224 | $line = substr($line, 1); |
225 | 225 | } |
@@ -239,19 +239,19 @@ discard block |
||
239 | 239 | } |
240 | 240 | if (is_array($headers[$prev_header])) { |
241 | 241 | $headers[$prev_header][] = $line; |
242 | - }else{ |
|
242 | + }else { |
|
243 | 243 | $headers[$prev_header] .= $line; |
244 | 244 | } |
245 | 245 | } |
246 | - }else{ |
|
246 | + }else { |
|
247 | 247 | if (($pos = strpos($line, ":")) > 0) { |
248 | 248 | $key = trim(rtrim(strtolower(substr($line, 0, $pos)))); |
249 | 249 | $key = str_replace("-", "_", $key); |
250 | 250 | |
251 | 251 | $value = trim(rtrim(substr($line, $pos + 1))); |
252 | 252 | if (isset($headers[$key])) { |
253 | - $headers[$key][] = $value; |
|
254 | - }else{ |
|
253 | + $headers[$key][] = $value; |
|
254 | + }else { |
|
255 | 255 | $headers[$key] = [$value]; |
256 | 256 | } |
257 | 257 | $prev_header = $key; |
@@ -259,10 +259,10 @@ discard block |
||
259 | 259 | } |
260 | 260 | } |
261 | 261 | |
262 | - foreach($headers as $key => $values) { |
|
262 | + foreach ($headers as $key => $values) { |
|
263 | 263 | if (isset($imap_headers[$key])) continue; |
264 | 264 | $value = null; |
265 | - switch($key){ |
|
265 | + switch ($key) { |
|
266 | 266 | case 'from': |
267 | 267 | case 'to': |
268 | 268 | case 'cc': |
@@ -277,7 +277,7 @@ discard block |
||
277 | 277 | break; |
278 | 278 | default: |
279 | 279 | if (is_array($values)) { |
280 | - foreach($values as $k => $v) { |
|
280 | + foreach ($values as $k => $v) { |
|
281 | 281 | if ($v == "") { |
282 | 282 | unset($values[$k]); |
283 | 283 | } |
@@ -289,7 +289,7 @@ discard block |
||
289 | 289 | $value = implode(" ", $values); |
290 | 290 | } elseif ($available_values > 2) { |
291 | 291 | $value = array_values($values); |
292 | - } else { |
|
292 | + }else { |
|
293 | 293 | $value = ""; |
294 | 294 | } |
295 | 295 | } |
@@ -309,12 +309,12 @@ discard block |
||
309 | 309 | * @return array The decoded elements are returned in an array of objects, where each |
310 | 310 | * object has two properties, charset and text. |
311 | 311 | */ |
312 | - public function mime_header_decode($text){ |
|
312 | + public function mime_header_decode($text) { |
|
313 | 313 | if (extension_loaded('imap')) { |
314 | 314 | return \imap_mime_header_decode($text); |
315 | 315 | } |
316 | 316 | $charset = $this->getEncoding($text); |
317 | - return [(object)[ |
|
317 | + return [(object) [ |
|
318 | 318 | "charset" => $charset, |
319 | 319 | "text" => $this->convertEncoding($text, $charset) |
320 | 320 | ]]; |
@@ -368,7 +368,7 @@ discard block |
||
368 | 368 | try { |
369 | 369 | if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') { |
370 | 370 | return iconv($from, $to, $str); |
371 | - } else { |
|
371 | + }else { |
|
372 | 372 | if (!$from) { |
373 | 373 | return mb_convert_encoding($str, $to); |
374 | 374 | } |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | if (strstr($from, '-')) { |
379 | 379 | $from = str_replace('-', '', $from); |
380 | 380 | return $this->convertEncoding($str, $from, $to); |
381 | - } else { |
|
381 | + }else { |
|
382 | 382 | return $str; |
383 | 383 | } |
384 | 384 | } |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | } |
400 | 400 | }elseif (property_exists($structure, 'charset')) { |
401 | 401 | return EncodingAliases::get($structure->charset, $this->fallback_encoding); |
402 | - }elseif (is_string($structure) === true){ |
|
402 | + }elseif (is_string($structure) === true) { |
|
403 | 403 | return mb_detect_encoding($structure); |
404 | 404 | } |
405 | 405 | |
@@ -420,7 +420,7 @@ discard block |
||
420 | 420 | $decoder = $this->config['decoder']['message']; |
421 | 421 | |
422 | 422 | if ($value !== null) { |
423 | - if($decoder === 'utf-8' && extension_loaded('imap')) { |
|
423 | + if ($decoder === 'utf-8' && extension_loaded('imap')) { |
|
424 | 424 | $value = \imap_utf8($value); |
425 | 425 | if (strpos(strtolower($value), '=?utf-8?') === 0) { |
426 | 426 | $value = mb_decode_mimeheader($value); |
@@ -428,14 +428,14 @@ discard block |
||
428 | 428 | if ($this->notDecoded($original_value, $value)) { |
429 | 429 | $decoded_value = $this->mime_header_decode($value); |
430 | 430 | if (count($decoded_value) > 0) { |
431 | - if(property_exists($decoded_value[0], "text")) { |
|
431 | + if (property_exists($decoded_value[0], "text")) { |
|
432 | 432 | $value = $decoded_value[0]->text; |
433 | 433 | } |
434 | 434 | } |
435 | 435 | } |
436 | - }elseif($decoder === 'iconv') { |
|
436 | + }elseif ($decoder === 'iconv') { |
|
437 | 437 | $value = iconv_mime_decode($value); |
438 | - }else{ |
|
438 | + }else { |
|
439 | 439 | $value = mb_decode_mimeheader($value); |
440 | 440 | } |
441 | 441 | |
@@ -458,7 +458,7 @@ discard block |
||
458 | 458 | * @return array |
459 | 459 | */ |
460 | 460 | private function decodeArray($values) { |
461 | - foreach($values as $key => $value) { |
|
461 | + foreach ($values as $key => $value) { |
|
462 | 462 | $values[$key] = $this->decode($value); |
463 | 463 | } |
464 | 464 | return $values; |
@@ -468,8 +468,8 @@ discard block |
||
468 | 468 | * Try to extract the priority from a given raw header string |
469 | 469 | */ |
470 | 470 | private function findPriority() { |
471 | - if(($priority = $this->get("x_priority")) === null) return; |
|
472 | - switch((int)"$priority"){ |
|
471 | + if (($priority = $this->get("x_priority")) === null) return; |
|
472 | + switch ((int) "$priority") { |
|
473 | 473 | case IMAP::MESSAGE_PRIORITY_HIGHEST; |
474 | 474 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; |
475 | 475 | break; |
@@ -501,7 +501,7 @@ discard block |
||
501 | 501 | */ |
502 | 502 | private function decodeAddresses($values) { |
503 | 503 | $addresses = []; |
504 | - foreach($values as $address) { |
|
504 | + foreach ($values as $address) { |
|
505 | 505 | $address = trim(rtrim($address)); |
506 | 506 | if (strpos($address, ",") == strlen($address) - 1) { |
507 | 507 | $address = substr($address, 0, -1); |
@@ -510,7 +510,7 @@ discard block |
||
510 | 510 | '/^(?:(?P<name>.+)\s)?(?(name)<|<?)(?P<email>[^\s]+?)(?(name)>|>?)$/', |
511 | 511 | $address, |
512 | 512 | $matches |
513 | - )){ |
|
513 | + )) { |
|
514 | 514 | $name = trim(rtrim($matches["name"])); |
515 | 515 | $email = trim(rtrim($matches["email"])); |
516 | 516 | list($mailbox, $host) = array_pad(explode("@", $email), 2, null); |
@@ -529,7 +529,7 @@ discard block |
||
529 | 529 | * @param object $header |
530 | 530 | */ |
531 | 531 | private function extractAddresses($header) { |
532 | - foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key){ |
|
532 | + foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key) { |
|
533 | 533 | if (property_exists($header, $key)) { |
534 | 534 | $this->set($key, $this->parseAddresses($header->$key)); |
535 | 535 | } |
@@ -560,10 +560,10 @@ discard block |
||
560 | 560 | } |
561 | 561 | if (!property_exists($address, 'personal')) { |
562 | 562 | $address->personal = false; |
563 | - } else { |
|
563 | + }else { |
|
564 | 564 | $personalParts = $this->mime_header_decode($address->personal); |
565 | 565 | |
566 | - if(is_array($personalParts)) { |
|
566 | + if (is_array($personalParts)) { |
|
567 | 567 | $address->personal = ''; |
568 | 568 | foreach ($personalParts as $p) { |
569 | 569 | $address->personal .= $this->convertEncoding($p->text, $this->getEncoding($p)); |
@@ -587,23 +587,23 @@ discard block |
||
587 | 587 | /** |
588 | 588 | * Search and extract potential header extensions |
589 | 589 | */ |
590 | - private function extractHeaderExtensions(){ |
|
590 | + private function extractHeaderExtensions() { |
|
591 | 591 | foreach ($this->attributes as $key => $value) { |
592 | 592 | if (is_array($value)) { |
593 | 593 | $value = implode(", ", $value); |
594 | - }else{ |
|
595 | - $value = (string)$value; |
|
594 | + }else { |
|
595 | + $value = (string) $value; |
|
596 | 596 | } |
597 | 597 | // Only parse strings and don't parse any attributes like the user-agent |
598 | 598 | if (in_array($key, ["user_agent"]) === false) { |
599 | - if (($pos = strpos($value, ";")) !== false){ |
|
599 | + if (($pos = strpos($value, ";")) !== false) { |
|
600 | 600 | $original = substr($value, 0, $pos); |
601 | 601 | $this->set($key, trim(rtrim($original)), true); |
602 | 602 | |
603 | 603 | // Get all potential extensions |
604 | 604 | $extensions = explode(";", substr($value, $pos + 1)); |
605 | - foreach($extensions as $extension) { |
|
606 | - if (($pos = strpos($extension, "=")) !== false){ |
|
605 | + foreach ($extensions as $extension) { |
|
606 | + if (($pos = strpos($extension, "=")) !== false) { |
|
607 | 607 | $key = substr($extension, 0, $pos); |
608 | 608 | $key = trim(rtrim(strtolower($key))); |
609 | 609 | |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | $parsed_date = null; |
647 | 647 | $date = $header->date; |
648 | 648 | |
649 | - if(preg_match('/\+0580/', $date)) { |
|
649 | + if (preg_match('/\+0580/', $date)) { |
|
650 | 650 | $date = str_replace('+0580', '+0530', $date); |
651 | 651 | } |
652 | 652 | |
@@ -669,7 +669,7 @@ discard block |
||
669 | 669 | $date = trim(array_pop($array)); |
670 | 670 | break; |
671 | 671 | } |
672 | - try{ |
|
672 | + try { |
|
673 | 673 | $parsed_date = Carbon::parse($date); |
674 | 674 | } catch (\Exception $_e) { |
675 | 675 | throw new InvalidMessageDateException("Invalid message date. ID:".$this->get("message_id"), 1100, $e); |
@@ -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 | - }elseif($this->attributize == false){ |
|
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 | |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | if ($prev_header !== null) { |
231 | 231 | $headers[$prev_header][] = $line; |
232 | 232 | } |
233 | - }elseif (substr($line, 0, 1) === " ") { |
|
233 | + } elseif (substr($line, 0, 1) === " ") { |
|
234 | 234 | $line = substr($line, 1); |
235 | 235 | $line = trim(rtrim($line)); |
236 | 236 | if ($prev_header !== null) { |
@@ -239,11 +239,11 @@ discard block |
||
239 | 239 | } |
240 | 240 | if (is_array($headers[$prev_header])) { |
241 | 241 | $headers[$prev_header][] = $line; |
242 | - }else{ |
|
242 | + } else{ |
|
243 | 243 | $headers[$prev_header] .= $line; |
244 | 244 | } |
245 | 245 | } |
246 | - }else{ |
|
246 | + } else{ |
|
247 | 247 | if (($pos = strpos($line, ":")) > 0) { |
248 | 248 | $key = trim(rtrim(strtolower(substr($line, 0, $pos)))); |
249 | 249 | $key = str_replace("-", "_", $key); |
@@ -251,7 +251,7 @@ discard block |
||
251 | 251 | $value = trim(rtrim(substr($line, $pos + 1))); |
252 | 252 | if (isset($headers[$key])) { |
253 | 253 | $headers[$key][] = $value; |
254 | - }else{ |
|
254 | + } else{ |
|
255 | 255 | $headers[$key] = [$value]; |
256 | 256 | } |
257 | 257 | $prev_header = $key; |
@@ -260,7 +260,9 @@ discard block |
||
260 | 260 | } |
261 | 261 | |
262 | 262 | foreach($headers as $key => $values) { |
263 | - if (isset($imap_headers[$key])) continue; |
|
263 | + if (isset($imap_headers[$key])) { |
|
264 | + continue; |
|
265 | + } |
|
264 | 266 | $value = null; |
265 | 267 | switch($key){ |
266 | 268 | case 'from': |
@@ -397,9 +399,9 @@ discard block |
||
397 | 399 | return EncodingAliases::get($parameter->value, $this->fallback_encoding); |
398 | 400 | } |
399 | 401 | } |
400 | - }elseif (property_exists($structure, 'charset')) { |
|
402 | + } elseif (property_exists($structure, 'charset')) { |
|
401 | 403 | return EncodingAliases::get($structure->charset, $this->fallback_encoding); |
402 | - }elseif (is_string($structure) === true){ |
|
404 | + } elseif (is_string($structure) === true){ |
|
403 | 405 | return mb_detect_encoding($structure); |
404 | 406 | } |
405 | 407 | |
@@ -433,9 +435,9 @@ discard block |
||
433 | 435 | } |
434 | 436 | } |
435 | 437 | } |
436 | - }elseif($decoder === 'iconv') { |
|
438 | + } elseif($decoder === 'iconv') { |
|
437 | 439 | $value = iconv_mime_decode($value); |
438 | - }else{ |
|
440 | + } else{ |
|
439 | 441 | $value = mb_decode_mimeheader($value); |
440 | 442 | } |
441 | 443 | |
@@ -468,7 +470,9 @@ discard block |
||
468 | 470 | * Try to extract the priority from a given raw header string |
469 | 471 | */ |
470 | 472 | private function findPriority() { |
471 | - if(($priority = $this->get("x_priority")) === null) return; |
|
473 | + if(($priority = $this->get("x_priority")) === null) { |
|
474 | + return; |
|
475 | + } |
|
472 | 476 | switch((int)"$priority"){ |
473 | 477 | case IMAP::MESSAGE_PRIORITY_HIGHEST; |
474 | 478 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; |
@@ -591,7 +595,7 @@ discard block |
||
591 | 595 | foreach ($this->attributes as $key => $value) { |
592 | 596 | if (is_array($value)) { |
593 | 597 | $value = implode(", ", $value); |
594 | - }else{ |
|
598 | + } else{ |
|
595 | 599 | $value = (string)$value; |
596 | 600 | } |
597 | 601 | // Only parse strings and don't parse any attributes like the user-agent |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | * @param object $object |
45 | 45 | */ |
46 | 46 | public function __construct($object) { |
47 | - if (property_exists($object, "personal")){ $this->personal = $object->personal; } |
|
48 | - if (property_exists($object, "mailbox")){ $this->mailbox = $object->mailbox; } |
|
49 | - if (property_exists($object, "host")){ $this->host = $object->host; } |
|
50 | - if (property_exists($object, "mail")){ $this->mail = $object->mail; } |
|
51 | - if (property_exists($object, "full")){ $this->full = $object->full; } |
|
47 | + if (property_exists($object, "personal")) { $this->personal = $object->personal; } |
|
48 | + if (property_exists($object, "mailbox")) { $this->mailbox = $object->mailbox; } |
|
49 | + if (property_exists($object, "host")) { $this->host = $object->host; } |
|
50 | + if (property_exists($object, "mail")) { $this->mail = $object->mail; } |
|
51 | + if (property_exists($object, "full")) { $this->full = $object->full; } |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | * |
67 | 67 | * @return array |
68 | 68 | */ |
69 | - public function __serialize(){ |
|
69 | + public function __serialize() { |
|
70 | 70 | return [ |
71 | 71 | "personal" => $this->personal, |
72 | 72 | "mailbox" => $this->mailbox, |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * |
82 | 82 | * @return array |
83 | 83 | */ |
84 | - public function toArray(){ |
|
84 | + public function toArray() { |
|
85 | 85 | return $this->__serialize(); |
86 | 86 | } |
87 | 87 | |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | * |
91 | 91 | * @return string |
92 | 92 | */ |
93 | - public function toString(){ |
|
93 | + public function toString() { |
|
94 | 94 | return $this->__toString(); |
95 | 95 | } |
96 | 96 | } |
97 | 97 | \ No newline at end of file |