Webklex / php-imap

src/Connection/Protocols/ImapProtocol.php

Braces +13 added lines, -6 removed lines

@@ -238,7 +238,9 @@ 
         } else {
             $tokens = $line;
         }
-        if ($this->debug) echo "<< ".$line."\n";
+        if ($this->debug) {
+            echo "<< ".$line."\n";
+        }
 
         // if tag is wanted tag we might be at the end of a multiline response
         return $tag == $wantedTag;
@@ -304,7 +306,9 @@ 
                 $line .= ' ' . $token;
             }
         }
-        if ($this->debug) echo ">> ".$line."\n";
+        if ($this->debug) {
+            echo ">> ".$line."\n";
+        }
 
         if (fwrite($this->stream, $line . "\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
@@ -456,7 +460,9 @@ 
     public function getCapabilities(): array {
         $response = $this->requestAndResponse('CAPABILITY');
 
-        if (!$response) return [];
+        if (!$response) {
+            return [];
+        }
 
         $capabilities = [];
         foreach ($response as $line) {
@@ -616,13 +622,14 @@ 
             // if we want only one message we can ignore everything else and just return
             if ($to === null && !is_array($from) && ($uid ? $tokens[2][$uidKey] == $from : $tokens[0] == $from)) {
                 // we still need to read all lines
-                while (!$this->readLine($tokens, $tag))
-
+                while (!$this->readLine($tokens, $tag)) {
+                
                     return $data;
+                }
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            } else{
                 $result[$tokens[0]] = $data;
             }
         }

Spacing +36 added lines, -36 removed lines

@@ -89,7 +89,7 @@ 
      * @throws ConnectionFailedException
      * @throws RuntimeException
      */
-    protected function enableStartTls(){
+    protected function enableStartTls() {
         $response = $this->requestAndResponse('STARTTLS');
         $result = $response && stream_socket_enable_crypto($this->stream, true, $this->getCryptoMethod());
         if (!$result) {
@@ -151,7 +151,7 @@ 
         $stack = [];
 
         //  replace any trailing <NL> including spaces with a single space
-        $line = rtrim($line) . ' ';
+        $line = rtrim($line).' ';
         while (($pos = strpos($line, ' ')) !== false) {
             $token = substr($line, 0, $pos);
             if (!strlen($token)) {
@@ -181,11 +181,11 @@ 
                     if (strlen($token) > $chars) {
                         $line = substr($token, $chars);
                         $token = substr($token, 0, $chars);
-                    } else {
+                    }else {
                         $line .= $this->nextLine();
                     }
                     $tokens[] = $token;
-                    $line = trim($line) . ' ';
+                    $line = trim($line).' ';
                     continue;
                 }
             }
@@ -235,7 +235,7 @@ 
         $line = $this->nextTaggedLine($tag); // get next tag
         if (!$dontParse) {
             $tokens = $this->decodeLine($line);
-        } else {
+        }else {
             $tokens = $line;
         }
         if ($this->debug) echo "<< ".$line."\n";
@@ -286,27 +286,27 @@ 
     public function sendRequest(string $command, array $tokens = [], string &$tag = null) {
         if (!$tag) {
             $this->noun++;
-            $tag = 'TAG' . $this->noun;
+            $tag = 'TAG'.$this->noun;
         }
 
-        $line = $tag . ' ' . $command;
+        $line = $tag.' '.$command;
 
         foreach ($tokens as $token) {
             if (is_array($token)) {
-                if (fwrite($this->stream, $line . ' ' . $token[0] . "\r\n") === false) {
+                if (fwrite($this->stream, $line.' '.$token[0]."\r\n") === false) {
                     throw new RuntimeException('failed to write - connection closed?');
                 }
                 if (!$this->assumedNextLine('+ ')) {
                     throw new RuntimeException('failed to send literal string');
                 }
                 $line = $token[1];
-            } else {
-                $line .= ' ' . $token;
+            }else {
+                $line .= ' '.$token;
             }
         }
         if ($this->debug) echo ">> ".$line."\n";
 
-        if (fwrite($this->stream, $line . "\r\n") === false) {
+        if (fwrite($this->stream, $line."\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
         }
     }
@@ -336,9 +336,9 @@ 
     public function escapeString($string) {
         if (func_num_args() < 2) {
             if (strpos($string, "\n") !== false) {
-                return ['{' . strlen($string) . '}', $string];
-            } else {
-                return '"' . str_replace(['\\', '"'], ['\\\\', '\\"'], $string) . '"';
+                return ['{'.strlen($string).'}', $string];
+            }else {
+                return '"'.str_replace(['\\', '"'], ['\\\\', '\\"'], $string).'"';
             }
         }
         $result = [];
@@ -363,7 +363,7 @@ 
             }
             $result[] = $this->escapeList($v);
         }
-        return '(' . implode(' ', $result) . ')';
+        return '('.implode(' ', $result).')';
     }
 
     /**
@@ -404,12 +404,12 @@ 
                     error_log("got an extra server challenge: $response");
                     // respond with an empty response.
                     $this->sendRequest('');
-                } else {
+                }else {
                     if (preg_match('/^NO /i', $response) ||
                         preg_match('/^BAD /i', $response)) {
                         error_log("got failure response: $response");
                         return false;
-                    } else if (preg_match("/^OK /i", $response)) {
+                    }else if (preg_match("/^OK /i", $response)) {
                         return true;
                     }
                 }
@@ -490,10 +490,10 @@ 
                     $result[strtolower($tokens[1])] = $tokens[0];
                     break;
                 case '[UIDVALIDITY':
-                    $result['uidvalidity'] = (int)$tokens[2];
+                    $result['uidvalidity'] = (int) $tokens[2];
                     break;
                 case '[UIDNEXT':
-                    $result['uidnext'] = (int)$tokens[2];
+                    $result['uidnext'] = (int) $tokens[2];
                     break;
                 default:
                     // ignore
@@ -550,14 +550,14 @@ 
         if (is_array($from)) {
             $set = implode(',', $from);
         } elseif ($to === null) {
-            $set = (int)$from;
+            $set = (int) $from;
         } elseif ($to === INF) {
-            $set = (int)$from . ':*';
-        } else {
-            $set = (int)$from . ':' . (int)$to;
+            $set = (int) $from.':*';
+        }else {
+            $set = (int) $from.':'.(int) $to;
         }
 
-        $items = (array)$items;
+        $items = (array) $items;
         $itemList = $this->escapeList($items);
 
         $this->sendRequest($this->buildUIDCommand("FETCH", $uid), [$set, $itemList], $tag);
@@ -574,9 +574,9 @@ 
                 $count = count($tokens[2]);
                 if ($tokens[2][$count - 2] == 'UID') {
                     $uidKey = $count - 1;
-                } else if ($tokens[2][0] == 'UID') {
+                }else if ($tokens[2][0] == 'UID') {
                     $uidKey = 1;
-                } else {
+                }else {
                     $uidKey = array_search('UID', $tokens[2]) + 1;
                 }
             }
@@ -592,7 +592,7 @@ 
                     $data = $tokens[2][1];
                 } elseif ($uid && $tokens[2][2] == $items[0]) {
                     $data = $tokens[2][3];
-                } else {
+                }else {
                     $expectedResponse = 0;
                     // maybe the server send an other field we didn't wanted
                     $count = count($tokens[2]);
@@ -609,7 +609,7 @@ 
                         continue;
                     }
                 }
-            } else {
+            }else {
                 $data = [];
                 while (key($tokens[2]) !== null) {
                     $data[current($tokens[2])] = next($tokens[2]);
@@ -626,7 +626,7 @@ 
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            }else {
                 $result[$tokens[0]] = $data;
             }
         }
@@ -691,7 +691,7 @@ 
 
         if ($this->enable_uid_cache && $this->uid_cache) {
             $uids = $this->uid_cache;
-        } else {
+        }else {
             try {
                 $uids = $this->fetch('UID', 1, INF);
                 $this->setUidCache($uids); // set cache for this folder
@@ -785,7 +785,7 @@ 
         $response = $this->requestAndResponse($command, [$set, $item, $flags], $silent);
 
         if ($silent) {
-            return (bool)$response;
+            return (bool) $response;
         }
 
         $result = [];
@@ -1086,7 +1086,7 @@ 
         $ids = [];
         foreach ($uids as $msgn => $v) {
             $id = $uid ? $v : $msgn;
-            if ( ($to >= $id && $from <= $id) || ($to === "*" && $from <= $id) ){
+            if (($to >= $id && $from <= $id) || ($to === "*" && $from <= $id)) {
                 $ids[] = $id;
             }
         }
@@ -1100,14 +1100,14 @@ 
     /**
      * Enable the debug mode
      */
-    public function enableDebug(){
+    public function enableDebug() {
         $this->debug = true;
     }
 
     /**
      * Disable the debug mode
      */
-    public function disableDebug(){
+    public function disableDebug() {
         $this->debug = false;
     }
 
@@ -1119,9 +1119,9 @@ 
      * @return int|string
      */
     public function buildSet($from, $to = null) {
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
         return $set;
     }

src/Message.php

Braces +17 added lines, -11 removed lines

@@ -299,7 +299,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))) {
@@ -505,7 +505,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");
         }
     }
@@ -549,7 +549,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);
@@ -574,7 +574,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            } else{
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -745,9 +745,9 @@ 
                     return EncodingAliases::get($parameter->value, "ISO-8859-2");
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        } elseif (property_exists($structure, 'charset')){
             return EncodingAliases::get($structure->charset, "ISO-8859-2");
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -936,13 +936,15 @@ 
      * @throws MessageHeaderFetchingException
      */
     protected function fetchNewMail(Folder $folder, int $next_uid, string $event, bool $expunge): Message {
-        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);
         }
 
@@ -976,7 +978,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);
@@ -996,7 +1000,9 @@ 
      */
     public function restore(bool $expunge = true): bool {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -1424,7 +1430,7 @@ 
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        } else{
             $this->setMsgn($uid, $msglist);
         }
     }

Spacing +35 added lines, -35 removed lines

@@ -191,7 +191,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");
@@ -252,7 +252,7 @@ 
         $instance->boot();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -277,7 +277,7 @@ 
     /**
      * Boot a new instance
      */
-    public function boot(){
+    public function boot() {
         $this->attributes = [];
 
         $this->config = ClientManager::get('options');
@@ -296,13 +296,13 @@ 
      * @throws MethodNotFoundException
      */
     public function __call(string $method, array $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));
             }
 
@@ -341,7 +341,7 @@ 
      * @return Attribute|mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -415,7 +415,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    public function parseRawHeader(string $raw_header){
+    public function parseRawHeader(string $raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -426,8 +426,8 @@ 
     public function parseRawFlags(array $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);
@@ -500,7 +500,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");
@@ -549,7 +549,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);
@@ -574,7 +574,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            }else {
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -590,7 +590,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -724,7 +724,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);
             }
@@ -745,9 +745,9 @@ 
                     return EncodingAliases::get($parameter->value, "ISO-8859-2");
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        }elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset, "ISO-8859-2");
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -762,7 +762,7 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\RuntimeException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolderByPath($this->folder_path);
     }
 
@@ -778,13 +778,13 @@ 
      * @throws Exceptions\GetMessagesFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function thread(Folder $sent_folder = null, MessageCollection &$thread = null, Folder $folder = null): MessageCollection {
+    public function thread(Folder $sent_folder = null, MessageCollection & $thread = null, Folder $folder = null): MessageCollection {
         $thread = $thread ?: MessageCollection::make([]);
-        $folder = $folder ?:  $this->getFolder();
+        $folder = $folder ?: $this->getFolder();
         $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;
             }
@@ -795,7 +795,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\RuntimeException
      * @throws Exceptions\FolderFetchingException
      */
-    protected function fetchThreadByInReplyTo(MessageCollection &$thread, string $in_reply_to, Folder $primary_folder, Folder $secondary_folder, Folder $sent_folder){
+    protected function fetchThreadByInReplyTo(MessageCollection & $thread, string $in_reply_to, Folder $primary_folder, Folder $secondary_folder, Folder $sent_folder) {
         $primary_folder->query()->inReplyTo($in_reply_to)
         ->setFetchBody($this->getFetchBodyOption())
         ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){
@@ -839,7 +839,7 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\FolderFetchingException
      */
-    protected function fetchThreadByMessageId(MessageCollection &$thread, string $message_id, Folder $primary_folder, Folder $secondary_folder, Folder $sent_folder){
+    protected function fetchThreadByMessageId(MessageCollection & $thread, string $message_id, Folder $primary_folder, Folder $secondary_folder, Folder $sent_folder) {
         $primary_folder->query()->messageId($message_id)
         ->setFetchBody($this->getFetchBodyOption())
         ->leaveUnread()->get()->each(function($message) use(&$thread, $secondary_folder, $sent_folder){
@@ -936,13 +936,13 @@ 
      * @throws MessageHeaderFetchingException
      */
     protected function fetchNewMail(Folder $folder, int $next_uid, string $event, bool $expunge): Message {
-        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);
         }
 
@@ -972,11 +972,11 @@ 
      */
     public function delete(bool $expunge = true, string $trash_path = null, bool $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);
@@ -996,7 +996,7 @@ 
      */
     public function restore(bool $expunge = true): bool {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -1208,7 +1208,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1245,7 +1245,7 @@ 
      * @return $this
      */
     public function setMask($mask): Message {
-        if(class_exists($mask)){
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1268,9 +1268,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);
         }
 
@@ -1420,11 +1420,11 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\MessageNotFoundException
      */
-    public function setSequenceId($uid, int $msglist = null){
+    public function setSequenceId($uid, int $msglist = null) {
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        }else {
             $this->setMsgn($uid, $msglist);
         }
     }