Webklex / php-imap

src/Structure.php

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;
         }
     }

Spacing +9 added lines, -9 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;
         }
     }
@@ -127,9 +127,9 @@ 
      * @throws InvalidMessageDateException
      */
     private function detectParts(string $boundary, string $context, int $part_number = 0): array {
-        $base_parts = explode( $boundary, $context);
+        $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);
@@ -151,8 +151,8 @@ 
      * @throws InvalidMessageDateException
      */
     public function find_parts(): array {
-        if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) {
-            if (($boundary = $this->header->getBoundary()) === null)  {
+        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();
     }
 }

src/Attachment.php

Braces +3 added lines, -3 removed lines

@@ -128,7 +128,7 @@ 
             }
 
             return null;
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             $this->attributes[$name] = array_pop($arguments);
@@ -222,7 +222,7 @@ 
             $this->setName($filename);
         } elseif (($name = $this->part->name) !== null) {
             $this->setName($name);
-        }else {
+        } else {
             $this->setName("undefined");
         }
 
@@ -257,7 +257,7 @@ 
         if ($name !== null) {
             if($decoder === 'utf-8' && extension_loaded('imap')) {
                 $this->name = \imap_utf8($name);
-            }else{
+            } else{
                 $this->name = mb_decode_mimeheader($name);
             }
         }

Spacing +13 added lines, -13 removed lines

@@ -103,7 +103,7 @@ 
         $this->part_number = $part->part_number;
 
         $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -120,10 +120,10 @@ 
      * @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));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
@@ -159,7 +159,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -229,7 +229,7 @@ 
         if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) {
             if ($this->part->ifdescription) {
                 $this->setName($this->part->description);
-            } else {
+            }else {
                 $this->setName($this->part->subtype);
             }
         }
