Webklex / php-imap

src/Message.php

Spacing +53 added lines, -53 removed lines

@@ -192,7 +192,7 @@ 
         $this->boot();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -246,14 +246,14 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\MessageNotFoundException
      */
-    public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null){
+    public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null) {
         $reflection = new ReflectionClass(self::class);
         /** @var self $instance */
         $instance = $reflection->newInstanceWithoutConstructor();
         $instance->boot();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -278,7 +278,7 @@ 
     /**
      * Boot a new instance
      */
-    public function boot(){
+    public function boot() {
         $this->attributes = [];
 
         $this->config = ClientManager::get('options');
@@ -297,13 +297,13 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
             return $this->get($name);
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 return $this->__set($name, array_pop($arguments));
             }
 
@@ -342,7 +342,7 @@ 
      * @return Attribute|mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -416,7 +416,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    public function parseRawHeader($raw_header){
+    public function parseRawHeader($raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -427,8 +427,8 @@ 
     public function parseRawFlags($raw_flags) {
         $this->flags = FlagCollection::make([]);
 
-        foreach($raw_flags as $flag) {
-            if (strpos($flag, "\\") === 0){
+        foreach ($raw_flags as $flag) {
+            if (strpos($flag, "\\") === 0) {
                 $flag = substr($flag, 1);
             }
             $flag_key = strtolower($flag);
@@ -501,7 +501,7 @@ 
      * @throws MessageFlagException
      * @throws Exceptions\RuntimeException
      */
-    public function peek(){
+    public function peek() {
         if ($this->fetch_options == IMAP::FT_PEEK) {
             if ($this->getFlags()->get("seen") == null) {
                 $this->unsetFlag("Seen");
@@ -550,7 +550,7 @@ 
     private function fetchPart(Part $part) {
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        }else {
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -575,7 +575,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            }else {
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -591,7 +591,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -725,7 +725,7 @@ 
 
         if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
             return @iconv($from, $to.'//IGNORE', $str);
-        } else {
+        }else {
             if (!$from) {
                 return mb_convert_encoding($str, $to);
             }
@@ -746,9 +746,9 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        }elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset);
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -763,7 +763,7 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\RuntimeException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolderByPath($this->folder_path);
     }
 
@@ -779,13 +779,13 @@ 
      * @throws Exceptions\GetMessagesFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function thread($sent_folder = null, &$thread = null, $folder = null){
+    public function thread($sent_folder = null, &$thread = null, $folder = null) {
         $thread = $thread ? $thread : MessageCollection::make([]);
-        $folder = $folder ? $folder :  $this->getFolder();
+        $folder = $folder ? $folder : $this->getFolder();
         $sent_folder = $sent_folder ? $sent_folder : $this->client->getFolderByPath(ClientManager::get("options.common_folders.sent", "INBOX/Sent"));
 
         /** @var Message $message */
-        foreach($thread as $message) {
+        foreach ($thread as $message) {
             if ($message->message_id->first() == $this->message_id->first()) {
                 return $thread;
             }
@@ -796,7 +796,7 @@ 
         $this->fetchThreadByInReplyTo($thread, $this->message_id, $sent_folder, $folder, $sent_folder);
 
         if (is_array($this->in_reply_to)) {
-            foreach($this->in_reply_to as $in_reply_to) {
+            foreach ($this->in_reply_to as $in_reply_to) {
                 $this->fetchThreadByMessageId($thread, $in_reply_to, $folder, $folder, $sent_folder);
                 $this->fetchThreadByMessageId($thread, $in_reply_to, $sent_folder, $folder, $sent_folder);
             }
@@ -817,7 +817,7 @@ 
      * @throws Exceptions\GetMessagesFailedException
      * @throws Exceptions\RuntimeException
      */
-    protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder){
+    protected function fetchThreadByInReplyTo(&$thread, $in_reply_to, $primary_folder, $secondary_folder, $sent_folder) {
         $primary_folder->query()->inReplyTo($in_reply_to)
         ->setFetchBody($this->getFetchBodyOption())
         ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){
@@ -838,7 +838,7 @@ 
      * @throws Exceptions\GetMessagesFailedException
      * @throws Exceptions\RuntimeException
      */
-    protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder){
+    protected function fetchThreadByMessageId(&$thread, $message_id, $primary_folder, $secondary_folder, $sent_folder) {
         $primary_folder->query()->messageId($message_id)
         ->setFetchBody($this->getFetchBodyOption())
         ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){
@@ -934,14 +934,14 @@ 
      * @throws MessageFlagException
      * @throws MessageHeaderFetchingException
      */
-    protected function fetchNewMail($folder, $next_uid, $event, $expunge){
-        if($expunge) $this->client->expunge();
+    protected function fetchNewMail($folder, $next_uid, $event, $expunge) {
+        if ($expunge) $this->client->expunge();
 
         $this->client->openFolder($folder->path);
 
         if ($this->sequence === IMAP::ST_UID) {
             $sequence_id = $next_uid;
-        }else{
+        }else {
             $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
         }
 
@@ -966,11 +966,11 @@ 
      */
     public function delete($expunge = true, $trash_path = null, $force_move = false) {
         $status = $this->setFlag("Deleted");
-        if($force_move) {
-            $trash_path = $trash_path === null ? $this->config["common_folders"]["trash"]: $trash_path;
+        if ($force_move) {
+            $trash_path = $trash_path === null ? $this->config["common_folders"]["trash"] : $trash_path;
             $status = $this->move($trash_path);
         }
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -990,7 +990,7 @@ 
      */
     public function restore($expunge = true) {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -1095,7 +1095,7 @@ 
      *
      * @return AttachmentCollection
      */
-    public function attachments(){
+    public function attachments() {
         return $this->getAttachments();
     }
 
@@ -1193,7 +1193,7 @@ 
      *
      * @return FlagCollection
      */
-    public function flags(){
+    public function flags() {
         return $this->getFlags();
     }
 
@@ -1202,7 +1202,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1228,7 +1228,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -1238,8 +1238,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1251,7 +1251,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1262,9 +1262,9 @@ 
      * @return mixed
      * @throws MaskNotFoundException
      */
-    public function mask($mask = null){
+    public function mask($mask = null) {
         $mask = $mask !== null ? $mask : $this->mask;
-        if(class_exists($mask)){
+        if (class_exists($mask)) {
             return new $mask($this);
         }
 
@@ -1276,7 +1276,7 @@ 
      *
      * @return string
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->folder_path;
     }
 
@@ -1286,7 +1286,7 @@ 
      *
      * @return $this
      */
-    public function setFolderPath($folder_path){
+    public function setFolderPath($folder_path) {
         $this->folder_path = $folder_path;
 
         return $this;
@@ -1298,7 +1298,7 @@ 
      *
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         $this->config = $config;
 
         return $this;
@@ -1310,7 +1310,7 @@ 
      *
      * @return $this
      */
-    public function setAvailableFlags($available_flags){
+    public function setAvailableFlags($available_flags) {
         $this->available_flags = $available_flags;
 
         return $this;
@@ -1322,7 +1322,7 @@ 
      *
      * @return $this
      */
-    public function setAttachments($attachments){
+    public function setAttachments($attachments) {
         $this->attachments = $attachments;
 
         return $this;
@@ -1334,7 +1334,7 @@ 
      *
      * @return $this
      */
-    public function setFlags($flags){
+    public function setFlags($flags) {
         $this->flags = $flags;
 
         return $this;
@@ -1348,7 +1348,7 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setClient($client){
+    public function setClient($client) {
         $this->client = $client;
         $this->client->openFolder($this->folder_path);
 
@@ -1363,7 +1363,7 @@ 
      * @throws Exceptions\MessageNotFoundException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setUid($uid){
+    public function setUid($uid) {
         $this->uid = $uid;
         $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
         $this->msglist = null;
@@ -1380,7 +1380,7 @@ 
      * @throws Exceptions\MessageNotFoundException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setMsgn($msgn, $msglist = null){
+    public function setMsgn($msgn, $msglist = null) {
         $this->msgn = $msgn;
         $this->msglist = $msglist;
         $this->uid = $this->client->getConnection()->getUid($this->msgn);
@@ -1393,7 +1393,7 @@ 
      *
      * @return int
      */
-    public function getSequence(){
+    public function getSequence() {
         return $this->sequence;
     }
 
@@ -1402,7 +1402,7 @@ 
      *
      * @return int
      */
-    public function getSequenceId(){
+    public function getSequenceId() {
         return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn;
     }
 
@@ -1414,11 +1414,11 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\MessageNotFoundException
      */
-    public function setSequenceId($uid, $msglist = null){
+    public function setSequenceId($uid, $msglist = null) {
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        }else {
             $this->setMsgn($uid, $msglist);
         }
     }

Braces +17 added lines, -11 removed lines

@@ -300,7 +300,7 @@ 
         if(strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
             return $this->get($name);
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
@@ -506,7 +506,7 @@ 
             if ($this->getFlags()->get("seen") == null) {
                 $this->unsetFlag("Seen");
             }
-        }elseif ($this->getFlags()->get("seen") != null) {
+        } elseif ($this->getFlags()->get("seen") != null) {
             $this->setFlag("Seen");
         }
     }
@@ -550,7 +550,7 @@ 
     private function fetchPart(Part $part) {
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        } else{
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -575,7 +575,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            } else{
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -746,9 +746,9 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        } elseif (property_exists($structure, 'charset')){
             return EncodingAliases::get($structure->charset);
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -935,13 +935,15 @@ 
      * @throws MessageHeaderFetchingException
      */
     protected function fetchNewMail($folder, $next_uid, $event, $expunge){
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $this->client->openFolder($folder->path);
 
         if ($this->sequence === IMAP::ST_UID) {
             $sequence_id = $next_uid;
-        }else{
+        } else{
             $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
         }
 
@@ -970,7 +972,9 @@ 
             $trash_path = $trash_path === null ? $this->config["common_folders"]["trash"]: $trash_path;
             $status = $this->move($trash_path);
         }
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -990,7 +994,9 @@ 
      */
     public function restore($expunge = true) {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -1418,7 +1424,7 @@ 
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        } else{
             $this->setMsgn($uid, $msglist);
         }
     }

src/Query/WhereQuery.php

Spacing +7 added lines, -7 removed lines

@@ -85,8 +85,8 @@ 
         }
 
         if (strpos(strtolower($name), "where") === false) {
-            $method = 'where' . ucfirst($name);
-        } else {
+            $method = 'where'.ucfirst($name);
+        }else {
             $method = lcfirst($name);
         }
 
@@ -94,7 +94,7 @@ 
             return call_user_func_array([$that, $method], $arguments);
         }
 
-        throw new MethodNotFoundException("Method " . self::class . '::' . $method . '() is not supported');
+        throw new MethodNotFoundException("Method ".self::class.'::'.$method.'() is not supported');
     }
 
     /**
@@ -137,11 +137,11 @@ 
             foreach ($criteria as $key => $value) {
                 if (is_numeric($key)) {
                     $this->where($value);
-                }else{
+                }else {
                     $this->where($key, $value);
                 }
             }
-        } else {
+        }else {
             $this->push_search_criteria($criteria, $value);
         }
 
@@ -155,13 +155,13 @@ 
      *
      * @throws InvalidWhereQueryCriteriaException
      */
-    protected function push_search_criteria($criteria, $value){
+    protected function push_search_criteria($criteria, $value) {
         $criteria = $this->validate_criteria($criteria);
         $value = $this->parse_value($value);
 
         if ($value === null || $value === '') {
             $this->query->push([$criteria]);
-        } else {
+        }else {
             $this->query->push([$criteria, $value]);
         }
     }

Braces +7 added lines, -3 removed lines

@@ -137,7 +137,7 @@ 
             foreach ($criteria as $key => $value) {
                 if (is_numeric($key)) {
                     $this->where($value);
-                }else{
+                } else{
                     $this->where($key, $value);
                 }
             }
@@ -173,7 +173,9 @@ 
      */
     public function orWhere(Closure $closure = null) {
         $this->query->push(['OR']);
-        if ($closure !== null) $closure($this);
+        if ($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }
@@ -185,7 +187,9 @@ 
      */
     public function andWhere(Closure $closure = null) {
         $this->query->push(['AND']);
-        if ($closure !== null) $closure($this);
+        if ($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }

src/ClientManager.php

Spacing +23 added lines, -23 removed lines

@@ -76,17 +76,17 @@ 
     public static function get($key, $default = null) {
         $parts = explode('.', $key);
         $value = null;
-        foreach($parts as $part) {
-            if($value === null) {
-                if(isset(self::$config[$part])) {
+        foreach ($parts as $part) {
+            if ($value === null) {
+                if (isset(self::$config[$part])) {
                     $value = self::$config[$part];
-                }else{
+                }else {
                     break;
                 }
-            }else{
-                if(isset($value[$part])) {
+            }else {
+                if (isset($value[$part])) {
                     $value = $value[$part];
-                }else{
+                }else {
                     break;
                 }
             }
@@ -176,7 +176,7 @@ 
      */
     public function setConfig($config) {
 
-        if(is_array($config) === false) {
+        if (is_array($config) === false) {
             $config = require $config;
         }
 
@@ -186,17 +186,17 @@ 
         $vendor_config = require $path;
         $config = $this->array_merge_recursive_distinct($vendor_config, $config);
 
-        if(is_array($config)){
-            if(isset($config['default'])){
-                if(isset($config['accounts']) && $config['default'] != false){
+        if (is_array($config)) {
+            if (isset($config['default'])) {
+                if (isset($config['accounts']) && $config['default'] != false) {
 
                     $default_config = $vendor_config['accounts']['default'];
-                    if(isset($config['accounts'][$config['default']])){
+                    if (isset($config['accounts'][$config['default']])) {
                         $default_config = array_merge($default_config, $config['accounts'][$config['default']]);
                     }
 
-                    if(is_array($config['accounts'])){
-                        foreach($config['accounts'] as $account_key => $account){
+                    if (is_array($config['accounts'])) {
+                        foreach ($config['accounts'] as $account_key => $account) {
                             $config['accounts'][$account_key] = array_merge($default_config, $account);
                         }
                     }
@@ -238,20 +238,20 @@ 
             return array_keys($arr) !== range(0, count($arr) - 1);
         };
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if (!is_array($base)) $base = empty($base) ? array() : array($base);
 
-        foreach($arrays as $append) {
+        foreach ($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if (!is_array($append)) $append = array($append);
 
-            foreach($append as $key => $value) {
+            foreach ($append as $key => $value) {
 
-                if(!array_key_exists($key, $base) and !is_numeric($key)) {
+                if (!array_key_exists($key, $base) and !is_numeric($key)) {
                     $base[$key] = $append[$key];
                     continue;
                 }
 
-                if(
+                if (
                     (
                         is_array($value)
                         && $isAssoc($value)
@@ -265,9 +265,9 @@ 
                     // else merging $baseConfig['dispositions'] = ['attachment', 'inline'] with $customConfig['dispositions'] = ['attachment']
                     // results in $resultConfig['dispositions'] = ['attachment', 'inline']
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
-                } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
-                } else {
+                }else if (is_numeric($key)) {
+                    if (!in_array($value, $base)) $base[] = $value;
+                }else {
                     $base[$key] = $value;
                 }
 

Braces +15 added lines, -7 removed lines

@@ -80,13 +80,13 @@ 
             if($value === null) {
                 if(isset(self::$config[$part])) {
                     $value = self::$config[$part];
-                }else{
+                } else{
                     break;
                 }
-            }else{
+            } else{
                 if(isset($value[$part])) {
                     $value = $value[$part];
-                }else{
+                } else{
                     break;
                 }
             }
@@ -234,15 +234,21 @@ 
 
         // From https://stackoverflow.com/a/173479
         $isAssoc = function(array $arr) {
-            if (array() === $arr) return false;
+            if (array() === $arr) {
+                return false;
+            }
             return array_keys($arr) !== range(0, count($arr) - 1);
         };
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if(!is_array($base)) {
+            $base = empty($base) ? array() : array($base);
+        }
 
         foreach($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if(!is_array($append)) {
+                $append = array($append);
+            }
 
             foreach($append as $key => $value) {
 
@@ -266,7 +272,9 @@ 
                     // results in $resultConfig['dispositions'] = ['attachment', 'inline']
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
                 } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                    if(!in_array($value, $base)) {
+                        $base[] = $value;
+                    }
                 } else {
                     $base[$key] = $value;
                 }