Webklex / laravel-imap

src/IMAP/Query/WhereQuery.php

Braces +9 added lines, -5 removed lines

@@ -77,17 +77,17 @@ 
             foreach($criteria as $arguments){
                 if(count($arguments) == 1){
                     $this->where($arguments[0]);
-                }elseif(count($arguments) == 2){
+                } elseif(count($arguments) == 2){
                     $this->where($arguments[0], $arguments[1]);
                 }
             }
-        }else{
+        } else{
             $criteria = $this->validate_criteria($criteria);
             $value = $this->parse_value($value);
 
             if($value === null || $value === ''){
                 $this->query->push([$criteria]);
-            }else{
+            } else{
                 $this->query->push([$criteria, $value]);
             }
         }
@@ -102,7 +102,9 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }
@@ -114,7 +116,9 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }

Spacing +15 added lines, -15 removed lines

@@ -75,13 +75,13 @@ 
 
         $name = camel_case($name);
 
-        if(strtolower(substr($name, 0, 3)) === 'not') {
+        if (strtolower(substr($name, 0, 3)) === 'not') {
             $that = $that->whereNot();
             $name = substr($name, 3);
         }
 
         $method = 'where'.ucfirst($name);
-        if(method_exists($this, $method) === true){
+        if (method_exists($this, $method) === true) {
             return call_user_func_array([$that, $method], $arguments);
         }
 
@@ -98,7 +98,7 @@ 
     protected function validate_criteria($criteria) {
         $criteria = strtoupper($criteria);
 
-        if(in_array($criteria, $this->available_criteria) === false) {
+        if (in_array($criteria, $this->available_criteria) === false) {
             throw new InvalidWhereQueryCriteriaException();
         }
 
@@ -113,21 +113,21 @@ 
      * @throws InvalidWhereQueryCriteriaException
      */
     public function where($criteria, $value = null) {
-        if(is_array($criteria)){
-            foreach($criteria as $arguments){
-                if(count($arguments) == 1){
+        if (is_array($criteria)) {
+            foreach ($criteria as $arguments) {
+                if (count($arguments) == 1) {
                     $this->where($arguments[0]);
-                }elseif(count($arguments) == 2){
+                }elseif (count($arguments) == 2) {
                     $this->where($arguments[0], $arguments[1]);
                 }
             }
-        }else{
+        } else {
             $criteria = $this->validate_criteria($criteria);
             $value = $this->parse_value($value);
 
-            if($value === null || $value === ''){
+            if ($value === null || $value === '') {
                 $this->query->push([$criteria]);
-            }else{
+            } else {
                 $this->query->push([$criteria, $value]);
             }
         }
@@ -142,7 +142,7 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }
@@ -154,7 +154,7 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }
@@ -404,7 +404,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereNoXSpam(){
+    public function whereNoXSpam() {
         return $this->where("X-Spam-Flag NO");
     }
 
@@ -412,7 +412,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereIsXSpam(){
+    public function whereIsXSpam() {
         return $this->where("X-Spam-Flag YES");
     }
 
@@ -422,7 +422,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereLanguage($country_code){
+    public function whereLanguage($country_code) {
         return $this->where("Content-Language $country_code");
     }
 }
\ No newline at end of file

src/IMAP/Providers/LaravelServiceProvider.php

Spacing +15 added lines, -15 removed lines

@@ -58,7 +58,7 @@ 
      * If however the default account is missing a parameter the package default account parameter will be used.
      * This can be disabled by setting imap.default in your config file to 'false'
      */
-    private function setVendorConfig(){
+    private function setVendorConfig() {
 
         $config_key = 'imap';
         $path = __DIR__.'/../../config/'.$config_key.'.php';
@@ -70,17 +70,17 @@ 
 
         $config = $this->app['config']->get($config_key);
 
-        if(is_array($config)){
-            if(isset($config['default'])){
-                if(isset($config['accounts']) && $config['default'] != false){
+        if (is_array($config)) {
+            if (isset($config['default'])) {
+                if (isset($config['accounts']) && $config['default'] != false) {
 
                     $default_config = $vendor_config['accounts']['default'];
-                    if(isset($config['accounts'][$config['default']])){
+                    if (isset($config['accounts'][$config['default']])) {
                         $default_config = array_merge($default_config, $config['accounts'][$config['default']]);
                     }
 
-                    if(is_array($config['accounts'])){
-                        foreach($config['accounts'] as $account_key => $account){
+                    if (is_array($config['accounts'])) {
+                        foreach ($config['accounts'] as $account_key => $account) {
                             $config['accounts'][$account_key] = array_merge($default_config, $account);
                         }
                     }
@@ -114,23 +114,23 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if (!is_array($base)) $base = empty($base) ? array() : array($base);
 
-        foreach($arrays as $append) {
+        foreach ($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if (!is_array($append)) $append = array($append);
 
-            foreach($append as $key => $value) {
+            foreach ($append as $key => $value) {
 
-                if(!array_key_exists($key, $base) and !is_numeric($key)) {
+                if (!array_key_exists($key, $base) and !is_numeric($key)) {
                     $base[$key] = $append[$key];
                     continue;
                 }
 
-                if(is_array($value) or is_array($base[$key])) {
+                if (is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
-                } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                } else if (is_numeric($key)) {
+                    if (!in_array($value, $base)) $base[] = $value;
                 } else {
                     $base[$key] = $value;
                 }

Braces +9 added lines, -3 removed lines

@@ -114,11 +114,15 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if(!is_array($base)) {
+            $base = empty($base) ? array() : array($base);
+        }
 
         foreach($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if(!is_array($append)) {
+                $append = array($append);
+            }
 
             foreach($append as $key => $value) {
 
@@ -130,7 +134,9 @@ 
                 if(is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
                 } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                    if(!in_array($value, $base)) {
+                        $base[] = $value;
+                    }
                 } else {
                     $base[$key] = $value;
                 }

src/IMAP/Client.php

Indentation +8 added lines, -8 removed lines

@@ -355,14 +355,14 @@
         return $status;
     }
     
-     /**
-     * Delete Folder
-     * @param string $name
-      * @param boolean $expunge
-     *
-     * @return bool
-     * @throws ConnectionFailedException
-     */
+        /**
+         * Delete Folder
+         * @param string $name
+         * @param boolean $expunge
+         *
+         * @return bool
+         * @throws ConnectionFailedException
+         */
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));

Spacing +35 added lines, -35 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());
         }
     }
@@ -406,8 +406,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;
     }
@@ -423,8 +423,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;
     }
@@ -439,8 +439,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;
     }
@@ -534,7 +534,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;
         }
 
@@ -655,7 +655,7 @@ 
      * @throws InvalidImapTimeoutTypeException
      */
     public function setTimeout($type, $timeout) {
-        if(0 <= $type && $type <= 4) {
+        if (0 <= $type && $type <= 4) {
             return imap_timeout($type, $timeout);
         }
 
@@ -669,8 +669,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);
         }
 
@@ -680,7 +680,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -691,7 +691,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -703,7 +703,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -714,7 +714,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;

Braces +19 added lines, -13 removed lines

@@ -179,39 +179,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']);
             }
         }
@@ -373,7 +373,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new MailboxFetchingException($this->getLastError());
         }
     }
@@ -407,7 +407,9 @@ 
     public function createFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }
@@ -424,7 +426,9 @@ 
     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();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }
@@ -440,7 +444,9 @@ 
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }

src/IMAP/Folder.php

Braces +6 added lines, -2 removed lines

@@ -370,7 +370,9 @@ 
      */
     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;
     }
@@ -387,7 +389,9 @@ 
      */
     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;
     }

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);
 
@@ -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);
     }
 
@@ -314,7 +314,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)
@@ -373,7 +373,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;
     }
@@ -390,7 +390,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;
     }
@@ -439,8 +439,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/Attachment.php

Spacing +15 added lines, -15 removed lines

@@ -93,7 +93,7 @@ 
         $this->part_number = ($part_number) ? $part_number : $this->part_number;
 
         $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -110,10 +110,10 @@ 
      * @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(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
@@ -147,7 +147,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -255,9 +255,9 @@ 
      * @param $name
      */
     public function setName($name) {
-        if($this->config['decoder']['message']['subject'] === 'utf-8') {
+        if ($this->config['decoder']['message']['subject'] === 'utf-8') {
             $this->name = imap_utf8($name);
-        }else{
+        } else {
             $this->name = mb_decode_mimeheader($name);
         }
     }
@@ -277,28 +277,28 @@ 
     /**
      * @return string|null
      */
-    public function getMimeType(){
+    public function getMimeType() {
         return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE);
     }
 
     /**
      * @return string|null
      */
-    public function getExtension(){
+    public function getExtension() {
         return ExtensionGuesser::getInstance()->guess($this->getMimeType());
     }
 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
     /**
      * @return Message
      */
-    public function getMessage(){
+    public function getMessage() {
         return $this->oMessage;
     }
 
@@ -306,8 +306,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -317,7 +317,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -328,9 +328,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 +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             }
 
             return null;
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
             $this->attributes[$name] = array_pop($arguments);
@@ -257,7 +257,7 @@ 
     public function setName($name) {
         if($this->config['decoder']['message']['subject'] === 'utf-8') {
             $this->name = imap_utf8($name);
-        }else{
+        } else{
             $this->name = mb_decode_mimeheader($name);
         }
     }

src/IMAP/Support/Masks/Mask.php

Braces +1 added lines, -1 removed lines

@@ -60,7 +60,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(isset($this->attributes[$name])) {

Spacing +9 added lines, -9 removed lines

@@ -38,7 +38,7 @@ 
     public function __construct($parent) {
         $this->parent = $parent;
 
-        if(method_exists($this->parent, 'getAttributes')){
+        if (method_exists($this->parent, 'getAttributes')) {
             $this->attributes = array_merge($this->attributes, $this->parent->getAttributes());
         }
 
@@ -48,7 +48,7 @@ 
     /**
      * Boot method made to be used by any custom mask
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Call dynamic attribute setter and getter methods and inherit the parent calls
@@ -59,17 +59,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(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -77,7 +77,7 @@ 
 
         }
 
-        if(method_exists($this->parent, $method) === true){
+        if (method_exists($this->parent, $method) === true) {
             return call_user_func_array([$this->parent, $method], $arguments);
         }
 
@@ -102,7 +102,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -112,14 +112,14 @@ 
     /**
      * @return mixed
      */
-    public function getParent(){
+    public function getParent() {
         return $this->parent;
     }
 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 

src/IMAP/Support/Masks/MessageMask.php

Braces +4 added lines, -2 removed lines

@@ -45,7 +45,9 @@ 
      */
     public function getCustomHTMLBody($callback = false) {
         $body = $this->getHtmlBody();
-        if($body === null) return null;
+        if($body === null) {
+            return null;
+        }
 
         if ($callback !== false) {
             $aAttachment = $this->parent->getAttachments();
@@ -53,7 +55,7 @@ 
                 /** @var Attachment $oAttachment */
                 if(is_callable($callback)) {
                     $body = $callback($body, $oAttachment);
-                }elseif(is_string($callback)) {
+                } elseif(is_string($callback)) {
                     call_user_func($callback, [$body, $oAttachment]);
                 }
             });

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
      * Get the message html body
      * @return null
      */
-    public function getHtmlBody(){
+    public function getHtmlBody() {
         $bodies = $this->parent->getBodies();
         if (!isset($bodies['html'])) {
             return null;
@@ -46,15 +46,15 @@ 
      */
     public function getCustomHTMLBody($callback = false) {
         $body = $this->getHtmlBody();
-        if($body === null) return null;
+        if ($body === null) return null;
 
         if ($callback !== false) {
             $aAttachment = $this->parent->getAttachments();
             $aAttachment->each(function($oAttachment) use(&$body, $callback) {
                 /** @var Attachment $oAttachment */
-                if(is_callable($callback)) {
+                if (is_callable($callback)) {
                     $body = $callback($body, $oAttachment);
-                }elseif(is_string($callback)) {
+                }elseif (is_string($callback)) {
                     call_user_func($callback, [$body, $oAttachment]);
                 }
             });
@@ -70,7 +70,7 @@ 
      * @return string|null
      */
     public function getHTMLBodyWithEmbeddedBase64Images() {
-        return $this->getCustomHTMLBody(function($body, $oAttachment){
+        return $this->getCustomHTMLBody(function($body, $oAttachment) {
             /** @var \Webklex\IMAP\Attachment $oAttachment */
             if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
                 $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);

src/IMAP/Query/Query.php

Braces +11 added lines, -5 removed lines

@@ -65,7 +65,9 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if(config('imap.options.fetch') === IMAP::FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         $this->charset = $charset;
         $this->query = collect();
@@ -101,7 +103,9 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date) {
-        if($date instanceof \Carbon\Carbon) return $date;
+        if($date instanceof \Carbon\Carbon) {
+            return $date;
+        }
 
         try {
             $date = Carbon::parse($date);
@@ -152,7 +156,7 @@ 
              */
             if($this->getCharset() === null){
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
-            }else{
+            } else{
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
             }
 
@@ -204,7 +208,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -234,7 +238,9 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if($page >= 1) {
+            $this->page = $page;
+        }
         $this->limit = $limit;
 
         return $this;

Spacing +14 added lines, -14 removed lines

@@ -65,7 +65,7 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if (config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
 
         $this->charset = $charset;
         $this->query = collect();
@@ -75,7 +75,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -83,8 +83,8 @@ 
      *
      * @return string
      */
-    protected function parse_value($value){
-        switch(true){
+    protected function parse_value($value) {
+        switch (true) {
             case $value instanceof \Carbon\Carbon:
                 $value = $value->format('d M y');
                 break;
@@ -101,7 +101,7 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date) {
-        if($date instanceof \Carbon\Carbon) return $date;
+        if ($date instanceof \Carbon\Carbon) return $date;
 
         try {
             $date = Carbon::parse($date);
@@ -150,9 +150,9 @@ 
              * Don't set the charset if it isn't used - prevent strange outlook mail server errors
              * @see https://github.com/Webklex/laravel-imap/issues/100
              */
-            if($this->getCharset() === null){
+            if ($this->getCharset() === null) {
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
-            }else{
+            } else {
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
             }
 
@@ -161,15 +161,15 @@ 
                 $available_messages = collect($available_messages);
                 $options = config('imap.options');
 
-                if(strtolower($options['fetch_order']) === 'desc'){
+                if (strtolower($options['fetch_order']) === 'desc') {
                     $available_messages = $available_messages->reverse();
                 }
 
-                $query =& $this;
+                $query = & $this;
 
                 $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options, $query) {
                     $oMessage = new Message($msgno, $msglist, $query->getClient(), $query->getFetchOptions(), $query->getFetchBody(), $query->getFetchAttachment(), $query->getFetchFlags());
-                    switch ($options['message_key']){
+                    switch ($options['message_key']) {
                         case 'number':
                             $message_key = $oMessage->getMessageNo();
                             break;
@@ -200,7 +200,7 @@ 
      * @return \Illuminate\Pagination\LengthAwarePaginator
      * @throws GetMessagesFailedException
      */
-    public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){
+    public function paginate($per_page = 5, $page = null, $page_name = 'imap_page') {
         $this->page = $page > $this->page ? $page : $this->page;
         $this->limit = $per_page;
 
@@ -218,9 +218,9 @@ 
             if (count($statement) == 1) {
                 $query .= $statement[0];
             } else {
-                if($statement[1] === null){
+                if ($statement[1] === null) {
                     $query .= $statement[0];
-                }else{
+                } else {
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -250,7 +250,7 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if ($page >= 1) $this->page = $page;
         $this->limit = $limit;
 
         return $this;

src/IMAP/Message.php

Spacing +31 added lines, -31 removed lines

@@ -189,7 +189,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;
         }
 
@@ -206,7 +206,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();
@@ -229,17 +229,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(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -268,7 +268,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -352,11 +352,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);
                     }
@@ -384,14 +384,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);
         }
 
@@ -421,9 +421,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;
@@ -474,7 +474,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);
             }
 
@@ -495,7 +495,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);
@@ -517,7 +517,7 @@ 
 
         $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);
             }
         }
@@ -614,12 +614,12 @@ 
     public function parseBody() {
         $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);
@@ -890,7 +890,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -962,7 +962,7 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -976,7 +976,7 @@ 
      */
     public function restore($expunge = true) {
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -1100,7 +1100,7 @@ 
     /**
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1126,7 +1126,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
@@ -1134,8 +1134,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1145,7 +1145,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1156,9 +1156,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 +11 added lines, -7 removed lines

@@ -236,7 +236,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(isset($this->attributes[$name])) {
@@ -354,9 +354,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);
                     }
@@ -386,7 +386,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);
             }
         }
@@ -890,7 +890,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -962,7 +962,9 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }
@@ -976,7 +978,9 @@ 
      */
     public function restore($expunge = true) {
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }