Webklex / laravel-imap

src/IMAP/Folder.php

Spacing +9 added lines, -9 removed lines

@@ -118,7 +118,7 @@ 
 
         $this->setDelimiter($structure->delimiter);
         $this->path      = $structure->name;
-        $this->full_name  = $this->decodeName($structure->name);
+        $this->full_name = $this->decodeName($structure->name);
         $this->name      = $this->getSimpleName($this->delimiter, $this->full_name);
 
         $this->parseAttributes($structure->attributes);
@@ -131,7 +131,7 @@ 
      * @return WhereQuery
      * @throws Exceptions\ConnectionFailedException
      */
-    public function query($charset = 'UTF-8'){
+    public function query($charset = 'UTF-8') {
         $this->getClient()->checkConnection();
         $this->getClient()->openFolder($this->path);
 
@@ -142,7 +142,7 @@ 
      * @inheritdoc self::query($charset = 'UTF-8')
      * @throws Exceptions\ConnectionFailedException
      */
-    public function search($charset = 'UTF-8'){
+    public function search($charset = 'UTF-8') {
         return $this->query($charset);
     }
 
@@ -150,7 +150,7 @@ 
      * @inheritdoc self::query($charset = 'UTF-8')
      * @throws Exceptions\ConnectionFailedException
      */
-    public function messages($charset = 'UTF-8'){
+    public function messages($charset = 'UTF-8') {
         return $this->query($charset);
     }
 
@@ -315,7 +315,7 @@ 
      * @deprecated 1.2.1:2.0.0 No longer needed. Use Folder::query() instead
      * @see Folder::query()
      */
-    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true,  $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") {
+    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") {
         $this->getClient()->checkConnection();
 
         return $this->query($charset)->where($where)->setFetchOptions($fetch_options)->setFetchBody($fetch_body)
@@ -374,7 +374,7 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_deletemailbox($this->client->getConnection(), $this->path);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -391,7 +391,7 @@ 
      */
     public function move($target_mailbox, $expunge = true) {
         $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -440,8 +440,8 @@ 
     /**
      * @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 = config('imap.options.delimiter', '/');
         }
 

src/IMAP/Client.php

Spacing +37 added lines, -37 removed lines

@@ -173,45 +173,45 @@ 
      * @throws MaskNotFoundException
      */
     protected function setMaskFromConfig($config) {
-        $default_config  = config("imap.masks");
+        $default_config = config("imap.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']);
             }
         }
@@ -358,7 +358,7 @@ 
         $pattern = $parent_folder.($hierarchical ? '%' : '*');
 
         $items = imap_getmailboxes($this->connection, $this->getAddress(), $pattern);
-        if(is_array($items)){
+        if (is_array($items)) {
             foreach ($items as $item) {
                 $folder = new Folder($this, $item);
 
@@ -373,7 +373,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else {
             throw new MailboxFetchingException($this->getLastError());
         }
     }
@@ -389,7 +389,7 @@ 
     public function openFolder($folder_path, $attempts = 3) {
         $this->checkConnection();
 
-        if(property_exists($folder_path, 'path')) {
+        if (property_exists($folder_path, 'path')) {
             $folder_path = $folder_path->path;
         }
 
@@ -410,8 +410,8 @@ 
      */
     public function createFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        $status = imap_createmailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -427,8 +427,8 @@ 
      */
     public function renameFolder($old_name, $new_name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name));
-        if($expunge) $this->expunge();
+        $status = imap_renamemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($old_name), $this->getAddress().imap_utf7_encode($new_name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -443,8 +443,8 @@ 
      */
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        $status = imap_deletemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -538,7 +538,7 @@ 
         if (!$this->validate_cert) {
             $address .= '/novalidate-cert';
         }
-        if (in_array($this->encryption,['tls','ssl'])) {
+        if (in_array($this->encryption, ['tls', 'ssl'])) {
             $address .= '/'.$this->encryption;
         }
 
@@ -659,7 +659,7 @@ 
      * @throws InvalidImapTimeoutTypeException
      */
     public function setTimeout($type, $timeout) {
-        if(0 <= $type && $type <= 4) {
+        if (0 <= $type && $type <= 4) {
             return imap_timeout($type, $timeout);
         }
 
@@ -673,8 +673,8 @@ 
      * @return mixed
      * @throws InvalidImapTimeoutTypeException
      */
-    public function getTimeout($type){
-        if(0 <= $type && $type <= 4) {
+    public function getTimeout($type) {
+        if (0 <= $type && $type <= 4) {
             return imap_timeout($type);
         }
 
@@ -684,7 +684,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -695,7 +695,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -707,7 +707,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -718,7 +718,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;
@@ -732,7 +732,7 @@ 
      *
      * @return Folder
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 }

src/IMAP/Message.php

Spacing +34 added lines, -34 removed lines

@@ -196,7 +196,7 @@ 
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_attachment = false, $fetch_flags = false) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -215,7 +215,7 @@ 
         $this->msglist = $msglist;
         $this->client = $client;
 
-        $this->uid =  ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid;
+        $this->uid = ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid;
         $this->msgn = ($this->fetch_options == IMAP::FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid;
 
         $this->parseHeader();
@@ -238,17 +238,17 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = snake_case(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -277,7 +277,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -363,11 +363,11 @@ 
         if ($replaceImages !== false) {
             $this->attachments->each(function($oAttachment) use(&$body, $replaceImages) {
                 /** @var Attachment $oAttachment */
-                if(is_callable($replaceImages)) {
+                if (is_callable($replaceImages)) {
                     $body = $replaceImages($body, $oAttachment);
-                }elseif(is_string($replaceImages)) {
+                }elseif (is_string($replaceImages)) {
                     call_user_func($replaceImages, [$body, $oAttachment]);
-                }else{
+                } else {
                     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
                         $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
                     }
@@ -396,14 +396,14 @@ 
         }
 
         if (property_exists($header, 'subject')) {
-            if($this->config['decoder']['message']['subject'] === 'utf-8') {
+            if ($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = imap_utf8($header->subject);
-            }else{
+            } else {
                 $this->subject = mb_decode_mimeheader($header->subject);
             }
         }
 
-        foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part){
+        foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part) {
             $this->extractHeaderAddressPart($header, $part);
         }
 
@@ -433,9 +433,9 @@ 
      * @return int|null
      */
     private function extractPriority($header) {
-        if(preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)){
+        if (preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)) {
             $priority = isset($priority[1]) ? (int) $priority[1] : 0;
-            switch($priority){
+            switch ($priority) {
                 case IMAP::MESSAGE_PRIORITY_HIGHEST;
                     $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
                     break;
@@ -486,7 +486,7 @@ 
         if (property_exists($header, 'date')) {
             $date = $header->date;
 
-            if(preg_match('/\+0580/', $date)) {
+            if (preg_match('/\+0580/', $date)) {
                 $date = str_replace('+0580', '+0530', $date);
             }
 
@@ -507,7 +507,7 @@ 
                         $date .= 'C';
                         break;
                 }
-                try{
+                try {
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     throw new InvalidMessageDateException("Invalid message date. ID:".$this->getMessageId(), 1000, $e);
@@ -530,7 +530,7 @@ 
         $this->client->openFolder($this->folder_path);
         $flags = imap_fetch_overview($this->client->getConnection(), $this->uid, IMAP::FT_UID);
         if (is_array($flags) && isset($flags[0])) {
-            foreach($this->available_flags as $flag) {
+            foreach ($this->available_flags as $flag) {
                 $this->parseFlag($flags, $flag);
             }
         }
@@ -627,12 +627,12 @@ 
         $this->client->openFolder($this->folder_path);
         $this->structure = imap_fetchstructure($this->client->getConnection(), $this->uid, IMAP::FT_UID);
 
-        if(property_exists($this->structure, 'parts')){
+        if (property_exists($this->structure, 'parts')) {
             $parts = $this->structure->parts;
 
-            foreach ($parts as $part)  {
-                foreach ($part->parameters as $parameter)  {
-                    if($parameter->attribute == "charset")  {
+            foreach ($parts as $part) {
+                foreach ($part->parameters as $parameter) {
+                    if ($parameter->attribute == "charset") {
                         $encoding = $parameter->value;
 
                         $encoding = preg_replace('/Content-Transfer-Encoding/', '', $encoding);
@@ -909,7 +909,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -971,7 +971,7 @@ 
      */
     public function moveToFolder($mailbox = 'INBOX', $expunge = false, $create_folder = true) {
 
-        if($create_folder) $this->client->createFolder($mailbox, true);
+        if ($create_folder) $this->client->createFolder($mailbox, true);
 
         $target_folder = $this->client->getFolder($mailbox);
         $target_status = $target_folder->getStatus(IMAP::SA_ALL);
@@ -979,8 +979,8 @@ 
         $this->client->openFolder($this->folder_path);
         $status = imap_mail_move($this->client->getConnection(), $this->uid, $mailbox, IMAP::CP_UID);
 
-        if($status === true){
-            if($expunge) $this->client->expunge();
+        if ($status === true) {
+            if ($expunge) $this->client->expunge();
             $this->client->openFolder($target_folder->path);
 
             return $target_folder->getMessage($target_status->uidnext);
@@ -1000,7 +1000,7 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -1016,7 +1016,7 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -1146,7 +1146,7 @@ 
     /**
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1172,7 +1172,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
@@ -1180,8 +1180,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1191,7 +1191,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1202,9 +1202,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 +17 added lines, -9 removed lines

@@ -245,7 +245,7 @@ 
                 return $this->attributes[$name];
             }
 
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
@@ -365,9 +365,9 @@ 
                 /** @var Attachment $oAttachment */
                 if(is_callable($replaceImages)) {
                     $body = $replaceImages($body, $oAttachment);
-                }elseif(is_string($replaceImages)) {
+                } elseif(is_string($replaceImages)) {
                     call_user_func($replaceImages, [$body, $oAttachment]);
-                }else{
+                } else{
                     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
                         $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
                     }
@@ -398,7 +398,7 @@ 
         if (property_exists($header, 'subject')) {
             if($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = imap_utf8($header->subject);
-            }else{
+            } else{
                 $this->subject = mb_decode_mimeheader($header->subject);
             }
         }
@@ -909,7 +909,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -971,7 +971,9 @@ 
      */
     public function moveToFolder($mailbox = 'INBOX', $expunge = false, $create_folder = true) {
 
-        if($create_folder) $this->client->createFolder($mailbox, true);
+        if($create_folder) {
+            $this->client->createFolder($mailbox, true);
+        }
 
         $target_folder = $this->client->getFolder($mailbox);
         $target_status = $target_folder->getStatus(IMAP::SA_ALL);
@@ -980,7 +982,9 @@ 
         $status = imap_mail_move($this->client->getConnection(), $this->uid, $mailbox, IMAP::CP_UID);
 
         if($status === true){
-            if($expunge) $this->client->expunge();
+            if($expunge) {
+                $this->client->expunge();
+            }
             $this->client->openFolder($target_folder->path);
 
             return $target_folder->getMessage($target_status->uidnext);
@@ -1000,7 +1004,9 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }
@@ -1016,7 +1022,9 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }