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_message_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->message_id, $this->uid, $this->message_no]);
     }
 

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