Webklex / php-imap

src/Part.php

Braces +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
     protected function parse(){
         if ($this->header === null) {
             $body = $this->findHeaders();
-        }else{
+        } else{
             $body = $this->raw;
         }
 

Spacing +18 added lines, -18 removed lines

@@ -159,10 +159,10 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    protected function parse(){
+    protected function parse() {
         if ($this->header === null) {
             $body = $this->findHeaders();
-        }else{
+        }else {
             $body = $this->raw;
         }
 
@@ -174,11 +174,11 @@ 
         $this->name = $this->header->get("name");
         $this->filename = $this->header->get("filename");
 
-        if(!empty($this->header->get("id"))) {
+        if (!empty($this->header->get("id"))) {
             $this->id = $this->header->get("id");
-        } else if(!empty($this->header->get("x_attachment_id"))){
+        }else if (!empty($this->header->get("x_attachment_id"))) {
             $this->id = $this->header->get("x_attachment_id");
-        } else if(!empty($this->header->get("content_id"))){
+        }else if (!empty($this->header->get("content_id"))) {
             $this->id = strtr($this->header->get("content_id"), [
                 '<' => '',
                 '>' => ''
@@ -186,7 +186,7 @@ 
         }
 
         $content_types = $this->header->get("content_type");
-        if(!empty($content_types)){
+        if (!empty($content_types)) {
             $this->subtype = $this->parseSubtype($content_types);
             $content_type = $content_types;
             if (is_array($content_types)) {
@@ -207,7 +207,7 @@ 
      * @return string
      * @throws InvalidMessageDateException
      */
-    private function findHeaders(){
+    private function findHeaders() {
         $body = $this->raw;
         while (($pos = strpos($body, "\r\n")) > 0) {
             $body = substr($body, $pos + 2);
@@ -226,16 +226,16 @@ 
      *
      * @return string
      */
-    private function parseSubtype($content_type){
+    private function parseSubtype($content_type) {
         if (is_array($content_type)) {
-            foreach ($content_type as $part){
-                if ((strpos($part, "/")) !== false){
+            foreach ($content_type as $part) {
+                if ((strpos($part, "/")) !== false) {
                     return $this->parseSubtype($part);
                 }
             }
             return null;
         }
-        if (($pos = strpos($content_type, "/")) !== false){
+        if (($pos = strpos($content_type, "/")) !== false) {
             return substr($content_type, $pos + 1);
         }
         return null;
@@ -244,9 +244,9 @@ 
     /**
      * Try to parse the disposition if any is present
      */
-    private function parseDisposition(){
+    private function parseDisposition() {
         $content_disposition = $this->header->get("content_disposition");
-        if($content_disposition !== null) {
+        if ($content_disposition !== null) {
             $this->ifdisposition = true;
             $this->disposition = (is_array($content_disposition)) ? implode(' ', $content_disposition) : $content_disposition;
         }
@@ -255,9 +255,9 @@ 
     /**
      * Try to parse the description if any is present
      */
-    private function parseDescription(){
+    private function parseDescription() {
         $content_description = $this->header->get("content_description");
-        if($content_description !== null) {
+        if ($content_description !== null) {
             $this->ifdescription = true;
             $this->description = $content_description;
         }
@@ -266,9 +266,9 @@ 
     /**
      * Try to parse the encoding if any is present
      */
-    private function parseEncoding(){
+    private function parseEncoding() {
         $encoding = $this->header->get("content_transfer_encoding");
-        if($encoding !== null) {
+        if ($encoding !== null) {
             switch (strtolower($encoding)) {
                 case "quoted-printable":
                     $this->encoding = IMAP::MESSAGE_ENC_QUOTED_PRINTABLE;
@@ -298,7 +298,7 @@ 
      *
      * @return bool
      */
-    public function isAttachment(){
+    public function isAttachment() {
         $valid_disposition = in_array(strtolower($this->disposition), ClientManager::get('options.dispositions'));
 
         if ($this->type == IMAP::MESSAGE_TYPE_TEXT && ($this->ifdisposition == 0 || (empty($this->disposition))) && !$valid_disposition) {

src/Attachment.php

Spacing +17 added lines, -17 removed lines

@@ -104,7 +104,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;
         }
 
@@ -121,10 +121,10 @@ 
      * @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));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
@@ -160,7 +160,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) {
             return $deprecated_guesser::getInstance()->guess($this->getMimeType());
         }
         $guesser = "\Symfony\Component\Mime\MimeTypes";
@@ -292,14 +292,14 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
     /**
      * @return Message
      */
-    public function getMessage(){
+    public function getMessage() {
         return $this->oMessage;
     }
 
@@ -309,8 +309,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -322,7 +322,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -333,9 +333,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);
         }
 

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

src/Folder.php

Braces +7 added lines, -3 removed lines

@@ -232,7 +232,9 @@ 
     public function move($new_name, $expunge = true) {
         $this->client->checkConnection();
         $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $folder = $this->client->getFolder($new_name);
         $event = $this->getEvent("folder", "moved");
@@ -306,7 +308,9 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->client->getConnection()->deleteFolder($this->path);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("folder", "deleted");
         $event::dispatch($this);
@@ -374,7 +378,7 @@ 
 
                     $connection->idle();
                 }
-            }catch (Exceptions\RuntimeException $e) {
+            } catch (Exceptions\RuntimeException $e) {
                 if(strpos($e->getMessage(), "connection closed") === false) {
                     throw $e;
                 }

Spacing +13 added lines, -13 removed lines

@@ -122,7 +122,7 @@ 
 
         $this->setDelimiter($delimiter);
         $this->path      = $folder_name;
-        $this->full_name  = $this->decodeName($folder_name);
+        $this->full_name = $this->decodeName($folder_name);
         $this->name      = $this->getSimpleName($this->delimiter, $this->full_name);
 
         $this->parseAttributes($attributes);
@@ -136,7 +136,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function query($charset = 'UTF-8'){
+    public function query($charset = 'UTF-8') {
         $this->getClient()->checkConnection();
         $this->getClient()->openFolder($this->path);
 
@@ -148,7 +148,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function search($charset = 'UTF-8'){
+    public function search($charset = 'UTF-8') {
         return $this->query($charset);
     }
 
@@ -157,7 +157,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\RuntimeException
      */
-    public function messages($charset = 'UTF-8'){
+    public function messages($charset = 'UTF-8') {
         return $this->query($charset);
     }
 
@@ -232,7 +232,7 @@ 
     public function move($new_name, $expunge = true) {
         $this->client->checkConnection();
         $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $folder = $this->client->getFolder($new_name);
         $event = $this->getEvent("folder", "moved");
@@ -251,7 +251,7 @@ 
      * @throws Exceptions\MessageNotFoundException
      * @throws Exceptions\RuntimeException
      */
-    public function overview($sequence = null){
+    public function overview($sequence = null) {
         $this->client->openFolder($this->path);
         $sequence = $sequence === null ? "1:*" : $sequence;
         $uid = ClientManager::get('options.sequence', IMAP::ST_MSGN) == IMAP::ST_UID;
@@ -276,7 +276,7 @@ 
          */
 
         if ($internal_date != null) {
-            if ($internal_date instanceof Carbon){
+            if ($internal_date instanceof Carbon) {
                 $internal_date = $internal_date->format('d-M-Y H:i:s O');
             }
         }
@@ -310,7 +310,7 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->client->getConnection()->deleteFolder($this->path);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("folder", "deleted");
         $event::dispatch($this);
@@ -371,7 +371,7 @@ 
             try {
                 $line = $connection->nextLine();
                 if (($pos = strpos($line, "EXISTS")) !== false) {
-                    $msgn = (int) substr($line, 2, $pos -2);
+                    $msgn = (int) substr($line, 2, $pos - 2);
                     $connection->done();
 
                     $this->client->openFolder($this->path, true);
@@ -384,8 +384,8 @@ 
 
                     $connection->idle();
                 }
-            }catch (Exceptions\RuntimeException $e) {
-                if(strpos($e->getMessage(), "connection closed") === false) {
+            } catch (Exceptions\RuntimeException $e) {
+                if (strpos($e->getMessage(), "connection closed") === false) {
                     throw $e;
                 }
                 if ($auto_reconnect === true) {
@@ -434,8 +434,8 @@ 
      * Set the delimiter
      * @param $delimiter
      */
-    public function setDelimiter($delimiter){
-        if(in_array($delimiter, [null, '', ' ', false]) === true) {
+    public function setDelimiter($delimiter) {
+        if (in_array($delimiter, [null, '', ' ', false]) === true) {
             $delimiter = ClientManager::get('options.delimiter', '/');
         }
 

src/Connection/Protocols/LegacyProtocol.php

Spacing +16 added lines, -16 removed lines

@@ -87,7 +87,7 @@ 
             throw new AuthFailedException($message);
         }
 
-        if(!$this->stream) {
+        if (!$this->stream) {
             $errors = \imap_errors();
             $message = implode("; ", (is_array($errors) ? $errors : array()));
             throw new AuthFailedException($message);
@@ -118,7 +118,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';
@@ -146,7 +146,7 @@ 
      *
      * @return bool
      */
-    public function connected(){
+    public function connected() {
         return !$this->stream;
     }
 
@@ -218,7 +218,7 @@ 
      *
      * @return array
      */
-    public function headers($uids, $rfc = "RFC822", $uid = false){
+    public function headers($uids, $rfc = "RFC822", $uid = false) {
         $result = [];
         $uids = is_array($uids) ? $uids : [$uids];
         foreach ($uids as $uid) {
@@ -234,7 +234,7 @@ 
      *
      * @return array
      */
-    public function flags($uids, $uid = false){
+    public function flags($uids, $uid = false) {
         $result = [];
         $uids = is_array($uids) ? $uids : [$uids];
         foreach ($uids as $uid) {
@@ -242,8 +242,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);
                     }
                 }
@@ -264,7 +264,7 @@ 
         if ($id === null) {
             $overview = $this->overview("1:*");
             $uids = [];
-            foreach($overview as $set){
+            foreach ($overview as $set) {
                 $uids[$set->msgno] = $set->uid;
             }
             return $uids;
@@ -290,7 +290,7 @@ 
      * @return array
      */
     public function overview($sequence, $uid = false) {
-        return \imap_fetch_overview($this->stream, $sequence,$uid ? IMAP::FT_UID : IMAP::NIL);
+        return \imap_fetch_overview($this->stream, $sequence, $uid ? IMAP::FT_UID : IMAP::NIL);
     }
 
     /**
@@ -305,12 +305,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());
         }
 
@@ -332,9 +332,9 @@ 
     public function store(array $flags, $from, $to = null, $mode = null, $silent = true, $uid = false) {
         $flag = trim(is_array($flags) ? implode(" ", $flags) : $flags);
 
-        if ($mode == "+"){
+        if ($mode == "+") {
             $status = \imap_setflag_full($this->stream, $from, $flag, $uid ? IMAP::FT_UID : IMAP::NIL);
-        }else{
+        }else {
             $status = \imap_clearflag_full($this->stream, $from, $flag, $uid ? IMAP::FT_UID : IMAP::NIL);
         }
 
@@ -356,7 +356,7 @@ 
      */
     public function appendMessage($folder, $message, $flags = null, $date = null) {
         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);
@@ -493,14 +493,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;
     }
 

Braces +2 added lines, -2 removed lines

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

src/Address.php

Spacing +8 added lines, -8 removed lines

@@ -44,11 +44,11 @@ 
      * @param object   $object
      */
     public function __construct($object) {
-        if (property_exists($object, "personal")){ $this->personal = $object->personal; }
-        if (property_exists($object, "mailbox")){ $this->mailbox = $object->mailbox; }
-        if (property_exists($object, "host")){ $this->host = $object->host; }
-        if (property_exists($object, "mail")){ $this->mail = $object->mail; }
-        if (property_exists($object, "full")){ $this->full = $object->full; }
+        if (property_exists($object, "personal")) { $this->personal = $object->personal; }
+        if (property_exists($object, "mailbox")) { $this->mailbox = $object->mailbox; }
+        if (property_exists($object, "host")) { $this->host = $object->host; }
+        if (property_exists($object, "mail")) { $this->mail = $object->mail; }
+        if (property_exists($object, "full")) { $this->full = $object->full; }
     }
 
 
@@ -66,7 +66,7 @@ 
      *
      * @return array
      */
-    public function __serialize(){
+    public function __serialize() {
         return [
             "personal" => $this->personal,
             "mailbox" => $this->mailbox,
@@ -81,7 +81,7 @@ 
      *
      * @return array
      */
-    public function toArray(){
+    public function toArray() {
         return $this->__serialize();
     }
 
@@ -90,7 +90,7 @@ 
      *
      * @return string
      */
-    public function toString(){
+    public function toString() {
         return $this->__toString();
     }
 }
\ No newline at end of file

src/Connection/Protocols/ImapProtocol.php

Spacing +44 added lines, -44 removed lines

@@ -84,7 +84,7 @@ 
      * @throws ConnectionFailedException
      * @throws RuntimeException
      */
-    protected function enableTls(){
+    protected function enableTls() {
         $response = $this->requestAndResponse('STARTTLS');
         $result = $response && stream_socket_enable_crypto($this->stream, true, $this->getCryptoMethod());
         if (!$result) {
@@ -146,7 +146,7 @@ 
         $stack = [];
 
         //  replace any trailing <NL> including spaces with a single space
-        $line = rtrim($line) . ' ';
+        $line = rtrim($line).' ';
         while (($pos = strpos($line, ' ')) !== false) {
             $token = substr($line, 0, $pos);
             if (!strlen($token)) {
@@ -176,11 +176,11 @@ 
                     if (strlen($token) > $chars) {
                         $line = substr($token, $chars);
                         $token = substr($token, 0, $chars);
-                    } else {
+                    }else {
                         $line .= $this->nextLine();
                     }
                     $tokens[] = $token;
-                    $line = trim($line) . ' ';
+                    $line = trim($line).' ';
                     continue;
                 }
             }
@@ -230,7 +230,7 @@ 
         $line = $this->nextTaggedLine($tag); // get next tag
         if (!$dontParse) {
             $tokens = $this->decodeLine($line);
-        } else {
+        }else {
             $tokens = $line;
         }
         if ($this->debug) echo "<< ".$line."\n";
@@ -280,27 +280,27 @@ 
     public function sendRequest($command, $tokens = [], &$tag = null) {
         if (!$tag) {
             $this->noun++;
-            $tag = 'TAG' . $this->noun;
+            $tag = 'TAG'.$this->noun;
         }
 
-        $line = $tag . ' ' . $command;
+        $line = $tag.' '.$command;
 
         foreach ($tokens as $token) {
             if (is_array($token)) {
-                if (fwrite($this->stream, $line . ' ' . $token[0] . "\r\n") === false) {
+                if (fwrite($this->stream, $line.' '.$token[0]."\r\n") === false) {
                     throw new RuntimeException('failed to write - connection closed?');
                 }
                 if (!$this->assumedNextLine('+ ')) {
                     throw new RuntimeException('failed to send literal string');
                 }
                 $line = $token[1];
-            } else {
-                $line .= ' ' . $token;
+            }else {
+                $line .= ' '.$token;
             }
         }
         if ($this->debug) echo ">> ".$line."\n";
 
-        if (fwrite($this->stream, $line . "\r\n") === false) {
+        if (fwrite($this->stream, $line."\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
         }
     }
@@ -330,9 +330,9 @@ 
     public function escapeString($string) {
         if (func_num_args() < 2) {
             if (strpos($string, "\n") !== false) {
-                return ['{' . strlen($string) . '}', $string];
-            } else {
-                return '"' . str_replace(['\\', '"'], ['\\\\', '\\"'], $string) . '"';
+                return ['{'.strlen($string).'}', $string];
+            }else {
+                return '"'.str_replace(['\\', '"'], ['\\\\', '\\"'], $string).'"';
             }
         }
         $result = [];
@@ -357,7 +357,7 @@ 
             }
             $result[] = $this->escapeList($v);
         }
-        return '(' . implode(' ', $result) . ')';
+        return '('.implode(' ', $result).')';
     }
 
     /**
@@ -397,12 +397,12 @@ 
                     error_log("got an extra server challenge: $response");
                     // respond with an empty response.
                     $this->sendRequest('');
-                } else {
+                }else {
                     if (preg_match('/^NO /i', $response) ||
                         preg_match('/^BAD /i', $response)) {
                         error_log("got failure response: $response");
                         return false;
-                    } else if (preg_match("/^OK /i", $response)) {
+                    }else if (preg_match("/^OK /i", $response)) {
                         return true;
                     }
                 }
@@ -435,7 +435,7 @@ 
      *
      * @return bool
      */
-    public function connected(){
+    public function connected() {
         return (boolean) $this->stream;
     }
 
@@ -482,10 +482,10 @@ 
                     $result[strtolower($tokens[1])] = $tokens[0];
                     break;
                 case '[UIDVALIDITY':
-                    $result['uidvalidity'] = (int)$tokens[2];
+                    $result['uidvalidity'] = (int) $tokens[2];
                     break;
                 case '[UIDNEXT':
-                    $result['uidnext'] = (int)$tokens[2];
+                    $result['uidnext'] = (int) $tokens[2];
                     break;
                 default:
                     // ignore
@@ -539,17 +539,17 @@ 
         if (is_array($from)) {
             $set = implode(',', $from);
         } elseif ($to === null) {
-            $set = (int)$from;
+            $set = (int) $from;
         } elseif ($to === INF) {
-            $set = (int)$from . ':*';
-        } else {
-            $set = (int)$from . ':' . (int)$to;
+            $set = (int) $from.':*';
+        }else {
+            $set = (int) $from.':'.(int) $to;
         }
 
-        $items = (array)$items;
+        $items = (array) $items;
         $itemList = $this->escapeList($items);
 
-        $this->sendRequest(($uid ? 'UID ' : '') . 'FETCH', [$set, $itemList], $tag);
+        $this->sendRequest(($uid ? 'UID ' : '').'FETCH', [$set, $itemList], $tag);
 
         $result = [];
         $tokens = null; // define $tokens variable before first use
@@ -564,9 +564,9 @@ 
                 $count = count($tokens[2]);
                 if ($tokens[2][$count - 2] == 'UID') {
                     $uidKey = $count - 1;
-                } else if ($tokens[2][0] == 'UID') {
+                }else if ($tokens[2][0] == 'UID') {
                     $uidKey = 1;
-                } else {
+                }else {
                     $uidKey = array_search('UID', $tokens[2]) + 1;
                 }
             }
@@ -582,7 +582,7 @@ 
                     $data = $tokens[2][1];
                 } elseif ($uid && $tokens[2][2] == $items[0]) {
                     $data = $tokens[2][3];
-                } else {
+                }else {
                     // maybe the server send an other field we didn't wanted
                     $count = count($tokens[2]);
                     // we start with 2, because 0 was already checked
@@ -594,7 +594,7 @@ 
                         break;
                     }
                 }
-            } else {
+            }else {
                 $data = [];
                 while (key($tokens[2]) !== null) {
                     $data[current($tokens[2])] = next($tokens[2]);
@@ -611,7 +611,7 @@ 
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            }else {
                 $result[$tokens[0]] = $data;
             }
         }
@@ -645,7 +645,7 @@ 
      * @return array
      * @throws RuntimeException
      */
-    public function headers($uids, $rfc = "RFC822", $uid = false){
+    public function headers($uids, $rfc = "RFC822", $uid = false) {
         return $this->fetch(["$rfc.HEADER"], $uids, null, $uid);
     }
 
@@ -657,7 +657,7 @@ 
      * @return array
      * @throws RuntimeException
      */
-    public function flags($uids, $uid = false){
+    public function flags($uids, $uid = false) {
         return $this->fetch(["FLAGS"], $uids, null, $uid);
     }
 
@@ -742,23 +742,23 @@ 
     public function store(array $flags, $from, $to = null, $mode = null, $silent = true, $uid = false) {
         $item = 'FLAGS';
         if ($mode == '+' || $mode == '-') {
-            $item = $mode . $item;
+            $item = $mode.$item;
         }
         if ($silent) {
             $item .= '.SILENT';
         }
 
         $flags = $this->escapeList($flags);
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
 
         $command = ($uid ? "UID " : "")."STORE";
         $result = $this->requestAndResponse($command, [$set, $item, $flags], $silent);
 
         if ($silent) {
-            return (bool)$result;
+            return (bool) $result;
         }
 
         $tokens = $result;
@@ -809,9 +809,9 @@ 
      * @throws RuntimeException
      */
     public function copyMessage($folder, $from, $to = null, $uid = false) {
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
         $command = ($uid ? "UID " : "")."COPY";
 
@@ -830,9 +830,9 @@ 
      * @throws RuntimeException
      */
     public function moveMessage($folder, $from, $to = null, $uid = false) {
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
         $command = ($uid ? "UID " : "")."MOVE";
 
@@ -1002,7 +1002,7 @@ 
         $ids = [];
         foreach ($uids as $msgn => $v) {
             $id = $uid ? $v : $msgn;
-            if ( ($to >= $id && $from <= $id) || ($to === "*" && $from <= $id) ){
+            if (($to >= $id && $from <= $id) || ($to === "*" && $from <= $id)) {
                 $ids[] = $id;
             }
         }
@@ -1016,14 +1016,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;
     }
 }
\ No newline at end of file

Braces +13 added lines, -6 removed lines

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

src/Client.php

Braces +15 added lines, -13 removed lines

@@ -205,7 +205,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;
@@ -239,39 +239,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']);
             }
         }
@@ -335,7 +335,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($this->timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -473,7 +473,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -511,7 +511,9 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {

Spacing +38 added lines, -38 removed lines

@@ -203,11 +203,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;
@@ -219,9 +219,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);
                 }
             }
@@ -235,45 +235,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']);
             }
         }
@@ -337,7 +337,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($this->timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        }else {
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -410,7 +410,7 @@ 
 
         // Set delimiter to false to force selection via getFolderByName (maybe useful for uncommon folder names)
         $delimiter = is_null($delimiter) ? ClientManager::get('options.delimiter', "/") : $delimiter;
-        if (strpos($folder_name, (string)$delimiter) !== false) {
+        if (strpos($folder_name, (string) $delimiter) !== false) {
             return $this->getFolderByPath($folder_name);
         }
 
@@ -462,7 +462,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"]);
 
@@ -477,7 +477,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -515,10 +515,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);
         }
@@ -544,7 +544,7 @@ 
      *
      * @return string
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 
@@ -602,7 +602,7 @@ 
      * @return int
      * @throws ConnectionFailedException
      */
-    public function getTimeout(){
+    public function getTimeout() {
         $this->checkConnection();
         return $this->connection->getConnectionTimeout();
     }
@@ -612,7 +612,7 @@ 
      *
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -622,7 +622,7 @@ 
      *
      * @return array
      */
-    public function getDefaultEvents($section){
+    public function getDefaultEvents($section) {
         return $this->events[$section];
     }
 
@@ -634,7 +634,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -648,7 +648,7 @@ 
      *
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -660,7 +660,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;

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

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

Spacing +50 added lines, -50 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");
@@ -246,14 +246,14 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\MessageNotFoundException
      */
-    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();
         $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($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));
             }
 
@@ -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($raw_header){
+    public function parseRawHeader($raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -427,8 +427,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);
@@ -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);
                 }
             }
-        }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);
         }
 
@@ -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($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->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);
             }
@@ -817,7 +817,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){
@@ -838,7 +838,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){
@@ -934,14 +934,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);
         }
 
@@ -964,7 +964,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);
@@ -984,7 +984,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);
@@ -1089,7 +1089,7 @@ 
      *
      * @return AttachmentCollection
      */
-    public function attachments(){
+    public function attachments() {
         return $this->getAttachments();
     }
 
@@ -1187,7 +1187,7 @@ 
      *
      * @return FlagCollection
      */
-    public function flags(){
+    public function flags() {
         return $this->getFlags();
     }
 
@@ -1196,7 +1196,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1222,7 +1222,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -1232,8 +1232,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1245,7 +1245,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1256,9 +1256,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);
         }
 
@@ -1271,7 +1271,7 @@ 
      *
      * @return $this
      */
-    public function setFolderPath($folder_path){
+    public function setFolderPath($folder_path) {
         $this->folder_path = $folder_path;
 
         return $this;
@@ -1283,7 +1283,7 @@ 
      *
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         $this->config = $config;
 
         return $this;
@@ -1295,7 +1295,7 @@ 
      *
      * @return $this
      */
-    public function setAvailableFlags($available_flags){
+    public function setAvailableFlags($available_flags) {
         $this->available_flags = $available_flags;
 
         return $this;
@@ -1307,7 +1307,7 @@ 
      *
      * @return $this
      */
-    public function setAttachments($attachments){
+    public function setAttachments($attachments) {
         $this->attachments = $attachments;
 
         return $this;
@@ -1319,7 +1319,7 @@ 
      *
      * @return $this
      */
-    public function setFlags($flags){
+    public function setFlags($flags) {
         $this->flags = $flags;
 
         return $this;
@@ -1333,7 +1333,7 @@ 
      * @throws Exceptions\RuntimeException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setClient($client){
+    public function setClient($client) {
         $this->client = $client;
         $this->client->openFolder($this->folder_path);
 
@@ -1348,7 +1348,7 @@ 
      * @throws Exceptions\MessageNotFoundException
      * @throws Exceptions\ConnectionFailedException
      */
-    public function setUid($uid){
+    public function setUid($uid) {
         $this->uid = $uid;
         $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
         $this->msglist = null;
@@ -1365,7 +1365,7 @@ 
      * @throws Exceptions\MessageNotFoundException
      * @throws Exceptions\ConnectionFailedException
      */
-    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);
@@ -1378,7 +1378,7 @@ 
      *
      * @return int
      */
-    public function getSequence(){
+    public function getSequence() {
         return $this->sequence;
     }
 
@@ -1387,7 +1387,7 @@ 
      *
      * @return int
      */
-    public function getSequenceId(){
+    public function getSequenceId() {
         return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn;
     }
 
@@ -1399,11 +1399,11 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\MessageNotFoundException
      */
-    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);
         }
     }