@@ -255,9 +255,9 @@ 
     public function setName($name) {
         $decoder = $this->config['decoder']['attachment'];
         if ($name !== null) {
-            if($decoder === 'utf-8' && extension_loaded('imap')) {
+            if ($decoder === 'utf-8' && extension_loaded('imap')) {
                 $this->name = \imap_utf8($name);
-            }else{
+            }else {
                 $this->name = mb_decode_mimeheader($name);
             }
         }
@@ -268,7 +268,7 @@ 
      *
      * @return string|null
      */
-    public function getMimeType(){
+    public function getMimeType() {
         return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE);
     }
 
@@ -277,9 +277,9 @@ 
      *
      * @return string|null
      */
-    public function getExtension(){
+    public function getExtension() {
         $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser";
-        if (class_exists($deprecated_guesser) !== false){
+        if (class_exists($deprecated_guesser) !== false) {
             /** @var \Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser $deprecated_guesser */
             return $deprecated_guesser::getInstance()->guess($this->getMimeType());
         }
@@ -312,7 +312,7 @@ 
      * @return $this
      */
     public function setMask($mask): Attachment {
-        if(class_exists($mask)){
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -335,9 +335,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);
         }
 

src/Connection/Protocols/LegacyProtocol.php

Braces +2 added lines, -2 removed lines

@@ -323,7 +323,7 @@ 
                 $name = $this->decodeFolderName($item->name);
                 $result[$name] = ['delimiter' => $item->delimiter, 'flags' => []];
             }
-        }else{
+        } else{
             throw new RuntimeException(\imap_last_error());
         }
 
@@ -347,7 +347,7 @@ 
 
         if ($mode == "+"){
             $status = \imap_setflag_full($this->stream, $from, $flag, $uid ? IMAP::ST_UID : IMAP::NIL);
-        }else{
+        } else{
             $status = \imap_clearflag_full($this->stream, $from, $flag, $uid ? IMAP::ST_UID : IMAP::NIL);
         }
 

Spacing +17 added lines, -17 removed lines

@@ -89,16 +89,16 @@ 
             throw new AuthFailedException($message);
         }
 
-        if(!$this->stream) {
+        if (!$this->stream) {
             $errors = \imap_errors();
             $message = implode("; ", (is_array($errors) ? $errors : array()));
             throw new AuthFailedException($message);
         }
 
         $errors = \imap_errors();
-        if(is_array($errors)) {
+        if (is_array($errors)) {
             $status = $this->examineFolder();
-            if($status['exists'] !== 0) {
+            if ($status['exists'] !== 0) {
                 $message = implode("; ", (is_array($errors) ? $errors : array()));
                 throw new RuntimeException($message);
             }
@@ -129,7 +129,7 @@ 
         if (!$this->cert_validation) {
             $address .= '/novalidate-cert';
         }
-        if (in_array($this->encryption,['tls', 'notls', 'ssl'])) {
+        if (in_array($this->encryption, ['tls', 'notls', 'ssl'])) {
             $address .= '/'.$this->encryption;
         } elseif ($this->encryption === "starttls") {
             $address .= '/tls';
@@ -257,8 +257,8 @@ 
             $flags = [];
             if (is_array($raw_flags) && isset($raw_flags[0])) {
                 $raw_flags = (array) $raw_flags[0];
-                foreach($raw_flags as $flag => $value) {
-                    if ($value === 1 && in_array($flag, ["size", "uid", "msgno", "update"]) === false){
+                foreach ($raw_flags as $flag => $value) {
+                    if ($value === 1 && in_array($flag, ["size", "uid", "msgno", "update"]) === false) {
                         $flags[] = "\\".ucfirst($flag);
                     }
                 }
@@ -283,7 +283,7 @@ 
 
             $overview = $this->overview("1:*");
             $uids = [];
-            foreach($overview as $set){
+            foreach ($overview as $set) {
                 $uids[$set->msgno] = $set->uid;
             }
 
@@ -312,7 +312,7 @@ 
      * @return array
      */
     public function overview(string $sequence, $uid = IMAP::ST_UID): array {
-        return \imap_fetch_overview($this->stream, $sequence,$uid ? IMAP::ST_UID : IMAP::NIL);
+        return \imap_fetch_overview($this->stream, $sequence, $uid ? IMAP::ST_UID : IMAP::NIL);
     }
 
     /**
@@ -327,12 +327,12 @@ 
         $result = [];
 
         $items = \imap_getmailboxes($this->stream, $this->getAddress(), $reference.$folder);
-        if(is_array($items)){
+        if (is_array($items)) {
             foreach ($items as $item) {
                 $name = $this->decodeFolderName($item->name);
                 $result[$name] = ['delimiter' => $item->delimiter, 'flags' => []];
             }
-        }else{
+        }else {
             throw new RuntimeException(\imap_last_error());
         }
 
@@ -355,9 +355,9 @@ 
     public function store(array $flags, int $from, $to = null, $mode = null, bool $silent = true, $uid = IMAP::ST_UID, $item = null) {
         $flag = trim(is_array($flags) ? implode(" ", $flags) : $flags);
 
-        if ($mode == "+"){
+        if ($mode == "+") {
             $status = \imap_setflag_full($this->stream, $from, $flag, $uid ? IMAP::ST_UID : IMAP::NIL);
-        }else{
+        }else {
             $status = \imap_clearflag_full($this->stream, $from, $flag, $uid ? IMAP::ST_UID : IMAP::NIL);
         }
 
@@ -379,7 +379,7 @@ 
      */
     public function appendMessage(string $folder, string $message, $flags = null, $date = null): bool {
         if ($date != null) {
-            if ($date instanceof \Carbon\Carbon){
+            if ($date instanceof \Carbon\Carbon) {
                 $date = $date->format('d-M-Y H:i:s O');
             }
             return \imap_append($this->stream, $folder, $message, $flags, $date);
@@ -411,7 +411,7 @@ 
      * @return array|bool Tokens if operation successful, false if an error occurred
      */
     public function copyManyMessages(array $messages, string $folder, $uid = IMAP::ST_UID) {
-        foreach($messages as $msg) {
+        foreach ($messages as $msg) {
             if (!$this->copyMessage($folder, $msg, null, $uid)) {
                 return false;
             }
@@ -443,7 +443,7 @@ 
      * @return array|bool Tokens if operation successful, false if an error occurred
      */
     public function moveManyMessages(array $messages, string $folder, $uid = IMAP::ST_UID) {
-        foreach($messages as $msg) {
+        foreach ($messages as $msg) {
             if (!$this->moveMessage($folder, $msg, null, $uid)) {
                 return false;
             }
@@ -570,14 +570,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;
     }
 

src/Header.php

Braces +6 added lines, -2 removed lines

@@ -285,7 +285,9 @@ 
         }
 
         foreach ($headers as $key => $values) {
-            if (isset($imap_headers[$key])) continue;
+            if (isset($imap_headers[$key])) {
+                continue;
+            }
             $value = null;
             switch ($key) {
                 case 'from':
@@ -506,7 +508,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;

Spacing +27 added lines, -27 removed lines

@@ -91,7 +91,7 @@ 
 
         }
 
-        throw new MethodNotFoundException("Method " . self::class . '::' . $method . '() is not supported');
+        throw new MethodNotFoundException("Method ".self::class.'::'.$method.'() is not supported');
     }
 
     /**
@@ -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])) {
                         $this->attributes[$name] = [$this->attributes[$name], $value];
-                    } else {
+                    }else {
                         $this->attributes[$name][] = $value;
                     }
-                } else {
+                }else {
                     $this->attributes[$name] = $value;
                 }
             }
         } elseif (!$this->attributize) {
             $this->attributes[$name] = $value;
-        } else {
+        }else {
             $this->attributes[$name] = new Attribute($name, $value);
         }
 
@@ -236,7 +236,7 @@ 
         $headers = [];
         $imap_headers = [];
         if (extension_loaded('imap') && $this->config["rfc822"]) {
-            $raw_imap_headers = (array)\imap_rfc822_parse_headers($this->raw);
+            $raw_imap_headers = (array) \imap_rfc822_parse_headers($this->raw);
             foreach ($raw_imap_headers as $key => $values) {
                 $key = str_replace("-", "_", $key);
                 $imap_headers[$key] = $values;
@@ -264,11 +264,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);
@@ -276,7 +276,7 @@ 
                     $value = trim(rtrim(substr($line, $pos + 1)));
                     if (isset($headers[$key])) {
                         $headers[$key][] = $value;
-                    } else {
+                    }else {
                         $headers[$key] = [$value];
                     }
                     $prev_header = $key;
@@ -295,7 +295,7 @@ 
                 case 'reply_to':
                 case 'sender':
                     $value = $this->decodeAddresses($values);
-                    $headers[$key . "address"] = implode(", ", $values);
+                    $headers[$key."address"] = implode(", ", $values);
                     break;
                 case 'subject':
                     $value = implode(" ", $values);
@@ -314,7 +314,7 @@ 
                             $value = implode(" ", $values);
                         } elseif ($available_values > 2) {
                             $value = array_values($values);
-                        } else {
+                        }else {
                             $value = "";
                         }
                     }
@@ -323,7 +323,7 @@ 
             $headers[$key] = $value;
         }
 
-        return (object)array_merge($headers, $imap_headers);
+        return (object) array_merge($headers, $imap_headers);
     }
 
     /**
@@ -340,7 +340,7 @@ 
             return is_array($result) ? $result : [];
         }
         $charset = $this->getEncoding($text);
-        return [(object)[
+        return [(object) [
             "charset" => $charset,
             "text"    => $this->convertEncoding($text, $charset)
         ]];
@@ -394,7 +394,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);
                 }
@@ -404,7 +404,7 @@ 
             if (strstr($from, '-')) {
                 $from = str_replace('-', '', $from);
                 return $this->convertEncoding($str, $from, $to);
-            } else {
+            }else {
                 return $str;
             }
         }
@@ -509,7 +509,7 @@ 
      */
     private function findPriority() {
         if (($priority = $this->get("x_priority")) === null) return;
-        switch ((int)"$priority") {
+        switch ((int) "$priority") {
             case IMAP::MESSAGE_PRIORITY_HIGHEST;
                 $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
                 break;
@@ -548,7 +548,7 @@ 
                     if (isset($parsed_address['address'])) {
                         $mail_address = explode('@', $parsed_address['address']);
                         if (count($mail_address) == 2) {
-                            $addresses[] = (object)[
+                            $addresses[] = (object) [
                                 "personal" => $parsed_address['display'] ?? '',
                                 "mailbox"  => $mail_address[0],
                                 "host"     => $mail_address[1],
@@ -576,7 +576,7 @@ 
                     $name = trim(rtrim($matches["name"]));
                     $email = trim(rtrim($matches["email"]));
                     list($mailbox, $host) = array_pad(explode("@", $email), 2, null);
-                    $addresses[] = (object)[
+                    $addresses[] = (object) [
                         "personal" => $name,
                         "mailbox"  => $mailbox,
                         "host"     => $host,
@@ -614,7 +614,7 @@ 
         }
 
         foreach ($list as $item) {
-            $address = (object)$item;
+            $address = (object) $item;
 
             if (!property_exists($address, 'mailbox')) {
                 $address->mailbox = false;
@@ -624,7 +624,7 @@ 
             }
             if (!property_exists($address, 'personal')) {
                 $address->personal = false;
-            } else {
+            }else {
                 $personalParts = $this->mime_header_decode($address->personal);
 
                 if (is_array($personalParts)) {
@@ -639,8 +639,8 @@ 
                 }
             }
 
-            $address->mail = ($address->mailbox && $address->host) ? $address->mailbox . '@' . $address->host : false;
-            $address->full = ($address->personal) ? $address->personal . ' <' . $address->mail . '>' : $address->mail;
+            $address->mail = ($address->mailbox && $address->host) ? $address->mailbox.'@'.$address->host : false;
+            $address->full = ($address->personal) ? $address->personal.' <'.$address->mail.'>' : $address->mail;
 
             $addresses[] = new Address($address);
         }
@@ -655,8 +655,8 @@ 
         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 (($key == "user_agent") === false) {
@@ -715,7 +715,7 @@ 
 
             $date = trim(rtrim($date));
             try {
-                if(strpos($date, '&nbsp;') !== false){
+                if (strpos($date, '&nbsp;') !== false) {
                     $date = str_replace('&nbsp;', ' ', $date);
                 }
                 $parsed_date = Carbon::parse($date);
@@ -742,8 +742,8 @@ 
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     if (!isset($this->config["fallback_date"])) {
-                        throw new InvalidMessageDateException("Invalid message date. ID:" . $this->get("message_id") . " Date:" . $header->date . "/" . $date, 1100, $e);
-                    } else {
+                        throw new InvalidMessageDateException("Invalid message date. ID:".$this->get("message_id")." Date:".$header->date."/".$date, 1100, $e);
+                    }else {
                         $parsed_date = Carbon::parse($this->config["fallback_date"]);
                     }
                 }

src/ClientManager.php

Braces +15 added lines, -7 removed lines

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

Spacing +23 added lines, -23 removed lines

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

src/Attribute.php

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
     public function offsetSet($offset, $value) {
         if (is_null($offset)) {
             $this->values[] = $value;
-        } else {
+        }else {
             $this->values[$offset] = $value;
         }
     }
@@ -188,7 +188,7 @@ 
             if ($this->contains($value) === false) {
                 $this->values[] = $value;
             }
-        }else{
+        }else {
             $this->values[] = $value;
         }
     }
@@ -237,7 +237,7 @@ 
      *
      * @return mixed|null
      */
-    public function first(){
+    public function first() {
         if ($this->offsetExists(0)) {
             return $this->values[0];
         }
@@ -249,7 +249,7 @@ 
      *
      * @return mixed|null
      */
-    public function last(){
+    public function last() {
         if (($cnt = $this->count()) > 0) {
             return $this->values[$cnt - 1];
         }

Braces +5 added lines, -3 removed lines

@@ -78,7 +78,9 @@ 
      */
     public function toDate(): Carbon {
         $date = $this->first();
-        if ($date instanceof Carbon) return $date;
+        if ($date instanceof Carbon) {
+            return $date;
+        }
 
         return Carbon::parse($date);
     }
@@ -141,7 +143,7 @@ 
     public function add($value, bool $strict = false): Attribute {
         if (is_array($value)) {
             return $this->merge($value, $strict);
-        }elseif ($value !== null) {
+        } elseif ($value !== null) {
             $this->attach($value, $strict);
         }
 
@@ -188,7 +190,7 @@ 
             if ($this->contains($value) === false) {
                 $this->values[] = $value;
             }
-        }else{
+        } else{
             $this->values[] = $value;
         }
     }

src/Query/WhereQuery.php

Spacing +7 added lines, -7 removed lines

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

Braces +7 added lines, -3 removed lines

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

src/Query/Query.php

Braces +9 added lines, -3 removed lines

@@ -91,7 +91,9 @@ 
         $this->setClient($client);
 
         $this->sequence = ClientManager::get('options.sequence', IMAP::ST_MSGN);
-        if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         if (ClientManager::get('options.fetch_order') === 'desc') {
             $this->fetch_order = 'desc';
@@ -137,7 +139,9 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date): Carbon {
-        if ($date instanceof Carbon) return $date;
+        if ($date instanceof Carbon) {
+            return $date;
+        }
 
         try {
             $date = Carbon::parse($date);
@@ -644,7 +648,9 @@ 
      * @return $this
      */
     public function limit(int $limit, int $page = 1): Query {
-        if ($page >= 1) $this->page = $page;
+        if ($page >= 1) {
+            $this->page = $page;
+        }
         $this->limit = $limit;
 
         return $this;

Spacing +10 added lines, -10 removed lines

@@ -95,7 +95,7 @@ 
 
         if (ClientManager::get('options.fetch_order') === 'desc') {
             $this->fetch_order = 'desc';
-        } else {
+        }else {
             $this->fetch_order = 'asc';
         }
 
@@ -124,7 +124,7 @@ 
             $value = $value->format($this->date_format);
         }
 
-        return (string)$value;
+        return (string) $value;
     }
 
     /**
@@ -156,14 +156,14 @@ 
         $this->query->each(function($statement) use (&$query) {
             if (count($statement) == 1) {
                 $query .= $statement[0];
-            } else {
+            }else {
                 if ($statement[1] === null) {
                     $query .= $statement[0];
-                } else {
+                }else {
                     if (is_numeric($statement[1])) {
-                        $query .= $statement[0] . ' ' . $statement[1];
-                    } else {
-                        $query .= $statement[0] . ' "' . $statement[1] . '"';
+                        $query .= $statement[0].' '.$statement[1];
+                    }else {
+                        $query .= $statement[0].' "'.$statement[1].'"';
                     }
                 }
             }
@@ -297,7 +297,7 @@ 
                 $key = $message->getMessageId();
                 break;
         }
-        return (string)$key;
+        return (string) $key;
     }
 
     /**
@@ -345,7 +345,7 @@ 
             $extensions = $raw_messages["extensions"][$uid] ?? [];
 
             $message = $this->make($uid, $msglist, $header, $content, $flag);
-            foreach($extensions as $key => $extension) {
+            foreach ($extensions as $key => $extension) {
                 $message->getHeader()->set($key, $extension);
             }
             if ($message !== null) {
@@ -497,7 +497,7 @@ 
         $uids = $connection->getUid();
         $available_messages = new Collection();
         if (is_array($uids)) {
-            foreach ($uids as $id){
+            foreach ($uids as $id) {
                 if ($closure($id)) {
                     $available_messages->push($id);
                 }

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 +37 added lines, -37 removed lines

@@ -192,7 +192,7 @@ 
         $this->boot();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -253,7 +253,7 @@ 
         $instance->boot();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -278,7 +278,7 @@ 
     /**
      * Boot a new instance
      */
-    public function boot(){
+    public function boot() {
         $this->attributes = [];
 
         $this->config = ClientManager::get('options');
@@ -297,13 +297,13 @@ 
      * @throws MethodNotFoundException
      */
     public function __call(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));
             }
 
@@ -342,7 +342,7 @@ 
      * @return Attribute|mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -416,7 +416,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    public function parseRawHeader(string $raw_header){
+    public function parseRawHeader(string $raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -427,8 +427,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);
@@ -501,7 +501,7 @@ 
      * @throws MessageFlagException
      * @throws Exceptions\RuntimeException
      */
-    public function peek(){
+    public function peek() {
         if ($this->fetch_options == IMAP::FT_PEEK) {
             if ($this->getFlags()->get("seen") == null) {
                 $this->unsetFlag("Seen");
@@ -550,7 +550,7 @@ 
     private function fetchPart(Part $part) {
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        }else {
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -575,7 +575,7 @@ 
 
             if (isset($this->bodies[$subtype])) {
                 $this->bodies[$subtype] .= "\n".$content;
-            }else{
+            }else {
                 $this->bodies[$subtype] = $content;
             }
         }
@@ -591,7 +591,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -725,7 +725,7 @@ 
 
         if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
             return @iconv($from, $to.'//IGNORE', $str);
-        } else {
+        }else {
             if (!$from) {
                 return mb_convert_encoding($str, $to);
             }
@@ -746,9 +746,9 @@ 
                     return EncodingAliases::get($parameter->value, "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);
         }
 
@@ -763,7 +763,7 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\RuntimeException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolderByPath($this->folder_path);
     }
 
@@ -779,13 +779,13 @@ 
      * @throws Exceptions\GetMessagesFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function thread(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;
             }
@@ -796,7 +796,7 @@ 
         $this->fetchThreadByInReplyTo($thread, $this->message_id, $sent_folder, $folder, $sent_folder);
 
         if (is_array($this->in_reply_to)) {
-            foreach($this->in_reply_to as $in_reply_to) {
+            foreach ($this->in_reply_to as $in_reply_to) {
                 $this->fetchThreadByMessageId($thread, $in_reply_to, $folder, $folder, $sent_folder);
                 $this->fetchThreadByMessageId($thread, $in_reply_to, $sent_folder, $folder, $sent_folder);
             }
@@ -818,7 +818,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){
@@ -840,7 +840,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){
@@ -937,13 +937,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);
         }
 
@@ -973,11 +973,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);
@@ -997,7 +997,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);
@@ -1029,7 +1029,7 @@ 
         $event = $this->getEvent("flag", "new");
         $event::dispatch($this, $flag);
 
-        return (bool)$status;
+        return (bool) $status;
     }
 
     /**
@@ -1057,7 +1057,7 @@ 
         $event = $this->getEvent("flag", "deleted");
         $event::dispatch($this, $flag);
 
-        return (bool)$status;
+        return (bool) $status;
     }
 
     /**
@@ -1209,7 +1209,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1246,7 +1246,7 @@ 
      * @return $this
      */
     public function setMask($mask): Message {
-        if(class_exists($mask)){
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1269,9 +1269,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);
         }
 
@@ -1421,11 +1421,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);
         }
     }