Webklex / laravel-imap

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

examples/custom_attachment_mask.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * New custom method which can be called through a mask
      * @return string
      */
-    public function token(){
+    public function token() {
         return implode('-', [$this->id, $this->getMessage()->getUid(), $this->name]);
     }
 

examples/replace_images_with_url.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 /** @var \Webklex\IMAP\Message $message */
 $message = $folder->query()->limit(1)->get()->first();
 
-$html = $message->getHTMLBody(function($body, $oAttachment){
+$html = $message->getHTMLBody(function($body, $oAttachment) {
     /** @var \Webklex\IMAP\Attachment $oAttachment */
     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
         $oMessage = $oAttachment->getMessage();

src/IMAP/Support/PaginatedCollection.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
      * @return int|null
      */
     public function total($total = null) {
-        if($total === null) {
+        if ($total === null) {
             return $this->total;
         }
 

src/IMAP/Support/Masks/Mask.php

Spacing +9 added lines, -9 removed lines

@@ -39,7 +39,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());
         }
 
@@ -49,7 +49,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
@@ -60,17 +60,17 @@ 
      * @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];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -78,7 +78,7 @@ 
 
         }
 
-        if(method_exists($this->parent, $method) === true){
+        if (method_exists($this->parent, $method) === true) {
             return call_user_func_array([$this->parent, $method], $arguments);
         }
 
@@ -103,7 +103,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -113,14 +113,14 @@ 
     /**
      * @return mixed
      */
-    public function getParent(){
+    public function getParent() {
         return $this->parent;
     }
 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 

Braces +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
                 return $this->attributes[$name];
             }
 
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             if(isset($this->attributes[$name])) {

src/IMAP/Client.php

Indentation +8 added lines, -8 removed lines

@@ -436,14 +436,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 +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']);
             }
         }
@@ -361,7 +361,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);
 
@@ -376,7 +376,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else {
             throw new MailboxFetchingException($this->getLastError());
         }
     }
@@ -392,7 +392,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;
         }
 
@@ -413,8 +413,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;
     }
@@ -430,8 +430,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;
     }
@@ -446,8 +446,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;
     }
@@ -541,7 +541,7 @@ 
         if (!$this->validate_cert) {
             $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';
@@ -664,7 +664,7 @@ 
      * @throws InvalidImapTimeoutTypeException
      */
     public function setTimeout($type, $timeout) {
-        if(0 <= $type && $type <= 4) {
+        if (0 <= $type && $type <= 4) {
             return \imap_timeout($type, $timeout);
         }
 
@@ -678,8 +678,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);
         }
 
@@ -689,7 +689,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -700,7 +700,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -712,7 +712,7 @@ 
     /**
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -723,7 +723,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;
@@ -737,7 +737,7 @@ 
      *
      * @return Folder
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 }

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']);
             }
         }
@@ -376,7 +376,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new MailboxFetchingException($this->getLastError());
         }
     }
@@ -414,7 +414,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;
     }
@@ -431,7 +433,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;
     }
@@ -447,7 +451,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

Spacing +10 added lines, -10 removed lines

@@ -119,7 +119,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);
@@ -132,7 +132,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);
 
@@ -143,7 +143,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);
     }
 
@@ -151,7 +151,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);
     }
 
@@ -316,7 +316,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)
@@ -375,7 +375,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;
     }
@@ -392,7 +392,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;
     }
@@ -433,7 +433,7 @@ 
          */
 
         if ($internal_date != null) {
-            if ($internal_date instanceof \Carbon\Carbon){
+            if ($internal_date instanceof \Carbon\Carbon) {
                 $internal_date = $internal_date->format('d-M-Y H:i:s O');
             }
             return \imap_append($this->client->getConnection(), $this->path, $message, $options, $internal_date);
@@ -454,8 +454,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', '/');
         }
 

Braces +6 added lines, -2 removed lines

@@ -375,7 +375,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;
     }
@@ -392,7 +394,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;
     }

src/IMAP/Query/WhereQuery.php

Braces +9 added lines, -5 removed lines

@@ -83,7 +83,7 @@ 
 
         if (strpos(strtolower($name), "where") === false){
             $method = 'where'.ucfirst($name);
-        }else{
+        } else{
             $method = lcfirst($name);
         }
 
@@ -129,13 +129,13 @@ 
                 }
                 return $this->where($key, $value);
             }
-        }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]);
             }
         }
@@ -150,7 +150,9 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }
@@ -162,7 +164,9 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }

Spacing +16 added lines, -16 removed lines

@@ -76,18 +76,18 @@ 
 
         $name = Str::camel($name);
 
-        if(strtolower(substr($name, 0, 3)) === 'not') {
+        if (strtolower(substr($name, 0, 3)) === 'not') {
             $that = $that->whereNot();
             $name = substr($name, 3);
         }
 
-        if (strpos(strtolower($name), "where") === false){
+        if (strpos(strtolower($name), "where") === false) {
             $method = 'where'.ucfirst($name);
-        }else{
+        } else {
             $method = lcfirst($name);
         }
 
-        if(method_exists($this, $method) === true){
+        if (method_exists($this, $method) === true) {
             return call_user_func_array([$that, $method], $arguments);
         }
 
@@ -106,7 +106,7 @@ 
         if (substr($criteria, 0, 7) === "CUSTOM ") {
             return substr($criteria, 7);
         }
-        if(in_array($criteria, $this->available_criteria) === false) {
+        if (in_array($criteria, $this->available_criteria) === false) {
             throw new InvalidWhereQueryCriteriaException();
         }
 
@@ -121,20 +121,20 @@ 
      * @throws InvalidWhereQueryCriteriaException
      */
     public function where($criteria, $value = null) {
-        if(is_array($criteria)){
-            foreach($criteria as $key => $value){
-                if(is_numeric($key)){
+        if (is_array($criteria)) {
+            foreach ($criteria as $key => $value) {
+                if (is_numeric($key)) {
                     return $this->where($value);
                 }
                 return $this->where($key, $value);
             }
-        }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]);
             }
         }
@@ -149,7 +149,7 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }
@@ -161,7 +161,7 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }
@@ -401,7 +401,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereNoXSpam(){
+    public function whereNoXSpam() {
         return $this->where("CUSTOM X-Spam-Flag NO");
     }
 
@@ -409,7 +409,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereIsXSpam(){
+    public function whereIsXSpam() {
         return $this->where("CUSTOM X-Spam-Flag YES");
     }
 
@@ -419,7 +419,7 @@ 
      * @return WhereQuery
      * @throws InvalidWhereQueryCriteriaException
      */
-    public function whereLanguage($country_code){
+    public function whereLanguage($country_code) {
         return $this->where("Content-Language $country_code");
     }
 }