Webklex / php-imap

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 +18 added lines, -18 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;
@@ -298,7 +298,7 @@ 
      *
      * @return bool
      */
-    public function isAttachment(){
+    public function isAttachment() {
         if ($this->type == IMAP::MESSAGE_TYPE_TEXT &&
             ($this->ifdisposition == 0 ||
                 (empty($this->disposition) || !in_array(strtolower($this->disposition), ClientManager::get('options.dispositions')))

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
         ) {

Spacing +15 added lines, -15 removed lines

@@ -80,11 +80,11 @@ 
         $this->setClient($client);
 
         $this->sequence = ClientManager::get('options.sequence', IMAP::ST_MSGN);
-        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if (ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
 
         if (ClientManager::get('options.fetch_order') === 'desc') {
             $this->fetch_order = 'desc';
-        } else {
+        }else {
             $this->fetch_order = 'asc';
         }
 
@@ -98,7 +98,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -106,8 +106,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;
@@ -124,7 +124,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);
@@ -175,7 +175,7 @@ 
      * @return Collection
      * @throws GetMessagesFailedException
      */
-    protected function search(){
+    protected function search() {
         $this->generate_query();
 
         try {
@@ -240,7 +240,7 @@ 
                     $raw_flag = isset($raw_flags[$uid]) ? $raw_flags[$uid] : [];
 
                     $message = Message::make($uid, $msglist, $this->getClient(), $raw_header, $raw_content, $raw_flag, $this->getFetchOptions(), $this->sequence);
-                    switch ($message_key){
+                    switch ($message_key) {
                         case 'number':
                             $message_key = $message->getMessageNo();
                             break;
@@ -262,7 +262,7 @@ 
 
             return $messages;
         } catch (\Exception $e) {
-            throw new GetMessagesFailedException($e->getMessage(),0, $e);
+            throw new GetMessagesFailedException($e->getMessage(), 0, $e);
         }
     }
 
@@ -280,7 +280,7 @@ 
      * @throws MessageHeaderFetchingException
      * @throws \Webklex\PHPIMAP\Exceptions\EventNotFoundException
      */
-    public function getMessage($uid, $msglist = null, $sequence = null){
+    public function getMessage($uid, $msglist = null, $sequence = null) {
         return new Message($uid, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchFlags(), $sequence ? $sequence : $this->sequence);
     }
 
@@ -293,7 +293,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])
@@ -319,10 +319,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].'"';
                 }
             }
@@ -352,7 +352,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 +10 added lines, -4 removed lines

@@ -80,7 +80,9 @@ 
         $this->setClient($client);
 
         $this->sequence = ClientManager::get('options.sequence', IMAP::ST_MSGN);
-        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if(ClientManager::get('options.fetch') === IMAP::FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         if (ClientManager::get('options.fetch_order') === 'desc') {
             $this->fetch_order = 'desc';
@@ -124,7 +126,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);
@@ -322,7 +326,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -352,7 +356,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/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

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]);
                     }

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=\"?([^\"]*)[\";\s]/");
         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);

src/Client.php

Indentation +1 added lines, -1 removed lines

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

Spacing +37 added lines, -37 removed lines

@@ -194,11 +194,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;
@@ -210,9 +210,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);
                 }
             }
@@ -226,45 +226,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']);
             }
         }
@@ -329,7 +329,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        }else {
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -442,7 +442,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"]);
 
@@ -457,7 +457,7 @@ 
             }
 
             return $folders;
-        }else{
+        }else {
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -493,10 +493,10 @@ 
         $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);
         }
@@ -521,7 +521,7 @@ 
      *
      * @return Folder
      */
-    public function getFolderPath(){
+    public function getFolderPath() {
         return $this->active_folder;
     }
 
@@ -575,7 +575,7 @@ 
      *
      * @return int
      */
-    public function getTimeout($type){
+    public function getTimeout($type) {
         return $this->connection->getConnectionTimeout();
     }
 
@@ -584,7 +584,7 @@ 
      *
      * @return string
      */
-    public function getDefaultMessageMask(){
+    public function getDefaultMessageMask() {
         return $this->default_message_mask;
     }
 
@@ -594,7 +594,7 @@ 
      *
      * @return array
      */
-    public function getDefaultEvents($section){
+    public function getDefaultEvents($section) {
         return $this->events[$section];
     }
 
@@ -606,7 +606,7 @@ 
      * @throws MaskNotFoundException
      */
     public function setDefaultMessageMask($mask) {
-        if(class_exists($mask)) {
+        if (class_exists($mask)) {
             $this->default_message_mask = $mask;
 
             return $this;
@@ -620,7 +620,7 @@ 
      *
      * @return string
      */
-    public function getDefaultAttachmentMask(){
+    public function getDefaultAttachmentMask() {
         return $this->default_attachment_mask;
     }
 
@@ -632,7 +632,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

@@ -198,7 +198,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;
@@ -232,39 +232,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']);
             }
         }
@@ -329,7 +329,7 @@ 
             $this->connection = new ImapProtocol($this->validate_cert, $this->encryption);
             $this->connection->setConnectionTimeout($timeout);
             $this->connection->setProxy($this->proxy);
-        }else{
+        } else{
             if (extension_loaded('imap') === false) {
                 throw new ConnectionFailedException("connection setup failed", 0, new ProtocolNotSupportedException($protocol." is an unsupported protocol"));
             }
@@ -457,7 +457,7 @@ 
             }
 
             return $folders;
-        }else{
+        } else{
             throw new FolderFetchingException("failed to fetch any folders");
         }
     }
@@ -493,7 +493,9 @@ 
         $this->checkConnection();
         $status = $this->connection->createFolder($folder);
 
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         $folder = $this->getFolder($folder);
         if($status && $folder) {

src/Folder.php

Braces +7 added lines, -3 removed lines

@@ -232,7 +232,9 @@ 
     public function move($new_name, $expunge = true) {
         $this->client->checkConnection();
         $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $folder = $this->client->getFolder($new_name);
         $event = $this->getEvent("folder", "moved");
@@ -306,7 +308,9 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->client->getConnection()->deleteFolder($this->path);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         $event = $this->getEvent("folder", "deleted");
         $event::dispatch($this);
@@ -374,7 +378,7 @@ 
 
                     $connection->idle();
                 }
-            }catch (Exceptions\RuntimeException $e) {
+            } catch (Exceptions\RuntimeException $e) {
                 if(strpos($e->getMessage(), "connection closed") === false) {
                     throw $e;
                 }

Spacing +13 added lines, -13 removed lines

@@ -125,7 +125,7 @@ 
 
         $this->setDelimiter($delimiter);
         $this->path      = $folder_name;
-        $this->full_name  = $this->decodeName($folder_name);
+        $this->full_name = $this->decodeName($folder_name);
         $this->name      = $this->getSimpleName($this->delimiter, $this->full_name);
 
         $this->parseAttributes($attributes);
@@ -138,7 +138,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);
 
@@ -149,7 +149,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);
     }
 
@@ -157,7 +157,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);
     }
 
@@ -232,7 +232,7 @@ 
     public function move($new_name, $expunge = true) {
         $this->client->checkConnection();
         $status = $this->client->getConnection()->renameFolder($this->full_name, $new_name);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $folder = $this->client->getFolder($new_name);
         $event = $this->getEvent("folder", "moved");
@@ -248,7 +248,7 @@ 
      * @return array
      * @throws ConnectionFailedException
      */
-    public function overview($sequence = null){
+    public function overview($sequence = null) {
         $this->client->openFolder($this->path);
         $sequence = $sequence === null ? "1:*" : $sequence;
         $uid = ClientManager::get('options.sequence', IMAP::ST_MSGN) == IMAP::ST_UID;
@@ -273,7 +273,7 @@ 
          */
 
         if ($internal_date != null) {
-            if ($internal_date instanceof Carbon){
+            if ($internal_date instanceof Carbon) {
                 $internal_date = $internal_date->format('d-M-Y H:i:s O');
             }
         }
@@ -307,7 +307,7 @@ 
      */
     public function delete($expunge = true) {
         $status = $this->client->getConnection()->deleteFolder($this->path);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         $event = $this->getEvent("folder", "deleted");
         $event::dispatch($this);
@@ -362,7 +362,7 @@ 
             try {
                 $line = $connection->nextLine();
                 if (($pos = strpos($line, "EXISTS")) !== false) {
-                    $msgn = (int) substr($line, 2, $pos -2);
+                    $msgn = (int) substr($line, 2, $pos - 2);
                     $connection->done();
 
                     $this->client->openFolder($this->path, true);
@@ -374,8 +374,8 @@ 
 
                     $connection->idle();
                 }
-            }catch (Exceptions\RuntimeException $e) {
-                if(strpos($e->getMessage(), "connection closed") === false) {
+            } catch (Exceptions\RuntimeException $e) {
+                if (strpos($e->getMessage(), "connection closed") === false) {
                     throw $e;
                 }
             }
@@ -417,8 +417,8 @@ 
      * Set the delimiter
      * @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 = ClientManager::get('options.delimiter', '/');
         }
 

src/Message.php

Spacing +43 added lines, -43 removed lines

@@ -200,7 +200,7 @@ 
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_flags = false, $sequence = null) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
         $this->events["message"] = $client->getDefaultEvents("message");
@@ -224,7 +224,7 @@ 
         if ($this->sequence === IMAP::ST_UID) {
             $this->uid = $uid;
             $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
-        }else{
+        }else {
             $this->msgn = $uid;
             $this->uid = $this->client->getConnection()->getUid($this->msgn);
         }
@@ -264,13 +264,13 @@ 
      * @throws MessageContentFetchingException
      * @throws \ReflectionException
      */
-    public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null){
+    public static function make($uid, $msglist, Client $client, $raw_header, $raw_body, $raw_flags, $fetch_options = null, $sequence = null) {
         $reflection = new \ReflectionClass(self::class);
         /** @var self $instance */
         $instance = $reflection->newInstanceWithoutConstructor();
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $instance->setMask($default_mask);
         }
         $instance->setEvents([
@@ -289,7 +289,7 @@ 
         if ($instance->getSequence() === IMAP::ST_UID) {
             $instance->setUid($uid);
             $instance->setMsglist($msglist);
-        }else{
+        }else {
             $instance->setMsgn($uid, $msglist);
         }
 
@@ -317,13 +317,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];
@@ -364,7 +364,7 @@ 
      * @return mixed|null
      */
     public function get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -438,7 +438,7 @@ 
      *
      * @throws InvalidMessageDateException
      */
-    public function parseRawHeader($raw_header){
+    public function parseRawHeader($raw_header) {
         $this->header = new Header($raw_header);
     }
 
@@ -449,8 +449,8 @@ 
     public function parseRawFlags($raw_flags) {
         $this->flags = FlagCollection::make([]);
 
-        foreach($raw_flags as $flag) {
-            if (strpos($flag, "\\") === 0){
+        foreach ($raw_flags as $flag) {
+            if (strpos($flag, "\\") === 0) {
                 $flag = substr($flag, 1);
             }
             $flag_key = strtolower($flag);
@@ -553,7 +553,7 @@ 
 
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        }else {
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -591,7 +591,7 @@ 
         if ($oAttachment->getName() !== null && $oAttachment->getSize() > 0) {
             if ($oAttachment->getId() !== null) {
                 $this->attachments->put($oAttachment->getId(), $oAttachment);
-            } else {
+            }else {
                 $this->attachments->push($oAttachment);
             }
         }
@@ -725,7 +725,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);
             }
@@ -746,9 +746,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);
         }
 
@@ -762,7 +762,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @throws Exceptions\FolderFetchingException
      */
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -777,13 +777,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;
             }
@@ -804,7 +804,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){
@@ -849,13 +849,13 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->copyMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
 
                 if ($this->sequence === IMAP::ST_UID) {
                     $sequence_id = $next_uid;
-                }else{
+                }else {
                     $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
                 }
 
@@ -896,13 +896,13 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->moveMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) {
-                if($expunge) $this->client->expunge();
+                if ($expunge) $this->client->expunge();
 
                 $this->client->openFolder($folder->path);
 
                 if ($this->sequence === IMAP::ST_UID) {
                     $sequence_id = $next_uid;
-                }else{
+                }else {
                     $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
                 }
 
@@ -928,7 +928,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);
@@ -947,7 +947,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);
@@ -1102,7 +1102,7 @@ 
      *
      * @return Structure|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1128,7 +1128,7 @@ 
      *
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return array_merge($this->attributes, $this->header->getAttributes());
     }
 
@@ -1138,8 +1138,8 @@ 
      *
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1151,7 +1151,7 @@ 
      *
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1162,9 +1162,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);
         }
 
@@ -1177,7 +1177,7 @@ 
      *
      * @return $this
      */
-    public function setFolderPath($folder_path){
+    public function setFolderPath($folder_path) {
         $this->folder_path = $folder_path;
 
         return $this;
@@ -1189,7 +1189,7 @@ 
      *
      * @return $this
      */
-    public function setConfig($config){
+    public function setConfig($config) {
         $this->config = $config;
 
         return $this;
@@ -1201,7 +1201,7 @@ 
      *
      * @return $this
      */
-    public function setAttachments($attachments){
+    public function setAttachments($attachments) {
         $this->attachments = $attachments;
 
         return $this;
@@ -1213,7 +1213,7 @@ 
      *
      * @return $this
      */
-    public function setFlags($flags){
+    public function setFlags($flags) {
         $this->flags = $flags;
 
         return $this;
@@ -1226,7 +1226,7 @@ 
      * @throws Exceptions\ConnectionFailedException
      * @return $this
      */
-    public function setClient($client){
+    public function setClient($client) {
         $this->client = $client;
         $this->client->openFolder($this->folder_path);
 
@@ -1241,7 +1241,7 @@ 
      * @throws Exceptions\RuntimeException
      * @return $this
      */
-    public function setUid($uid){
+    public function setUid($uid) {
         $this->uid = $uid;
         $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
         $this->msglist = null;
@@ -1258,7 +1258,7 @@ 
      * @throws Exceptions\RuntimeException
      * @return $this
      */
-    public function setMsgn($msgn, $msglist = null){
+    public function setMsgn($msgn, $msglist = null) {
         $this->msgn = $msgn;
         $this->msglist = $msglist;
         $this->uid = $this->client->getConnection()->getUid($this->msgn);
@@ -1271,7 +1271,7 @@ 
      *
      * @return int
      */
-    public function getSequence(){
+    public function getSequence() {
         return $this->sequence;
     }
 
@@ -1280,7 +1280,7 @@ 
      *
      * @return int
      */
-    public function getSequenceId(){
+    public function getSequenceId() {
         return $this->sequence === IMAP::ST_UID ? $this->uid : $this->msgn;
     }
 }

Braces +21 added lines, -13 removed lines

@@ -224,7 +224,7 @@ 
         if ($this->sequence === IMAP::ST_UID) {
             $this->uid = $uid;
             $this->msgn = $this->client->getConnection()->getMessageNumber($this->uid);
-        }else{
+        } else{
             $this->msgn = $uid;
             $this->uid = $this->client->getConnection()->getUid($this->msgn);
         }
@@ -289,7 +289,7 @@ 
         if ($instance->getSequence() === IMAP::ST_UID) {
             $instance->setUid($uid);
             $instance->setMsglist($msglist);
-        }else{
+        } else{
             $instance->setMsgn($uid, $msglist);
         }
 
@@ -320,7 +320,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))) {
@@ -505,7 +505,7 @@ 
             if ($this->getFlags()->get("seen") == null) {
                 $this->unsetFlag("Seen");
             }
-        }elseif ($this->getFlags()->get("seen") != null) {
+        } elseif ($this->getFlags()->get("seen") != null) {
             $this->setFlag("Seen");
         }
 
@@ -553,7 +553,7 @@ 
 
         if ($part->isAttachment()) {
             $this->fetchAttachment($part);
-        }else{
+        } else{
             $encoding = $this->getEncoding($part);
 
             $content = $this->decodeString($part->content, $part->encoding);
@@ -746,9 +746,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);
         }
 
@@ -849,13 +849,15 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->copyMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) {
-                if($expunge) $this->client->expunge();
+                if($expunge) {
+                    $this->client->expunge();
+                }
 
                 $this->client->openFolder($folder->path);
 
                 if ($this->sequence === IMAP::ST_UID) {
                     $sequence_id = $next_uid;
-                }else{
+                } else{
                     $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
                 }
 
@@ -896,13 +898,15 @@ 
 
             $this->client->openFolder($this->folder_path);
             if ($this->client->getConnection()->moveMessage($folder->path, $this->getSequenceId(), null, $this->sequence === IMAP::ST_UID) == true) {
-                if($expunge) $this->client->expunge();
+                if($expunge) {
+                    $this->client->expunge();
+                }
 
                 $this->client->openFolder($folder->path);
 
                 if ($this->sequence === IMAP::ST_UID) {
                     $sequence_id = $next_uid;
-                }else{
+                } else{
                     $sequence_id = $this->client->getConnection()->getMessageNumber($next_uid);
                 }
 
@@ -928,7 +932,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);
@@ -947,7 +953,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);

src/Connection/Protocols/ImapProtocol.php

Braces +17 added lines, -8 removed lines

@@ -258,9 +258,13 @@ 
             $tokens = [substr($tokens, 0, 2)];
         }
         if (is_array($lines)){
-            if ($this->debug) echo "<< ".json_encode($lines)."\n";
-        }else{
-            if ($this->debug) echo "<< ".$lines."\n";
+            if ($this->debug) {
+                echo "<< ".json_encode($lines)."\n";
+            }
+        } else{
+            if ($this->debug) {
+                echo "<< ".$lines."\n";
+            }
         }
 
         // last line has response code
@@ -302,7 +306,9 @@ 
                 $line .= ' ' . $token;
             }
         }
-        if ($this->debug) echo ">> ".$line."\n";
+        if ($this->debug) {
+            echo ">> ".$line."\n";
+        }
 
         if (fwrite($this->stream, $line . "\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
@@ -452,7 +458,9 @@ 
     public function getCapabilities() {
         $response = $this->requestAndResponse('CAPABILITY');
 
-        if (!$response) return [];
+        if (!$response) {
+            return [];
+        }
 
         $capabilities = [];
         foreach ($response as $line) {
@@ -609,13 +617,14 @@ 
             // if we want only one message we can ignore everything else and just return
             if ($to === null && !is_array($from) && ($uid ? $tokens[2][$uidKey] == $from : $tokens[0] == $from)) {
                 // we still need to read all lines
-                while (!$this->readLine($tokens, $tag))
-
+                while (!$this->readLine($tokens, $tag)) {
+                
                     return $data;
+                }
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            } else{
                 $result[$tokens[0]] = $data;
             }
         }

Spacing +46 added lines, -46 removed lines

@@ -84,7 +84,7 @@ 
      * @throws ConnectionFailedException
      * @throws RuntimeException
      */
-    protected function enableTls(){
+    protected function enableTls() {
         $response = $this->requestAndResponse('STARTTLS');
         $result = $response && stream_socket_enable_crypto($this->stream, true, $this->getCryptoMethod());
         if (!$result) {
@@ -146,7 +146,7 @@ 
         $stack = [];
 
         //  replace any trailing <NL> including spaces with a single space
-        $line = rtrim($line) . ' ';
+        $line = rtrim($line).' ';
         while (($pos = strpos($line, ' ')) !== false) {
             $token = substr($line, 0, $pos);
             if (!strlen($token)) {
@@ -176,11 +176,11 @@ 
                     if (strlen($token) > $chars) {
                         $line = substr($token, $chars);
                         $token = substr($token, 0, $chars);
-                    } else {
+                    }else {
                         $line .= $this->nextLine();
                     }
                     $tokens[] = $token;
-                    $line = trim($line) . ' ';
+                    $line = trim($line).' ';
                     continue;
                 }
             }
@@ -230,7 +230,7 @@ 
         $line = $this->nextTaggedLine($tag); // get next tag
         if (!$dontParse) {
             $tokens = $this->decodeLine($line);
-        } else {
+        }else {
             $tokens = $line;
         }
 
@@ -257,9 +257,9 @@ 
             // First two chars are still needed for the response code
             $tokens = [substr($tokens, 0, 2)];
         }
-        if (is_array($lines)){
+        if (is_array($lines)) {
             if ($this->debug) echo "<< ".json_encode($lines)."\n";
-        }else{
+        }else {
             if ($this->debug) echo "<< ".$lines."\n";
         }
 
@@ -284,27 +284,27 @@ 
     public function sendRequest($command, $tokens = [], &$tag = null) {
         if (!$tag) {
             $this->noun++;
-            $tag = 'TAG' . $this->noun;
+            $tag = 'TAG'.$this->noun;
         }
 
-        $line = $tag . ' ' . $command;
+        $line = $tag.' '.$command;
 
         foreach ($tokens as $token) {
             if (is_array($token)) {
-                if (fwrite($this->stream, $line . ' ' . $token[0] . "\r\n") === false) {
+                if (fwrite($this->stream, $line.' '.$token[0]."\r\n") === false) {
                     throw new RuntimeException('failed to write - connection closed?');
                 }
                 if (!$this->assumedNextLine('+ ')) {
                     throw new RuntimeException('failed to send literal string');
                 }
                 $line = $token[1];
-            } else {
-                $line .= ' ' . $token;
+            }else {
+                $line .= ' '.$token;
             }
         }
         if ($this->debug) echo ">> ".$line."\n";
 
-        if (fwrite($this->stream, $line . "\r\n") === false) {
+        if (fwrite($this->stream, $line."\r\n") === false) {
             throw new RuntimeException('failed to write - connection closed?');
         }
     }
@@ -334,9 +334,9 @@ 
     public function escapeString($string) {
         if (func_num_args() < 2) {
             if (strpos($string, "\n") !== false) {
-                return ['{' . strlen($string) . '}', $string];
-            } else {
-                return '"' . str_replace(['\\', '"'], ['\\\\', '\\"'], $string) . '"';
+                return ['{'.strlen($string).'}', $string];
+            }else {
+                return '"'.str_replace(['\\', '"'], ['\\\\', '\\"'], $string).'"';
             }
         }
         $result = [];
@@ -361,7 +361,7 @@ 
             }
             $result[] = $this->escapeList($v);
         }
-        return '(' . implode(' ', $result) . ')';
+        return '('.implode(' ', $result).')';
     }
 
     /**
@@ -401,12 +401,12 @@ 
                     error_log("got an extra server challenge: $response");
                     // respond with an empty response.
                     $this->sendRequest('');
-                } else {
+                }else {
                     if (preg_match('/^NO /i', $response) ||
                         preg_match('/^BAD /i', $response)) {
                         error_log("got failure response: $response");
                         return false;
-                    } else if (preg_match("/^OK /i", $response)) {
+                    }else if (preg_match("/^OK /i", $response)) {
                         return true;
                     }
                 }
@@ -439,7 +439,7 @@ 
      *
      * @return bool
      */
-    public function connected(){
+    public function connected() {
         return (boolean) $this->stream;
     }
 
@@ -486,10 +486,10 @@ 
                     $result[strtolower($tokens[1])] = $tokens[0];
                     break;
                 case '[UIDVALIDITY':
-                    $result['uidvalidity'] = (int)$tokens[2];
+                    $result['uidvalidity'] = (int) $tokens[2];
                     break;
                 case '[UIDNEXT':
-                    $result['uidnext'] = (int)$tokens[2];
+                    $result['uidnext'] = (int) $tokens[2];
                     break;
                 default:
                     // ignore
@@ -543,17 +543,17 @@ 
         if (is_array($from)) {
             $set = implode(',', $from);
         } elseif ($to === null) {
-            $set = (int)$from;
+            $set = (int) $from;
         } elseif ($to === INF) {
-            $set = (int)$from . ':*';
-        } else {
-            $set = (int)$from . ':' . (int)$to;
+            $set = (int) $from.':*';
+        }else {
+            $set = (int) $from.':'.(int) $to;
         }
 
-        $items = (array)$items;
+        $items = (array) $items;
         $itemList = $this->escapeList($items);
 
-        $this->sendRequest(($uid ? 'UID ' : '') . 'FETCH', [$set, $itemList], $tag);
+        $this->sendRequest(($uid ? 'UID ' : '').'FETCH', [$set, $itemList], $tag);
 
         $result = [];
         $tokens = null; // define $tokens variable before first use
@@ -568,9 +568,9 @@ 
                 $count = count($tokens[2]);
                 if ($tokens[2][$count - 2] == 'UID') {
                     $uidKey = $count - 1;
-                } else if ($tokens[2][0] == 'UID') {
+                }else if ($tokens[2][0] == 'UID') {
                     $uidKey = 1;
-                } else {
+                }else {
                     $uidKey = array_search('UID', $tokens[2]) + 1;
                 }
             }
@@ -586,7 +586,7 @@ 
                     $data = $tokens[2][1];
                 } elseif ($uid && $tokens[2][2] == $items[0]) {
                     $data = $tokens[2][3];
-                } else {
+                }else {
                     // maybe the server send an other field we didn't wanted
                     $count = count($tokens[2]);
                     // we start with 2, because 0 was already checked
@@ -598,7 +598,7 @@ 
                         break;
                     }
                 }
-            } else {
+            }else {
                 $data = [];
                 while (key($tokens[2]) !== null) {
                     $data[current($tokens[2])] = next($tokens[2]);
@@ -615,7 +615,7 @@ 
             }
             if ($uid) {
                 $result[$tokens[2][$uidKey]] = $data;
-            }else{
+            }else {
                 $result[$tokens[0]] = $data;
             }
         }
@@ -649,7 +649,7 @@ 
      * @return array
      * @throws RuntimeException
      */
-    public function headers($uids, $rfc = "RFC822", $uid = false){
+    public function headers($uids, $rfc = "RFC822", $uid = false) {
         return $this->fetch(["$rfc.HEADER"], $uids, null, $uid);
     }
 
@@ -661,7 +661,7 @@ 
      * @return array
      * @throws RuntimeException
      */
-    public function flags($uids, $uid = false){
+    public function flags($uids, $uid = false) {
         return $this->fetch(["FLAGS"], $uids, null, $uid);
     }
 
@@ -746,22 +746,22 @@ 
     public function store(array $flags, $from, $to = null, $mode = null, $silent = true, $uid = false) {
         $item = 'FLAGS';
         if ($mode == '+' || $mode == '-') {
-            $item = $mode . $item;
+            $item = $mode.$item;
         }
         if ($silent) {
             $item .= '.SILENT';
         }
 
         $flags = $this->escapeList($flags);
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
 
         $result = $this->requestAndResponse('STORE', [$set, $item, $flags], $silent);
 
         if ($silent) {
-            return (bool)$result;
+            return (bool) $result;
         }
 
         $tokens = $result;
@@ -812,9 +812,9 @@ 
      * @throws RuntimeException
      */
     public function copyMessage($folder, $from, $to = null, $uid = false) {
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
 
         return $this->requestAndResponse('COPY', [$set, $this->escapeString($folder)], true);
@@ -832,9 +832,9 @@ 
      * @throws RuntimeException
      */
     public function moveMessage($folder, $from, $to = null, $uid = false) {
-        $set = (int)$from;
+        $set = (int) $from;
         if ($to !== null) {
-            $set .= ':' . ($to == INF ? '*' : (int)$to);
+            $set .= ':'.($to == INF ? '*' : (int) $to);
         }
 
         return $this->requestAndResponse('MOVE', [$set, $this->escapeString($folder)], true);
@@ -1002,7 +1002,7 @@ 
         $uids = $this->getUid();
         $ids = [];
         foreach ($uids as $msgn => $v) {
-            if ( ($to >= $msgn && $from <= $msgn) || ($to === "*" && $from <= $msgn) ){
+            if (($to >= $msgn && $from <= $msgn) || ($to === "*" && $from <= $msgn)) {
                 $ids[] = $uid ? $v : $msgn;
             }
         }
@@ -1016,14 +1016,14 @@ 
     /**
      * Enable the debug mode
      */
-    public function enableDebug(){
+    public function enableDebug() {
         $this->debug = true;
     }
 
     /**
      * Disable the debug mode
      */
-    public function disableDebug(){
+    public function disableDebug() {
         $this->debug = false;
     }
 }
\ No newline at end of file