Webklex / php-imap

src/Connection/Protocols/ImapProtocol.php

Spacing +49 added lines, -49 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) {
@@ -112,7 +112,7 @@ 
             throw new RuntimeException('empty response');
         }
         if ($this->debug) echo "<< ".$line."\n";
-        return $line . "\n";
+        return $line."\n";
     }
 
     /**
@@ -165,7 +165,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)) {
@@ -195,11 +195,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;
                 }
             }
@@ -249,7 +249,7 @@ 
         $line = $this->nextTaggedLine($tag); // get next tag
         if (!$dontParse) {
             $tokens = $this->decodeLine($line);
-        } else {
+        }else {
             $tokens = $line;
         }
 
@@ -299,20 +299,20 @@ 
     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)) {
-                $this->write($line . ' ' . $token[0]);
+                $this->write($line.' '.$token[0]);
                 if (!$this->assumedNextLine('+ ')) {
                     throw new RuntimeException('failed to send literal string');
                 }
                 $line = $token[1];
-            } else {
-                $line .= ' ' . $token;
+            }else {
+                $line .= ' '.$token;
             }
         }
         $this->write($line);
@@ -325,9 +325,9 @@ 
      * @throws RuntimeException
      */
     public function write(string $data) {
-        if ($this->debug) echo ">> ".$data ."\n";
+        if ($this->debug) echo ">> ".$data."\n";
 
-        if (fwrite($this->stream, $data . "\r\n") === false) {
+        if (fwrite($this->stream, $data."\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
         }
     }
@@ -357,9 +357,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 = [];
@@ -384,7 +384,7 @@ 
             }
             $result[] = $this->escapeList($v);
         }
-        return '(' . implode(' ', $result) . ')';
+        return '('.implode(' ', $result).')';
     }
 
     /**
@@ -425,12 +425,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;
                     }
                 }
@@ -508,16 +508,16 @@ 
             switch ($tokens[1]) {
                 case 'EXISTS':
                 case 'RECENT':
-                    $result[strtolower($tokens[1])] = (int)$tokens[0];
+                    $result[strtolower($tokens[1])] = (int) $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;
                 case '[UNSEEN':
-                    $result['unseen'] = (int)$tokens[2];
+                    $result['unseen'] = (int) $tokens[2];
                     break;
                 case '[NONEXISTENT]':
                     throw new RuntimeException("folder doesn't exist");
@@ -576,14 +576,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);
@@ -600,9 +600,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 {
                     $found = array_search('UID', $tokens[2]);
                     if ($found === false || $found === -1) {
                         continue;
@@ -624,7 +624,7 @@ 
                     $data = $tokens[2][1];
                 } elseif ($uid && $tokens[2][2] == $items[0]) {
                     $data = $tokens[2][3];
-                } else {
+                }else {
                     // maybe the server send an other field we didn't wanted
                     $count = count($tokens[2]);
                     // we start with 2, because 0 was already checked
@@ -636,7 +636,7 @@ 
                         break;
                     }
                 }
-            } else {
+            }else {
                 $data = [];
                 while (key($tokens[2]) !== null) {
                     $data[current($tokens[2])] = next($tokens[2]);
@@ -653,7 +653,7 @@ 
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            }else {
                 $result[$tokens[0]] = $data;
             }
         }
@@ -754,7 +754,7 @@ 
         $ids = $this->getUid();
         foreach ($ids as $k => $v) {
             if ($v == $id) {
-                return (int)$k;
+                return (int) $k;
             }
         }
 
@@ -811,7 +811,7 @@ 
         $response = $this->requestAndResponse($command, [$set, $item, $flags], $silent);
 
         if ($silent) {
-            return (bool)$response;
+            return (bool) $response;
         }
 
         $result = [];
@@ -864,7 +864,7 @@ 
     public function copyMessage(string $folder, $from, $to = null, $uid = IMAP::ST_UID): bool {
         $set = $this->buildSet($from, $to);
         $command = $this->buildUIDCommand("COPY", $uid);
-        return (bool)$this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
     }
 
     /**
@@ -903,7 +903,7 @@ 
         $set = $this->buildSet($from, $to);
         $command = $this->buildUIDCommand("MOVE", $uid);
 
-        return (bool)$this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse($command, [$set, $this->escapeString($folder)], true);
     }
 
     /**
@@ -955,7 +955,7 @@ 
      * @throws RuntimeException
      */
     public function createFolder(string $folder): bool {
-        return (bool)$this->requestAndResponse('CREATE', [$this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse('CREATE', [$this->escapeString($folder)], true);
     }
 
     /**
@@ -967,7 +967,7 @@ 
      * @throws RuntimeException
      */
     public function renameFolder(string $old, string $new): bool {
-        return (bool)$this->requestAndResponse('RENAME', $this->escapeString($old, $new), true);
+        return (bool) $this->requestAndResponse('RENAME', $this->escapeString($old, $new), true);
     }
 
     /**
@@ -978,7 +978,7 @@ 
      * @throws RuntimeException
      */
     public function deleteFolder(string $folder): bool {
-        return (bool)$this->requestAndResponse('DELETE', [$this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse('DELETE', [$this->escapeString($folder)], true);
     }
 
     /**
@@ -989,7 +989,7 @@ 
      * @throws RuntimeException
      */
     public function subscribeFolder(string $folder): bool {
-        return (bool)$this->requestAndResponse('SUBSCRIBE', [$this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse('SUBSCRIBE', [$this->escapeString($folder)], true);
     }
 
     /**
@@ -1000,7 +1000,7 @@ 
      * @throws RuntimeException
      */
     public function unsubscribeFolder(string $folder): bool {
-        return (bool)$this->requestAndResponse('UNSUBSCRIBE', [$this->escapeString($folder)], true);
+        return (bool) $this->requestAndResponse('UNSUBSCRIBE', [$this->escapeString($folder)], true);
     }
 
     /**
@@ -1010,7 +1010,7 @@ 
      * @throws RuntimeException
      */
     public function expunge(): bool {
-        return (bool)$this->requestAndResponse('EXPUNGE');
+        return (bool) $this->requestAndResponse('EXPUNGE');
     }
 
     /**
@@ -1020,7 +1020,7 @@ 
      * @throws RuntimeException
      */
     public function noop(): bool {
-        return (bool)$this->requestAndResponse('NOOP');
+        return (bool) $this->requestAndResponse('NOOP');
     }
 
     /**
@@ -1113,7 +1113,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;
             }
         }
@@ -1127,14 +1127,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;
     }
 
@@ -1146,9 +1146,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/Client.php

Spacing +35 added lines, -35 removed lines

@@ -210,11 +210,11 @@ 
      * @param array $config
      * @param array $default_config
      */
-    private function setAccountConfig(string $key, array $config, array $default_config){
+    private function setAccountConfig(string $key, array $config, array $default_config) {
         $value = $this->default_account_config[$key];
-        if(isset($config[$key])) {
+        if (isset($config[$key])) {
             $value = $config[$key];
-        }elseif(isset($default_config[$key])) {
+        }elseif (isset($default_config[$key])) {
             $value = $default_config[$key];
         }
         $this->$key = $value;
@@ -226,8 +226,8 @@ 
      */
     protected function setEventsFromConfig($config) {
         $this->events = ClientManager::get("events");
-        if(isset($config['events'])){
-            foreach($config['events'] as $section => $events) {
+        if (isset($config['events'])) {
+            foreach ($config['events'] as $section => $events) {
                 $this->events[$section] = array_merge($this->events[$section], $events);
             }
         }
@@ -240,45 +240,45 @@ 
      * @throws MaskNotFoundException
      */
     protected function setMaskFromConfig($config) {
-        $default_config  = ClientManager::get("masks");
+        $default_config = ClientManager::get("masks");
 
-        if(isset($config['masks'])){
-            if(isset($config['masks']['message'])) {
-                if(class_exists($config['masks']['message'])) {
+        if (isset($config['masks'])) {
+            if (isset($config['masks']['message'])) {
+                if (class_exists($config['masks']['message'])) {
                     $this->default_message_mask = $config['masks']['message'];
-                }else{
+                }else {
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']);
                 }
-            }else{
-                if(class_exists($default_config['message'])) {
+            }else {
+                if (class_exists($default_config['message'])) {
                     $this->default_message_mask = $default_config['message'];
-                }else{
+                }else {
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
                 }
             }
-            if(isset($config['masks']['attachment'])) {
-                if(class_exists($config['masks']['attachment'])) {
+            if (isset($config['masks']['attachment'])) {
+                if (class_exists($config['masks']['attachment'])) {
                     $this->default_attachment_mask = $config['masks']['attachment'];
-                }else{
+                }else {
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']);
                 }
-            }else{
-                if(class_exists($default_config['attachment'])) {
+            }else {
+                if (class_exists($default_config['attachment'])) {
                     $this->default_attachment_mask = $default_config['attachment'];
-                }else{
+                }else {
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
                 }
             }
-        }else{
-            if(class_exists($default_config['message'])) {
+        }else {
+            if (class_exists($default_config['message'])) {
                 $this->default_message_mask = $default_config['message'];
-            }else{
+            }else {
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
             }
 
-            if(class_exists($default_config['attachment'])) {
+            if (class_exists($default_config['attachment'])) {
                 $this->default_attachment_mask = $default_config['attachment'];
-            }else{
+            }else {
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
             }
         }
@@ -342,7 +342,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($this->timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        }else {
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -423,7 +423,7 @@ 
 
         // Set delimiter to false to force selection via getFolderByName (maybe useful for uncommon folder names)
         $delimiter = is_null($delimiter) ? ClientManager::get('options.delimiter', "/") : $delimiter;
-        if (strpos($folder_name, (string)$delimiter) !== false) {
+        if (strpos($folder_name, (string) $delimiter) !== false) {
             return $this->getFolderByPath($folder_name);
         }
 
@@ -475,7 +475,7 @@ 
         $pattern = $parent_folder.($hierarchical ? '%' : '*');
         $items = $this->connection->folders('', $pattern);
 
-        if(is_array($items)){
+        if (is_array($items)) {
             foreach ($items as $folder_name => $item) {
                 $folder = new Folder($this, $folder_name, $item["delimiter"], $item["flags"]);
 
@@ -490,7 +490,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -514,7 +514,7 @@ 
         $pattern = $parent_folder.($hierarchical ? '%' : '*');
         $items = $this->connection->folders('', $pattern);
 
-        if(is_array($items)){
+        if (is_array($items)) {
             foreach ($items as $folder_name => $item) {
                 $folder = new Folder($this, $folder_name, $item["delimiter"], $item["flags"]);
 
@@ -530,7 +530,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -568,10 +568,10 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if ($expunge) $this->expunge();
 
         $folder = $this->getFolder($folder);
-        if($status && $folder) {
+        if ($status && $folder) {
             $event = $this->getEvent("folder", "new");
             $event::dispatch($folder);
         }
@@ -597,7 +597,7 @@ 
      *
      * @return string
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 
@@ -709,7 +709,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask(string $mask): Client {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -735,7 +735,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask(string $mask): Client {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;

Braces +16 added lines, -14 removed lines

@@ -214,7 +214,7 @@ 
         $value = $this->default_account_config[$key];
         if(isset($config[$key])) {
             $value = $config[$key];
-        }elseif(isset($default_config[$key])) {
+        } elseif(isset($default_config[$key])) {
             $value = $default_config[$key];
         }
         $this->$key = $value;
@@ -246,39 +246,39 @@ 
             if(isset($config['masks']['message'])) {
                 if(class_exists($config['masks']['message'])) {
                     $this->default_message_mask = $config['masks']['message'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']);
                 }
-            }else{
+            } else{
                 if(class_exists($default_config['message'])) {
                     $this->default_message_mask = $default_config['message'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
                 }
             }
             if(isset($config['masks']['attachment'])) {
                 if(class_exists($config['masks']['attachment'])) {
                     $this->default_attachment_mask = $config['masks']['attachment'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']);
                 }
-            }else{
+            } else{
                 if(class_exists($default_config['attachment'])) {
                     $this->default_attachment_mask = $default_config['attachment'];
-                }else{
+                } else{
                     throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
                 }
             }
-        }else{
+        } else{
             if(class_exists($default_config['message'])) {
                 $this->default_message_mask = $default_config['message'];
-            }else{
+            } else{
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']);
             }
 
             if(class_exists($default_config['attachment'])) {
                 $this->default_attachment_mask = $default_config['attachment'];
-            }else{
+            } else{
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
             }
         }
@@ -342,7 +342,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($this->timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -490,7 +490,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -530,7 +530,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -568,7 +568,9 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {