Webklex / php-imap

src/ClientManager.php

Spacing +23 added lines, -23 removed lines

@@ -68,17 +68,17 @@ 
     public static function get($key, $default = null) {
         $parts = explode('.', $key);
         $value = null;
-        foreach($parts as $part) {
-            if($value === null) {
-                if(isset(self::$config[$part])) {
+        foreach ($parts as $part) {
+            if ($value === null) {
+                if (isset(self::$config[$part])) {
                     $value = self::$config[$part];
-                }else{
+                }else {
                     break;
                 }
-            }else{
-                if(isset($value[$part])) {
+            }else {
+                if (isset($value[$part])) {
                     $value = $value[$part];
-                }else{
+                }else {
                     break;
                 }
             }
@@ -171,7 +171,7 @@ 
      */
     public function setConfig($config) {
 
-        if(is_array($config) === false) {
+        if (is_array($config) === false) {
             $config = require $config;
         }
 
@@ -181,17 +181,17 @@ 
         $vendor_config = require $path;
         $config = $this->array_merge_recursive_distinct($vendor_config, $config);
 
-        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);
                         }
                     }
@@ -227,24 +227,24 @@ 
         $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 {
+                }else if (is_numeric($key)) {
+                    if (!in_array($value, $base)) $base[] = $value;
+                }else {
                     $base[$key] = $value;
                 }
 

Braces +12 added lines, -6 removed lines

@@ -72,13 +72,13 @@ 
             if($value === null) {
                 if(isset(self::$config[$part])) {
                     $value = self::$config[$part];
-                }else{
+                } else{
                     break;
                 }
-            }else{
+            } else{
                 if(isset($value[$part])) {
                     $value = $value[$part];
-                }else{
+                } else{
                     break;
                 }
             }
@@ -227,11 +227,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) {
 
@@ -243,7 +247,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;
                 }

examples/message_table.blade.php

Spacing +2 added lines, -2 removed lines

@@ -26,8 +26,8 @@
     </tr>
     </thead>
     <tbody>
-    <?php if($paginator->count() > 0): ?>
-        <?php foreach($paginator as $message): ?>
+    <?php if ($paginator->count() > 0): ?>
+        <?php foreach ($paginator as $message): ?>
             <tr>
                 <td><?php echo $message->getUid(); ?></td>
                 <td><?php echo $message->getSubject(); ?></td>

Braces +5 added lines, -2 removed lines

@@ -35,11 +35,14 @@
                 <td><?php echo $message->getAttachments()->count() > 0 ? 'yes' : 'no'; ?></td>
             </tr>
         <?php endforeach; ?>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <tr>
             <td colspan="4">No messages found</td>
         </tr>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     </tbody>
 </table>
 

examples/folder_structure.blade.php

Spacing +2 added lines, -2 removed lines

@@ -24,8 +24,8 @@
     </tr>
     </thead>
     <tbody>
-    <?php if($paginator->count() > 0): ?>
-        <?php foreach($paginator as $folder): ?>
+    <?php if ($paginator->count() > 0): ?>
+        <?php foreach ($paginator as $folder): ?>
                 <tr>
                     <td><?php echo $folder->name; ?></td>
                     <td><?php echo $folder->search()->unseen()->setFetchBody(false)->count(); ?></td>

Braces +5 added lines, -2 removed lines

@@ -31,11 +31,14 @@
                     <td><?php echo $folder->search()->unseen()->setFetchBody(false)->count(); ?></td>
                 </tr>
         <?php endforeach; ?>
-    <?php else: ?>
+    <?php else {
+    : ?>
         <tr>
             <td colspan="4">No folders found</td>
         </tr>
-    <?php endif; ?>
+    <?php endif;
+}
+?>
     </tbody>
 </table>
 

src/Part.php

Braces +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
     protected function parse(){
         if ($this->header === null) {
             $body = $this->findHeaders();
-        }else{
+        } else{
             $body = $this->raw;
         }
 

Spacing +17 added lines, -17 removed lines

@@ -159,10 +159,10 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    protected function parse(){
+    protected function parse() {
         if ($this->header === null) {
             $body = $this->findHeaders();
-        }else{
+        }else {
             $body = $this->raw;
         }
 
@@ -174,11 +174,11 @@ 
         $this->name = $this->header->get("name");
         $this->filename = $this->header->get("filename");
 
-        if(!empty($this->header->get("id"))) {
+        if (!empty($this->header->get("id"))) {
             $this->id = $this->header->get("id");
-        } else if(!empty($this->header->get("x-attachment-id"))){
+        }else if (!empty($this->header->get("x-attachment-id"))) {
             $this->id = $this->header->get("x-attachment-id");
-        } else if(!empty($this->header->get("content-id"))){
+        }else if (!empty($this->header->get("content-id"))) {
             $this->id = strtr($this->header->get("content-id"), [
                 '<' => '',
                 '>' => ''
@@ -186,7 +186,7 @@ 
         }
 
         $content_types = $this->header->get("content-type");
-        if(!empty($content_types)){
+        if (!empty($content_types)) {
             $this->subtype = $this->parseSubtype($content_types);
             $content_type = $content_types;
             if (is_array($content_types)) {
@@ -207,7 +207,7 @@ 
      * @return string
      * @throws InvalidMessageDateException
      */
-    private function findHeaders(){
+    private function findHeaders() {
         $body = $this->raw;
         while (($pos = strpos($body, "\r\n")) > 0) {
             $body = substr($body, $pos + 2);
@@ -226,16 +226,16 @@ 
      *
      * @return string
      */
-    private function parseSubtype($content_type){
+    private function parseSubtype($content_type) {
         if (is_array($content_type)) {
-            foreach ($content_type as $part){
-                if ((strpos($part, "/")) !== false){
+            foreach ($content_type as $part) {
+                if ((strpos($part, "/")) !== false) {
                     return $this->parseSubtype($part);
                 }
             }
             return null;
         }
-        if (($pos = strpos($content_type, "/")) !== false){
+        if (($pos = strpos($content_type, "/")) !== false) {
             return substr($content_type, $pos + 1);
         }
         return null;
@@ -244,9 +244,9 @@ 
     /**
      * Try to parse the disposition if any is present
      */
-    private function parseDisposition(){
+    private function parseDisposition() {
         $content_disposition = $this->header->get("content-disposition");
-        if($content_disposition !== null) {
+        if ($content_disposition !== null) {
             $this->ifdisposition = true;
             $this->disposition = (is_array($content_disposition)) ? implode(' ', $content_disposition) : $content_disposition;
         }
@@ -255,9 +255,9 @@ 
     /**
      * Try to parse the description if any is present
      */
-    private function parseDescription(){
+    private function parseDescription() {
         $content_description = $this->header->get("content-description");
-        if($content_description !== null) {
+        if ($content_description !== null) {
             $this->ifdescription = true;
             $this->description = $content_description;
         }
@@ -266,9 +266,9 @@ 
     /**
      * Try to parse the encoding if any is present
      */
-    private function parseEncoding(){
+    private function parseEncoding() {
         $encoding = $this->header->get("content-transfer-encoding");
-        if($encoding !== null) {
+        if ($encoding !== null) {
             switch (strtolower($encoding)) {
                 case "quoted-printable":
                     $this->encoding = IMAP::MESSAGE_ENC_QUOTED_PRINTABLE;

src/Client.php

Spacing +37 added lines, -37 removed lines

@@ -176,11 +176,11 @@ 
      * @param array $config
      * @param array $default_config
      */
-    private function setAccountConfig($key, $config, $default_config){
+    private function setAccountConfig($key, $config, $default_config) {
         $value = $this->default_account_config[$key];
-        if(isset($config[$key])) {
+        if (isset($config[$key])) {
             $value = $config[$key];
-        }elseif(isset($default_config[$key])) {
+        }elseif (isset($default_config[$key])) {
             $value = $default_config[$key];
         }
         $this->$key = $value;
@@ -192,9 +192,9 @@ 
      */
     protected function setEventsFromConfig($config) {
         $this->events = ClientManager::get("events");
-        if(isset($config['events'])){
-            if(isset($config['events'])) {
-                foreach($config['events'] as $section => $events) {
+        if (isset($config['events'])) {
+            if (isset($config['events'])) {
+                foreach ($config['events'] as $section => $events) {
                     $this->events[$section] = array_merge($this->events[$section], $events);
                 }
             }
@@ -208,45 +208,45 @@ 
      * @throws MaskNotFoundException
      */
     protected function setMaskFromConfig($config) {
-        $default_config  = ClientManager::get("masks");
+        $default_config = ClientManager::get("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']);
             }
         }
@@ -310,7 +310,7 @@ 
             $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null;
             $this->connection = new ImapProtocol($this->validate_cert);
             $this->connection->setConnectionTimeout($timeout);
-        }else{
+        }else {
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -387,7 +387,7 @@ 
         $pattern = $parent_folder.($hierarchical ? '%' : '*');
         $items = $this->connection->folders('', $pattern);
 
-        if(is_array($items)){
+        if (is_array($items)) {
             foreach ($items as $folder_name => $item) {
                 $folder = new Folder($this, $folder_name, $item["delimiter"], $item["flags"]);
 
@@ -402,7 +402,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -436,10 +436,10 @@ 
     public function createFolder($folder, $expunge = true) {
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
-        if($expunge) $this->expunge();
+        if ($expunge) $this->expunge();
 
         $folder = $this->getFolder($folder);
-        if($status && $folder) {
+        if ($status && $folder) {
             $event = $this->getEvent("folder", "new");
             $event::dispatch($folder);
         }
@@ -464,7 +464,7 @@ 
      *
      * @return Folder
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 
@@ -518,7 +518,7 @@ 
      *
      * @return int
      */
-    public function getTimeout($type){
+    public function getTimeout($type) {
         return $this->connection->getConnectionTimeout();
     }
 
@@ -527,7 +527,7 @@ 
      *
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -537,7 +537,7 @@ 
      *
      * @return array
      */
-    public function getDefaultEvents($section){
+    public function getDefaultEvents($section) {
         return $this->events[$section];
     }
 
@@ -549,7 +549,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -563,7 +563,7 @@ 
      *
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -575,7 +575,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultAttachmentMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_attachment_mask = $mask;
 
             return $this;

Braces +15 added lines, -13 removed lines

@@ -180,7 +180,7 @@ 
         $value = $this->default_account_config[$key];
         if(isset($config[$key])) {
             $value = $config[$key];
-        }elseif(isset($default_config[$key])) {
+        } elseif(isset($default_config[$key])) {
             $value = $default_config[$key];
         }
         $this->$key = $value;
@@ -214,39 +214,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']);
             }
         }
@@ -310,7 +310,7 @@ 
             $timeout = $this->connection !== false ? $this->connection->getConnectionTimeout() : null;
             $this->connection = new ImapProtocol($this->validate_cert);
             $this->connection->setConnectionTimeout($timeout);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -402,7 +402,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -436,7 +436,9 @@ 
     public function createFolder($folder, $expunge = true) {
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {

Indentation +1 added lines, -1 removed lines

@@ -376,7 +376,7 @@
             if (strpos($folder_name, $delimiter) !== false) {
                 return $this->getFolderByPath($folder_name);
             }
-	}
+    }
 
         return $this->getFolderByName($folder_name);
     }

src/Query/Query.php

Indentation +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
      */
     public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){
         if (
-               $page === null
+                $page === null
             && isset($_GET[$page_name])
             && $_GET[$page_name] > 0
         ) {

Braces +10 added lines, -4 removed lines

@@ -73,7 +73,9 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         $this->date_format = ClientManager::get('date_format', 'd M y');
 
@@ -111,7 +113,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);
@@ -286,7 +290,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -316,7 +320,9 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if($page >= 1) {
+            $this->page = $page;
+        }
         $this->limit = $limit;
 
         return $this;

Spacing +16 added lines, -16 removed lines

@@ -73,7 +73,7 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
 
         $this->date_format = ClientManager::get('date_format', 'd M y');
 
@@ -85,7 +85,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -93,8 +93,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;
@@ -111,7 +111,7 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date) {
-        if($date instanceof \Carbon\Carbon) return $date;
+        if ($date instanceof \Carbon\Carbon) return $date;
 
         try {
             $date = Carbon::parse($date);
@@ -150,7 +150,7 @@ 
      * @return Collection
      * @throws GetMessagesFailedException
      */
-    protected function search(){
+    protected function search() {
         $this->generate_query();
 
         try {
@@ -195,15 +195,15 @@ 
 
                 $options = ClientManager::get('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) {
                     $message = $query->getMessage($msgno, $msglist);
-                    switch ($options['message_key']){
+                    switch ($options['message_key']) {
                         case 'number':
                             $message_key = $message->getMessageNo();
                             break;
@@ -221,7 +221,7 @@ 
 
             return $messages;
         } catch (\Exception $e) {
-            throw new GetMessagesFailedException($e->getMessage(),0, $e);
+            throw new GetMessagesFailedException($e->getMessage(), 0, $e);
         }
     }
 
@@ -238,7 +238,7 @@ 
      * @throws MessageHeaderFetchingException
      * @throws \Webklex\PHPIMAP\Exceptions\EventNotFoundException
      */
-    public function getMessage($msgno, $msglist = null){
+    public function getMessage($msgno, $msglist = null) {
         return new Message($msgno, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchFlags());
     }
 
@@ -251,7 +251,7 @@ 
      * @return 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') {
         if (
                $page === null
             && isset($_GET[$page_name])
@@ -277,10 +277,10 @@ 
         $this->query->each(function($statement) use(&$query) {
             if (count($statement) == 1) {
                 $query .= $statement[0];
-            } else {
-                if($statement[1] === null){
+            }else {
+                if ($statement[1] === null) {
                     $query .= $statement[0];
-                }else{
+                }else {
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -310,7 +310,7 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if ($page >= 1) $this->page = $page;
         $this->limit = $limit;
 
         return $this;

src/Attachment.php

Spacing +18 added lines, -18 removed lines

@@ -104,7 +104,7 @@ 
         $this->part_number = $part->part_number;
 
         $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -121,10 +121,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];
             }
 
@@ -160,7 +160,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -223,14 +223,14 @@ 
             $this->setName($name);
         }elseif (($filename = $this->part->filename) !== null) {
             $this->setName($filename);
-        } else {
+        }else {
             $this->setName("undefined");
         }
 
         if (IMAP::ATTACHMENT_TYPE_MESSAGE == $this->part->type) {
             if ($this->part->ifdescription) {
                 $this->setName($this->part->description);
-            } else {
+            }else {
                 $this->setName($this->part->subtype);
             }
         }
@@ -256,9 +256,9 @@ 
     public function setName($name) {
         $decoder = $this->config['decoder']['attachment'];
         if ($name !== null) {
-            if($decoder === 'utf-8' && extension_loaded('imap')) {
+            if ($decoder === 'utf-8' && extension_loaded('imap')) {
                 $this->name = \imap_utf8($name);
-            }else{
+            }else {
                 $this->name = mb_decode_mimeheader($name);
             }
         }
@@ -269,7 +269,7 @@ 
      *
      * @return string|null
      */
-    public function getMimeType(){
+    public function getMimeType() {
         return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE);
     }
 
@@ -278,9 +278,9 @@ 
      *
      * @return string|null
      */
-    public function getExtension(){
+    public function getExtension() {
         $deprecated_guesser = "\Symfony\Component\HttpFoundation\File\MimeType\ExtensionGuesser";
-        if (class_exists($deprecated_guesser) !== false){
+        if (class_exists($deprecated_guesser) !== false) {
             return $deprecated_guesser::getInstance()->guess($this->getMimeType());
         }
         $guesser = "\Symfony\Component\Mime\MimeTypes";
@@ -293,14 +293,14 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
     /**
      * @return Message
      */
-    public function getMessage(){
+    public function getMessage() {
         return $this->oMessage;
     }
 
@@ -310,8 +310,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -323,7 +323,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -334,9 +334,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 +3 added lines, -3 removed lines

@@ -129,7 +129,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);
@@ -221,7 +221,7 @@ 
 
         if (($name = $this->part->name) !== null) {
             $this->setName($name);
-        }elseif (($filename = $this->part->filename) !== null) {
+        } elseif (($filename = $this->part->filename) !== null) {
             $this->setName($filename);
         } else {
             $this->setName("undefined");
@@ -258,7 +258,7 @@ 
         if ($name !== null) {
             if($decoder === 'utf-8' && extension_loaded('imap')) {
                 $this->name = \imap_utf8($name);
-            }else{
+            } else{
                 $this->name = mb_decode_mimeheader($name);
             }
         }

src/Structure.php

Spacing +14 added lines, -14 removed lines

@@ -77,7 +77,7 @@ 
      * @throws MessageContentFetchingException
      * @throws InvalidMessageDateException
      */
-    protected function parse(){
+    protected function parse() {
         $this->findContentType();
         $this->parts = $this->find_parts();
     }
@@ -85,13 +85,13 @@ 
     /**
      * Determine the message content type
      */
-    public function findContentType(){
+    public function findContentType() {
 
         $content_type = $this->header->get("content-type");
         $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type;
-        if(stripos($content_type, 'multipart') === 0) {
+        if (stripos($content_type, 'multipart') === 0) {
             $this->type = IMAP::MESSAGE_TYPE_MULTIPART;
-        }else{
+        }else {
             $this->type = IMAP::MESSAGE_TYPE_TEXT;
         }
     }
@@ -99,7 +99,7 @@ 
     /**
      * Determine the message content type
      */
-    public function getBoundary(){
+    public function getBoundary() {
         $boundary = $this->header->find("/boundary\=\"?(.*)\"?/");
         return str_replace('"', '', $boundary);
     }
@@ -111,9 +111,9 @@ 
      * @throws MessageContentFetchingException
      * @throws InvalidMessageDateException
      */
-    public function find_parts(){
-        if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) {
-            if (($boundary = $this->getBoundary()) === null)  {
+    public function find_parts() {
+        if ($this->type === IMAP::MESSAGE_TYPE_MULTIPART) {
+            if (($boundary = $this->getBoundary()) === null) {
                 throw new MessageContentFetchingException("no content found", 0);
             }
 
@@ -122,21 +122,21 @@ 
             ];
 
             if (preg_match("/boundary\=\"?(.*)\"?/", $this->raw, $match) == 1) {
-                if(is_array($match[1])){
-                    foreach($match[1] as $matched){
+                if (is_array($match[1])) {
+                    foreach ($match[1] as $matched) {
                         $boundaries[] = str_replace('"', '', $matched);
                     }
-                }else{
-                    if(!empty($match[1])) {
+                }else {
+                    if (!empty($match[1])) {
                         $boundaries[] = str_replace('"', '', $match[1]);
                     }
                 }
             }
 
-            $raw_parts = explode( $boundaries[0], str_replace($boundaries, $boundaries[0], $this->raw) );
+            $raw_parts = explode($boundaries[0], str_replace($boundaries, $boundaries[0], $this->raw));
             $parts = [];
             $part_number = 0;
-            foreach($raw_parts as $part) {
+            foreach ($raw_parts as $part) {
                 $part = trim(rtrim($part));
                 if ($part !== "--") {
                     $parts[] = new Part($part, null, $part_number);

Braces +2 added lines, -2 removed lines

@@ -91,7 +91,7 @@ 
         $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type;
         if(stripos($content_type, 'multipart') === 0) {
             $this->type = IMAP::MESSAGE_TYPE_MULTIPART;
-        }else{
+        } else{
             $this->type = IMAP::MESSAGE_TYPE_TEXT;
         }
     }
@@ -126,7 +126,7 @@ 
                     foreach($match[1] as $matched){
                         $boundaries[] = str_replace('"', '', $matched);
                     }
-                }else{
+                } else{
                     if(!empty($match[1])) {
                         $boundaries[] = str_replace('"', '', $match[1]);
                     }

src/Message.php

Braces +15 added lines, -7 removed lines

@@ -243,7 +243,7 @@ 
         if(strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
             return $this->get($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))) {
@@ -614,9 +614,9 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        } elseif (property_exists($structure, 'charset')){
             return EncodingAliases::get($structure->charset);
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -660,7 +660,9 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->copyMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if($expunge) {
+                    $this->client->expunge();
+                }
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -702,7 +704,9 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->moveMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if($expunge) {
+                    $this->client->expunge();
+                }
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -729,7 +733,9 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->setFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -748,7 +754,9 @@ 
      */
     public function restore($expunge = true) {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);

Spacing +30 added lines, -30 removed lines

@@ -196,7 +196,7 @@ 
     public function __construct($msgn, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -241,13 +241,13 @@ 
      * @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));
             return $this->get($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];
@@ -288,7 +288,7 @@ 
      * @return mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -370,8 +370,8 @@ 
         $flags = $this->client->getConnection()->flags([$this->msgn]);
 
         if (isset($flags[$this->msgn])) {
-            foreach($flags[$this->msgn] as $flag) {
-                if (strpos($flag, "\\") === 0){
+            foreach ($flags[$this->msgn] as $flag) {
+                if (strpos($flag, "\\") === 0) {
                     $flag = substr($flag, 1);
                 }
                 $flag_key = strtolower($flag);
@@ -435,9 +435,9 @@ 
      */
     private function fetchPart(Part $part) {
 
-        if ($part->type == IMAP::MESSAGE_TYPE_TEXT && ($part->ifdisposition == 0 || (empty($part->disposition) || !in_array(strtolower($part->disposition), ['attachment', 'inline'])) ) ) {
+        if ($part->type == IMAP::MESSAGE_TYPE_TEXT && ($part->ifdisposition == 0 || (empty($part->disposition) || !in_array(strtolower($part->disposition), ['attachment', 'inline'])))) {
 
-            if ( in_array(($subtype = strtolower($part->subtype)), ["plain", "csv", "html"]) && $part->filename == null && $part->name == null) {
+            if (in_array(($subtype = strtolower($part->subtype)), ["plain", "csv", "html"]) && $part->filename == null && $part->name == null) {
                 $encoding = $this->getEncoding($part);
 
                 $content = $this->decodeString($part->content, $part->encoding);
@@ -458,10 +458,10 @@ 
                 }
 
                 $this->bodies[$subtype == "plain" ? "text" : $subtype] = $content;
-            } else {
+            }else {
                 $this->fetchAttachment($part);
             }
-        } else {
+        }else {
             $this->fetchAttachment($part);
         }
     }
@@ -477,7 +477,7 @@ 
         if ($oAttachment->getName() !== null) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -594,7 +594,7 @@ 
 
         if (function_exists('iconv') && $from != 'UTF-7' && $to != 'UTF-7') {
             return @iconv($from, $to.'//IGNORE', $str);
-        } else {
+        }else {
             if (!$from) {
                 return mb_convert_encoding($str, $to);
             }
@@ -615,9 +615,9 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (property_exists($structure, 'charset')){
+        }elseif (property_exists($structure, 'charset')) {
             return EncodingAliases::get($structure->charset);
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -631,7 +631,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\FolderFetchingException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -646,13 +646,13 @@ 
      * @throws Exceptions\FolderFetchingException
      * @throws Exceptions\GetMessagesFailedException
      */
-    public function thread($sent_folder = null, &$thread = null, $folder = null){
+    public function thread($sent_folder = null, &$thread = null, $folder = null) {
         $thread = $thread ? $thread : MessageCollection::make([]);
-        $folder = $folder ? $folder :  $this->getFolder();
+        $folder = $folder ? $folder : $this->getFolder();
         $sent_folder = $sent_folder ? $sent_folder : $this->client->getFolder(ClientManager::get("options.common_folders.sent", "INBOX/Sent"));
 
         /** @var Message $message */
-        foreach($thread as $message) {
+        foreach ($thread as $message) {
             if ($message->message_id == $this->message_id) {
                 return $thread;
             }
@@ -673,7 +673,7 @@ 
         });
 
         if (is_array($this->in_reply_to)) {
-            foreach($this->in_reply_to as $in_reply_to) {
+            foreach ($this->in_reply_to as $in_reply_to) {
                 $folder->query()->messageId($in_reply_to)
                     ->setFetchBody($this->getFetchBodyOption())
                     ->leaveUnread()->get()->each(function($message) use(&$thread, $folder, $sent_folder){
@@ -718,7 +718,7 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->copyMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -760,7 +760,7 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->moveMessage($folder->path, $this->msgn) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
                 $message_num = $this->client->getConnection()->getMessageNumber($next_uid);
@@ -787,7 +787,7 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->setFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "deleted");
         $event::dispatch($this);
@@ -806,7 +806,7 @@ 
      */
     public function restore($expunge = true) {
         $status = $this->unsetFlag("Deleted");
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("message", "restored");
         $event::dispatch($this);
@@ -959,7 +959,7 @@ 
      *
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -985,7 +985,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -995,8 +995,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1008,7 +1008,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1019,9 +1019,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);
         }