Webklex / php-imap

src/Message.php

Spacing +36 added lines, -36 removed lines

@@ -195,7 +195,7 @@ 
     public function __construct($msgn, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -249,13 +249,13 @@ 
      * @throws MessageContentFetchingException
      * @throws \ReflectionException
      */
-    public static function make($msgn, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null){
+    public static function make($msgn, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null) {
         $reflection = new \ReflectionClass(self::class);
         /** @var self $instance */
         $instance = $reflection->newInstanceWithoutConstructor();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -301,13 +301,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))) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -348,7 +348,7 @@ 
      * @return mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -421,7 +421,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    public function parseRawHeader($raw_header){
+    public function parseRawHeader($raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -432,8 +432,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);
@@ -536,7 +536,7 @@ 
 
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        }else {
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -574,7 +574,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -691,7 +691,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);
             }
@@ -712,9 +712,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);
         }
 
@@ -728,7 +728,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\FolderFetchingException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -743,13 +743,13 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\GetMessagesFailedException
      */
-    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->getFolder(ClientManager::get("options.common_folders.sent", "INBOX/Sent"));
 
         /** @var Message $message */
-        foreach($thread as $message) {
+        foreach ($thread as $message) {
             if ($message->message_id == $this->message_id) {
                 return $thread;
             }
@@ -770,7 +770,7 @@ 
         });
 
         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) {
                 $folder->query()->messageId($in_reply_to)
                     ->setFetchBody($this->getFetchBodyOption())
                     ->leaveUnread()->get()->each(function($message) use(&$thread, $folder, $sent_folder){
@@ -815,7 +815,7 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->copyMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -857,7 +857,7 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->moveMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -884,7 +884,7 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->setFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -903,7 +903,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);
@@ -1056,7 +1056,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1082,7 +1082,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -1092,8 +1092,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1105,7 +1105,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1116,9 +1116,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);
         }
 
@@ -1131,7 +1131,7 @@ 
      *
      * @return $this
      */
-    public function setFolderPath($folder_path){
+    public function setFolderPath($folder_path) {
         $this->folder_path = $folder_path;
 
         return $this;
@@ -1143,7 +1143,7 @@ 
      *
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         $this->config = $config;
 
         return $this;
@@ -1155,7 +1155,7 @@ 
      *
      * @return $this
      */
-    public function setAttachments($attachments){
+    public function setAttachments($attachments) {
         $this->attachments = $attachments;
 
         return $this;
@@ -1167,7 +1167,7 @@ 
      *
      * @return $this
      */
-    public function setFlags($flags){
+    public function setFlags($flags) {
         $this->flags = $flags;
 
         return $this;
@@ -1180,7 +1180,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @return $this
      */
-    public function setClient($client){
+    public function setClient($client) {
         $this->client = $client;
         $this->client->openFolder($this->folder_path);
 
@@ -1196,7 +1196,7 @@ 
      * @throws Exceptions\RuntimeException
      * @return $this
      */
-    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);

src/Client.php

Indentation +1 added lines, -1 removed lines

@@ -377,7 +377,7 @@
             if (strpos($folder_name, $delimiter) !== false) {
                 return $this->getFolderByPath($folder_name);
             }
-	    }
+        }
 
         return $this->getFolderByName($folder_name);
     }

Spacing +37 added lines, -37 removed lines

@@ -177,11 +177,11 @@ 
      * @param array $config
      * @param array $default_config
      */
-    private function setAccountConfig($key, $config, $default_config){
+    private function setAccountConfig($key, $config, $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;
@@ -193,9 +193,9 @@ 
      */
     protected function setEventsFromConfig($config) {
         $this->events = ClientManager::get("events");
-        if(isset($config['events'])){
-            if(isset($config['events'])) {
-                foreach($config['events'] as $section => $events) {
+        if (isset($config['events'])) {
+            if (isset($config['events'])) {
+                foreach ($config['events'] as $section => $events) {
                     $this->events[$section] = array_merge($this->events[$section], $events);
                 }
             }
@@ -209,45 +209,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_message_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_message_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_message_mask = $default_config['attachment'];
-            }else{
+            }else {
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
             }
         }
@@ -311,7 +311,7 @@ 
             $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null;
             $this->connection = new ImapProtocol($this->validate_cert);
             $this->connection->setConnectionTimeout($timeout);
-        }else{
+        }else {
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -424,7 +424,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"]);
 
@@ -439,7 +439,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -475,10 +475,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);
         }
@@ -503,7 +503,7 @@ 
      *
      * @return Folder
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 
@@ -557,7 +557,7 @@ 
      *
      * @return int
      */
-    public function getTimeout($type){
+    public function getTimeout($type) {
         return $this->connection->getConnectionTimeout();
     }
 
@@ -566,7 +566,7 @@ 
      *
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -576,7 +576,7 @@ 
      *
      * @return array
      */
-    public function getDefaultEvents($section){
+    public function getDefaultEvents($section) {
         return $this->events[$section];
     }
 
@@ -588,7 +588,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -602,7 +602,7 @@ 
      *
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -614,7 +614,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;

Braces +15 added lines, -13 removed lines

@@ -181,7 +181,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;
@@ -215,39 +215,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_message_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_message_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_message_mask = $default_config['attachment'];
-            }else{
+            } else{
                 throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']);
             }
         }
@@ -311,7 +311,7 @@ 
             $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null;
             $this->connection = new ImapProtocol($this->validate_cert);
             $this->connection->setConnectionTimeout($timeout);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -439,7 +439,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -475,7 +475,9 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {