Webklex / php-imap

src/Header.php

Braces +20 added lines, -16 removed lines

@@ -130,20 +130,20 @@ 
         if(isset($this->attributes[$name]) && $strict === false) {
             if ($this->attributize) {
                 $this->attributes[$name]->add($value, true);
-            }else{
+            } else{
                 if(isset($this->attributes[$name])) {
                     if (is_array($this->attributes[$name]) == false) {
                         $this->attributes[$name] = [$this->attributes[$name], $value];
-                    }else{
+                    } else{
                         $this->attributes[$name][] = $value;
                     }
-                }else{
+                } else{
                     $this->attributes[$name] = $value;
                 }
             }
-        }elseif($this->attributize == false){
+        } elseif($this->attributize == false){
             $this->attributes[$name] = $value;
-        }else{
+        } else{
             $this->attributes[$name] = new Attribute($name, $value);
         }
 
@@ -230,7 +230,7 @@ 
                 if ($prev_header !== null) {
                     $headers[$prev_header][] = $line;
                 }
-            }elseif (substr($line, 0, 1) === " ") {
+            } elseif (substr($line, 0, 1) === " ") {
                 $line = substr($line, 1);
                 $line = trim(rtrim($line));
                 if ($prev_header !== null) {
@@ -239,11 +239,11 @@ 
                     }
                     if (is_array($headers[$prev_header])) {
                         $headers[$prev_header][] = $line;
-                    }else{
+                    } else{
                         $headers[$prev_header] .= $line;
                     }
                 }
-            }else{
+            } else{
                 if (($pos = strpos($line, ":")) > 0) {
                     $key = trim(rtrim(strtolower(substr($line, 0, $pos))));
                     $key = str_replace("-", "_", $key);
@@ -251,7 +251,7 @@ 
                     $value = trim(rtrim(substr($line, $pos + 1)));
                     if (isset($headers[$key])) {
                         $headers[$key][]  = $value;
-                    }else{
+                    } else{
                         $headers[$key] = [$value];
                     }
                     $prev_header = $key;
@@ -260,7 +260,9 @@ 
         }
 
         foreach($headers as $key => $values) {
-            if (isset($imap_headers[$key])) continue;
+            if (isset($imap_headers[$key])) {
+                continue;
+            }
             $value = null;
             switch($key){
                 case 'from':
@@ -397,9 +399,9 @@ 
                     return EncodingAliases::get($parameter->value, $this->fallback_encoding);
                 }
             }
-        }elseif (property_exists($structure, 'charset')) {
+        } elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset, $this->fallback_encoding);
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -446,9 +448,9 @@ 
                         }
                     }
                 }
-            }elseif($decoder === 'iconv' && $is_utf8_base) {
+            } elseif($decoder === 'iconv' && $is_utf8_base) {
                 $value = iconv_mime_decode($value);
-            }elseif($is_utf8_base){
+            } elseif($is_utf8_base){
                 $value = mb_decode_mimeheader($value);
             }
 
@@ -481,7 +483,9 @@ 
      * Try to extract the priority from a given raw header string
      */
     private function findPriority() {
-        if(($priority = $this->get("x_priority")) === null) return;
+        if(($priority = $this->get("x_priority")) === null) {
+            return;
+        }
         switch((int)"$priority"){
             case IMAP::MESSAGE_PRIORITY_HIGHEST;
                 $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
@@ -604,7 +608,7 @@ 
         foreach ($this->attributes as $key => $value) {
             if (is_array($value)) {
                 $value = implode(", ", $value);
-            }else{
+            } else{
                 $value = (string)$value;
             }
             // Only parse strings and don't parse any attributes like the user-agent

Spacing +50 added lines, -50 removed lines

@@ -82,10 +82,10 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = preg_replace('/(.)(?=[A-Z])/u', '$1_', substr(strtolower($method), 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 return $this->attributes[$name];
             }
 
@@ -111,7 +111,7 @@ 
      * @return Attribute|mixed
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -127,23 +127,23 @@ 
      * @return Attribute
      */
     public function set($name, $value, $strict = false) {
-        if(isset($this->attributes[$name]) && $strict === false) {
+        if (isset($this->attributes[$name]) && $strict === false) {
             if ($this->attributize) {
                 $this->attributes[$name]->add($value, true);
-            }else{
-                if(isset($this->attributes[$name])) {
+            }else {
+                if (isset($this->attributes[$name])) {
                     if (is_array($this->attributes[$name]) == false) {
                         $this->attributes[$name] = [$this->attributes[$name], $value];
-                    }else{
+                    }else {
                         $this->attributes[$name][] = $value;
                     }
-                }else{
+                }else {
                     $this->attributes[$name] = $value;
                 }
             }
-        }elseif($this->attributize == false){
+        }elseif ($this->attributize == false) {
             $this->attributes[$name] = $value;
-        }else{
+        }else {
             $this->attributes[$name] = new Attribute($name, $value);
         }
 
@@ -159,7 +159,7 @@ 
     public function find($pattern) {
         if (preg_match_all($pattern, $this->raw, $matches)) {
             if (isset($matches[1])) {
-                if(count($matches[1]) > 0) {
+                if (count($matches[1]) > 0) {
                     return $matches[1][0];
                 }
             }
@@ -172,7 +172,7 @@ 
      *
      * @return string|null
      */
-    public function getBoundary(){
+    public function getBoundary() {
         $boundary = $this->find("/boundary\=(.*)/i");
 
         if ($boundary === null) {
@@ -197,7 +197,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    protected function parse(){
+    protected function parse() {
         $header = $this->rfc822_parse_headers($this->raw);
 
         $this->extractAddresses($header);
@@ -215,7 +215,7 @@ 
         $this->parseDate($header);
         foreach ($header as $key => $value) {
             $key = trim(rtrim(strtolower($key)));
-            if(!isset($this->attributes[$key])){
+            if (!isset($this->attributes[$key])) {
                 $this->set($key, $value);
             }
         }
@@ -231,12 +231,12 @@ 
      *
      * @return object
      */
-    public function rfc822_parse_headers($raw_headers){
+    public function rfc822_parse_headers($raw_headers) {
         $headers = [];
         $imap_headers = [];
         if (extension_loaded('imap')) {
             $raw_imap_headers = (array) \imap_rfc822_parse_headers($this->raw);
-            foreach($raw_imap_headers as $key => $values) {
+            foreach ($raw_imap_headers as $key => $values) {
                 $key = str_replace("-", "_", $key);
                 $imap_headers[$key] = $values;
             }
@@ -244,7 +244,7 @@ 
 
         $lines = explode("\r\n", $raw_headers);
         $prev_header = null;
-        foreach($lines as $line) {
+        foreach ($lines as $line) {
             if (substr($line, 0, 1) === "\n") {
                 $line = substr($line, 1);
             }
@@ -264,19 +264,19 @@ 
                     }
                     if (is_array($headers[$prev_header])) {
                         $headers[$prev_header][] = $line;
-                    }else{
+                    }else {
                         $headers[$prev_header] .= $line;
                     }
                 }
-            }else{
+            }else {
                 if (($pos = strpos($line, ":")) > 0) {
                     $key = trim(rtrim(strtolower(substr($line, 0, $pos))));
                     $key = str_replace("-", "_", $key);
 
                     $value = trim(rtrim(substr($line, $pos + 1)));
                     if (isset($headers[$key])) {
-                        $headers[$key][]  = $value;
-                    }else{
+                        $headers[$key][] = $value;
+                    }else {
                         $headers[$key] = [$value];
                     }
                     $prev_header = $key;
@@ -284,10 +284,10 @@ 
             }
         }
 
-        foreach($headers as $key => $values) {
+        foreach ($headers as $key => $values) {
             if (isset($imap_headers[$key])) continue;
             $value = null;
-            switch($key){
+            switch ($key) {
                 case 'from':
                 case 'to':
                 case 'cc':
@@ -302,7 +302,7 @@ 
                     break;
                 default:
                     if (is_array($values)) {
-                        foreach($values as $k => $v) {
+                        foreach ($values as $k => $v) {
                             if ($v == "") {
                                 unset($values[$k]);
                             }
@@ -314,7 +314,7 @@ 
                             $value = implode(" ", $values);
                         } elseif ($available_values > 2) {
                             $value = array_values($values);
-                        } else {
+                        }else {
                             $value = "";
                         }
                     }
@@ -334,12 +334,12 @@ 
      * @return array The decoded elements are returned in an array of objects, where each
      * object has two properties, charset and text.
      */
-    public function mime_header_decode($text){
+    public function mime_header_decode($text) {
         if (extension_loaded('imap')) {
             return \imap_mime_header_decode($text);
         }
         $charset = $this->getEncoding($text);
-        return [(object)[
+        return [(object) [
             "charset" => $charset,
             "text" => $this->convertEncoding($text, $charset)
         ]];
@@ -393,7 +393,7 @@ 
         try {
             if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
                 return iconv($from, $to, $str);
-            } else {
+            }else {
                 if (!$from) {
                     return mb_convert_encoding($str, $to);
                 }
@@ -403,7 +403,7 @@ 
             if (strstr($from, '-')) {
                 $from = str_replace('-', '', $from);
                 return $this->convertEncoding($str, $from, $to);
-            } else {
+            }else {
                 return $str;
             }
         }
@@ -424,7 +424,7 @@ 
             }
         }elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset, $this->fallback_encoding);
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -457,7 +457,7 @@ 
         if ($value !== null) {
             $is_utf8_base = $this->is_uft8($value);
 
-            if($decoder === 'utf-8' && extension_loaded('imap')) {
+            if ($decoder === 'utf-8' && extension_loaded('imap')) {
                 $value = \imap_utf8($value);
                 $is_utf8_base = $this->is_uft8($value);
                 if ($is_utf8_base) {
@@ -466,14 +466,14 @@ 
                 if ($this->notDecoded($original_value, $value)) {
                     $decoded_value = $this->mime_header_decode($value);
                     if (count($decoded_value) > 0) {
-                        if(property_exists($decoded_value[0], "text")) {
+                        if (property_exists($decoded_value[0], "text")) {
                             $value = $decoded_value[0]->text;
                         }
                     }
                 }
-            }elseif($decoder === 'iconv' && $is_utf8_base) {
+            }elseif ($decoder === 'iconv' && $is_utf8_base) {
                 $value = iconv_mime_decode($value);
-            }elseif($is_utf8_base){
+            }elseif ($is_utf8_base) {
                 $value = mb_decode_mimeheader($value);
             }
 
@@ -496,7 +496,7 @@ 
      * @return array
      */
     private function decodeArray($values) {
-        foreach($values as $key => $value) {
+        foreach ($values as $key => $value) {
             $values[$key] = $this->decode($value);
         }
         return $values;
@@ -506,8 +506,8 @@ 
      * Try to extract the priority from a given raw header string
      */
     private function findPriority() {
-        if(($priority = $this->get("x_priority")) === null) return;
-        switch((int)"$priority"){
+        if (($priority = $this->get("x_priority")) === null) return;
+        switch ((int) "$priority") {
             case IMAP::MESSAGE_PRIORITY_HIGHEST;
                 $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
                 break;
@@ -539,7 +539,7 @@ 
      */
     private function decodeAddresses($values) {
         $addresses = [];
-        foreach($values as $address) {
+        foreach ($values as $address) {
             $address = trim(rtrim($address));
             if (strpos($address, ",") == strlen($address) - 1) {
                 $address = substr($address, 0, -1);
@@ -548,7 +548,7 @@ 
                 '/^(?:(?P<name>.+)\s)?(?(name)<|<?)(?P<email>[^\s]+?)(?(name)>|>?)$/',
                 $address,
                 $matches
-            )){
+            )) {
                 $name = trim(rtrim($matches["name"]));
                 $email = trim(rtrim($matches["email"]));
                 list($mailbox, $host) = array_pad(explode("@", $email), 2, null);
@@ -567,7 +567,7 @@ 
      * @param object $header
      */
     private function extractAddresses($header) {
-        foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key){
+        foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $key) {
             if (property_exists($header, $key)) {
                 $this->set($key, $this->parseAddresses($header->$key));
             }
@@ -598,10 +598,10 @@ 
             }
             if (!property_exists($address, 'personal')) {
                 $address->personal = false;
-            } else {
+            }else {
                 $personalParts = $this->mime_header_decode($address->personal);
 
-                if(is_array($personalParts)) {
+                if (is_array($personalParts)) {
                     $address->personal = '';
                     foreach ($personalParts as $p) {
                         $address->personal .= $this->convertEncoding($p->text, $this->getEncoding($p));
@@ -625,23 +625,23 @@ 
     /**
      * Search and extract potential header extensions
      */
-    private function extractHeaderExtensions(){
+    private function extractHeaderExtensions() {
         foreach ($this->attributes as $key => $value) {
             if (is_array($value)) {
                 $value = implode(", ", $value);
-            }else{
-                $value = (string)$value;
+            }else {
+                $value = (string) $value;
             }
             // Only parse strings and don't parse any attributes like the user-agent
             if (in_array($key, ["user_agent"]) === false) {
-                if (($pos = strpos($value, ";")) !== false){
+                if (($pos = strpos($value, ";")) !== false) {
                     $original = substr($value, 0, $pos);
                     $this->set($key, trim(rtrim($original)), true);
 
                     // Get all potential extensions
                     $extensions = explode(";", substr($value, $pos + 1));
-                    foreach($extensions as $extension) {
-                        if (($pos = strpos($extension, "=")) !== false){
+                    foreach ($extensions as $extension) {
+                        if (($pos = strpos($extension, "=")) !== false) {
                             $key = substr($extension, 0, $pos);
                             $key = trim(rtrim(strtolower($key)));
 
@@ -684,7 +684,7 @@ 
             $parsed_date = null;
             $date = $header->date;
 
-            if(preg_match('/\+0580/', $date)) {
+            if (preg_match('/\+0580/', $date)) {
                 $date = str_replace('+0580', '+0530', $date);
             }
 
@@ -707,7 +707,7 @@ 
                         $date = trim(array_pop($array));
                         break;
                 }
-                try{
+                try {
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     throw new InvalidMessageDateException("Invalid message date. ID:".$this->get("message_id"), 1100, $e);

src/Message.php

Spacing +49 added lines, -49 removed lines

@@ -202,7 +202,7 @@ 
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false, $sequence = null) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -261,13 +261,13 @@ 
      * @throws MessageFlagException
      * @throws Exceptions\RuntimeException
      */
-    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();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -302,13 +302,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));
             }
 
@@ -347,7 +347,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);
@@ -506,7 +506,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");
@@ -555,7 +555,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);
@@ -580,7 +580,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            }else {
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -596,7 +596,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -730,7 +730,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);
             }
@@ -751,9 +751,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);
         }
 
@@ -768,7 +768,7 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\RuntimeException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -784,13 +784,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->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;
             }
@@ -801,7 +801,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);
             }
@@ -822,7 +822,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){
@@ -843,7 +843,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){
@@ -936,14 +936,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,7 +966,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);
@@ -986,7 +986,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);
@@ -1091,7 +1091,7 @@ 
      *
      * @return AttachmentCollection
      */
-    public function attachments(){
+    public function attachments() {
         return $this->getAttachments();
     }
 
@@ -1189,7 +1189,7 @@ 
      *
      * @return FlagCollection
      */
-    public function flags(){
+    public function flags() {
         return $this->getFlags();
     }
 
@@ -1198,7 +1198,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1224,7 +1224,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -1234,8 +1234,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1247,7 +1247,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1258,9 +1258,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);
         }
 
@@ -1273,7 +1273,7 @@ 
      *
      * @return $this
      */
-    public function setFolderPath($folder_path){
+    public function setFolderPath($folder_path) {
         $this->folder_path = $folder_path;
 
         return $this;
@@ -1285,7 +1285,7 @@ 
      *
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         $this->config = $config;
 
         return $this;
@@ -1297,7 +1297,7 @@ 
      *
      * @return $this
      */
-    public function setAvailableFlags($available_flags){
+    public function setAvailableFlags($available_flags) {
         $this->available_flags = $available_flags;
 
         return $this;
@@ -1309,7 +1309,7 @@ 
      *
      * @return $this
      */
-    public function setAttachments($attachments){
+    public function setAttachments($attachments) {
         $this->attachments = $attachments;
 
         return $this;
@@ -1321,7 +1321,7 @@ 
      *
      * @return $this
      */
-    public function setFlags($flags){
+    public function setFlags($flags) {
         $this->flags = $flags;
 
         return $this;
@@ -1335,7 +1335,7 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setClient($client){
+    public function setClient($client) {
         $this->client = $client;
         $this->client->openFolder($this->folder_path);
 
@@ -1350,7 +1350,7 @@ 
      * @throws Exceptions\RuntimeException
      * @return $this
      */
-    public function setUid($uid){
+    public function setUid($uid) {
         $this->uid = $uid;
         $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
         $this->msglist = null;
@@ -1367,7 +1367,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);
@@ -1380,7 +1380,7 @@ 
      *
      * @return int
      */
-    public function getSequence(){
+    public function getSequence() {
         return $this->sequence;
     }
 
@@ -1389,7 +1389,7 @@ 
      *
      * @return int
      */
-    public function getSequenceId(){
+    public function getSequenceId() {
         return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn;
     }
 
@@ -1401,11 +1401,11 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\RuntimeException
      */
-    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

@@ -305,7 +305,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))) {
@@ -511,7 +511,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");
         }
     }
@@ -555,7 +555,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);
@@ -580,7 +580,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            } else{
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -751,9 +751,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);
         }
 
@@ -937,13 +937,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);
         }
 
@@ -966,7 +968,9 @@ 
      */
     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);
@@ -986,7 +990,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);
@@ -1405,7 +1411,7 @@ 
         if ($this->getSequence() === IMAP::ST_UID) {
             $this->setUid($uid);
             $this->setMsglist($msglist);
-        }else{
+        } else{
             $this->setMsgn($uid, $msglist);
         }
     }

src/Structure.php

Spacing +12 added lines, -12 removed lines

@@ -77,7 +77,7 @@ 
      * @throws MessageContentFetchingException
      * @throws InvalidMessageDateException
      */
-    protected function parse(){
+    protected function parse() {
         $this->findContentType();
         $this->parts = $this->find_parts();
     }
@@ -85,12 +85,12 @@ 
     /**
      * Determine the message content type
      */
-    public function findContentType(){
+    public function findContentType() {
         $content_type = $this->header->get("content_type");
         $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type;
-        if(stripos($content_type, 'multipart') === 0) {
+        if (stripos($content_type, 'multipart') === 0) {
             $this->type = IMAP::MESSAGE_TYPE_MULTIPART;
-        }else{
+        }else {
             $this->type = IMAP::MESSAGE_TYPE_TEXT;
         }
     }
@@ -103,7 +103,7 @@ 
      * @return Part[]
      * @throws InvalidMessageDateException
      */
-    private function parsePart($context, $part_number = 0){
+    private function parsePart($context, $part_number = 0) {
         $body = $context;
         while (($pos = strpos($body, "\r\n")) > 0) {
             $body = substr($body, $pos + 2);
@@ -126,10 +126,10 @@ 
      * @return array
      * @throws InvalidMessageDateException
      */
-    private function detectParts($boundary, $context, $part_number = 0){
-        $base_parts = explode( $boundary, $context);
+    private function detectParts($boundary, $context, $part_number = 0) {
+        $base_parts = explode($boundary, $context);
         $final_parts = [];
-        foreach($base_parts as $ctx) {
+        foreach ($base_parts as $ctx) {
             $ctx = substr($ctx, 2);
             if ($ctx !== "--" && $ctx != "") {
                 $parts = $this->parsePart($ctx, $part_number);
@@ -150,9 +150,9 @@ 
      * @throws MessageContentFetchingException
      * @throws InvalidMessageDateException
      */
-    public function find_parts(){
-        if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) {
-            if (($boundary = $this->header->getBoundary()) === null)  {
+    public function find_parts() {
+        if ($this->type === IMAP::MESSAGE_TYPE_MULTIPART) {
+            if (($boundary = $this->header->getBoundary()) === null) {
                 throw new MessageContentFetchingException("no content found", 0);
             }
 
@@ -168,7 +168,7 @@ 
      * @return string|null
      * @Depricated since version 2.4.4
      */
-    public function getBoundary(){
+    public function getBoundary() {
         return $this->header->getBoundary();
     }
 }

Braces +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
         $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type;
         if(stripos($content_type, 'multipart') === 0) {
             $this->type = IMAP::MESSAGE_TYPE_MULTIPART;
-        }else{
+        } else{
             $this->type = IMAP::MESSAGE_TYPE_TEXT;
         }
     }