Webklex / laravel-imap

src/IMAP/Query/Query.php

Spacing +15 added lines, -15 removed lines

@@ -68,7 +68,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->date_format = config('imap.date_format', 'd M y');
 
@@ -80,7 +80,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -88,8 +88,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($this->date_format);
                 break;
@@ -106,7 +106,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);
@@ -145,16 +145,16 @@ 
      * @return \Illuminate\Support\Collection
      * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException
      */
-    protected function search(){
+    protected function search() {
         $this->generate_query();
 
         /**
          * 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());
         }
 
@@ -194,15 +194,15 @@ 
 
                 $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;
@@ -233,7 +233,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;
 
@@ -251,9 +251,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].'"';
                 }
             }
@@ -283,7 +283,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;

Braces +11 added lines, -5 removed lines

@@ -68,7 +68,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->date_format = config('imap.date_format', 'd M y');
 
@@ -106,7 +108,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);
@@ -154,7 +158,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());
         }
 
@@ -253,7 +257,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -283,7 +287,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;

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/Message.php

Spacing +36 added lines, -36 removed lines

@@ -197,7 +197,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;
         }
 
@@ -216,7 +216,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();
@@ -239,17 +239,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(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 = Str::snake(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];
@@ -278,7 +278,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -364,11 +364,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);
                     }
@@ -397,14 +397,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);
         }
 
@@ -434,9 +434,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;
@@ -487,7 +487,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);
             }
 
@@ -510,7 +510,7 @@ 
                         $date = trim(array_pop($array));
                         break;
                 }
-                try{
+                try {
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     throw new InvalidMessageDateException("Invalid message date. ID:".$this->getMessageId(), 1000, $e);
@@ -533,7 +533,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);
             }
         }
@@ -605,7 +605,7 @@ 
             } else {
                 $personalParts = \imap_mime_header_decode($address->personal);
 
-                if(is_array($personalParts)) {
+                if (is_array($personalParts)) {
                     $address->personal = '';
                     foreach ($personalParts as $p) {
                         $encoding = $this->getEncoding($p->text);
@@ -633,12 +633,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);
@@ -917,7 +917,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -967,7 +967,7 @@ 
         return null;
     }
 
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -983,7 +983,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);
@@ -991,8 +991,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, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -1012,7 +1012,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;
     }
@@ -1028,7 +1028,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;
     }
@@ -1158,7 +1158,7 @@ 
     /**
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1184,7 +1184,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
@@ -1192,8 +1192,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1203,7 +1203,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1214,9 +1214,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

@@ -246,7 +246,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(in_array($name, array_keys($this->attributes))) {
@@ -366,9 +366,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);
                     }
@@ -399,7 +399,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);
             }
         }
@@ -917,7 +917,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -983,7 +983,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);
@@ -992,7 +994,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, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -1012,7 +1016,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;
     }
@@ -1028,7 +1034,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;
     }

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/Attachment.php

Spacing +15 added lines, -15 removed lines

@@ -98,7 +98,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;
         }
 
@@ -115,10 +115,10 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
 
-            if(isset($this->attributes[$name])) {
+            if (isset($this->attributes[$name])) {
                 return $this->attributes[$name];
             }
 
@@ -152,7 +152,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -264,9 +264,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);
         }
     }
@@ -286,28 +286,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;
     }
 
@@ -315,8 +315,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -326,7 +326,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -337,9 +337,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

@@ -123,7 +123,7 @@ 
             }
 
             return null;
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             $this->attributes[$name] = array_pop($arguments);
@@ -266,7 +266,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);
         }
     }