Webklex / laravel-imap

src/IMAP/Query/Query.php

Spacing +15 added lines, -15 removed lines

@@ -68,7 +68,7 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if (config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
 
         $this->date_format = config('imap.date_format', 'd M y');
 
@@ -80,7 +80,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -88,8 +88,8 @@ 
      *
      * @return string
      */
-    protected function parse_value($value){
-        switch(true){
+    protected function parse_value($value) {
+        switch (true) {
             case $value instanceof \Carbon\Carbon:
                 $value = $value->format($this->date_format);
                 break;
@@ -106,7 +106,7 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date) {
-        if($date instanceof \Carbon\Carbon) return $date;
+        if ($date instanceof \Carbon\Carbon) return $date;
 
         try {
             $date = Carbon::parse($date);
@@ -145,16 +145,16 @@ 
      * @return \Illuminate\Support\Collection
      * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException
      */
-    protected function search(){
+    protected function search() {
         $this->generate_query();
 
         /**
          * Don't set the charset if it isn't used - prevent strange outlook mail server errors
          * @see https://github.com/Webklex/laravel-imap/issues/100
          */
-        if($this->getCharset() === null){
+        if ($this->getCharset() === null) {
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
-        }else{
+        } else {
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
         }
 
@@ -184,15 +184,15 @@ 
 
                 $options = config('imap.options');
 
-                if(strtolower($options['fetch_order']) === 'desc'){
+                if (strtolower($options['fetch_order']) === 'desc') {
                     $available_messages = $available_messages->reverse();
                 }
 
-                $query =& $this;
+                $query = & $this;
 
                 $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options, $query) {
                     $oMessage = new Message($msgno, $msglist, $query->getClient(), $query->getFetchOptions(), $query->getFetchBody(), $query->getFetchAttachment(), $query->getFetchFlags());
-                    switch ($options['message_key']){
+                    switch ($options['message_key']) {
                         case 'number':
                             $message_key = $oMessage->getMessageNo();
                             break;
@@ -223,7 +223,7 @@ 
      * @return \Illuminate\Pagination\LengthAwarePaginator
      * @throws GetMessagesFailedException
      */
-    public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){
+    public function paginate($per_page = 5, $page = null, $page_name = 'imap_page') {
         $this->page = $page > $this->page ? $page : $this->page;
         $this->limit = $per_page;
 
@@ -241,9 +241,9 @@ 
             if (count($statement) == 1) {
                 $query .= $statement[0];
             } else {
-                if($statement[1] === null){
+                if ($statement[1] === null) {
                     $query .= $statement[0];
-                }else{
+                } else {
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -273,7 +273,7 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if ($page >= 1) $this->page = $page;
         $this->limit = $limit;
 
         return $this;

Braces +11 added lines, -5 removed lines

@@ -68,7 +68,9 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
+        if(config('imap.options.fetch') === IMAP::FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         $this->date_format = config('imap.date_format', 'd M y');
 
@@ -106,7 +108,9 @@ 
      * @throws MessageSearchValidationException
      */
     protected function parse_date($date) {
-        if($date instanceof \Carbon\Carbon) return $date;
+        if($date instanceof \Carbon\Carbon) {
+            return $date;
+        }
 
         try {
             $date = Carbon::parse($date);
@@ -154,7 +158,7 @@ 
          */
         if($this->getCharset() === null){
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
-        }else{
+        } else{
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
         }
 
@@ -243,7 +247,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -273,7 +277,9 @@ 
      * @return $this
      */
     public function limit($limit, $page = 1) {
-        if($page >= 1) $this->page = $page;
+        if($page >= 1) {
+            $this->page = $page;
+        }
         $this->limit = $limit;
 
         return $this;

src/IMAP/Message.php

Spacing +35 added lines, -35 removed lines

@@ -196,7 +196,7 @@ 
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_attachment = false, $fetch_flags = false) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -215,7 +215,7 @@ 
         $this->msglist = $msglist;
         $this->client = $client;
 
-        $this->uid =  ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid;
+        $this->uid = ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid;
         $this->msgn = ($this->fetch_options == IMAP::FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid;
 
         $this->parseHeader();
@@ -238,17 +238,17 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = snake_case(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(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];
@@ -277,7 +277,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -363,11 +363,11 @@ 
         if ($replaceImages !== false) {
             $this->attachments->each(function($oAttachment) use(&$body, $replaceImages) {
                 /** @var Attachment $oAttachment */
-                if(is_callable($replaceImages)) {
+                if (is_callable($replaceImages)) {
                     $body = $replaceImages($body, $oAttachment);
-                }elseif(is_string($replaceImages)) {
+                }elseif (is_string($replaceImages)) {
                     call_user_func($replaceImages, [$body, $oAttachment]);
-                }else{
+                } else {
                     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
                         $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
                     }
@@ -396,14 +396,14 @@ 
         }
 
         if (property_exists($header, 'subject')) {
-            if($this->config['decoder']['message']['subject'] === 'utf-8') {
+            if ($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = imap_utf8($header->subject);
-            }else{
+            } else {
                 $this->subject = mb_decode_mimeheader($header->subject);
             }
         }
 
-        foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part){
+        foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part) {
             $this->extractHeaderAddressPart($header, $part);
         }
 
@@ -433,9 +433,9 @@ 
      * @return int|null
      */
     private function extractPriority($header) {
-        if(preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)){
+        if (preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)) {
             $priority = isset($priority[1]) ? (int) $priority[1] : 0;
-            switch($priority){
+            switch ($priority) {
                 case IMAP::MESSAGE_PRIORITY_HIGHEST;
                     $priority = IMAP::MESSAGE_PRIORITY_HIGHEST;
                     break;
@@ -486,7 +486,7 @@ 
         if (property_exists($header, 'date')) {
             $date = $header->date;
 
-            if(preg_match('/\+0580/', $date)) {
+            if (preg_match('/\+0580/', $date)) {
                 $date = str_replace('+0580', '+0530', $date);
             }
 
@@ -507,7 +507,7 @@ 
                         $date .= 'C';
                         break;
                 }
-                try{
+                try {
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     throw new InvalidMessageDateException("Invalid message date. ID:".$this->getMessageId(), 1000, $e);
@@ -530,7 +530,7 @@ 
         $this->client->openFolder($this->folder_path);
         $flags = imap_fetch_overview($this->client->getConnection(), $this->uid, IMAP::FT_UID);
         if (is_array($flags) && isset($flags[0])) {
-            foreach($this->available_flags as $flag) {
+            foreach ($this->available_flags as $flag) {
                 $this->parseFlag($flags, $flag);
             }
         }
@@ -627,12 +627,12 @@ 
         $this->client->openFolder($this->folder_path);
         $this->structure = imap_fetchstructure($this->client->getConnection(), $this->uid, IMAP::FT_UID);
 
-        if(property_exists($this->structure, 'parts')){
+        if (property_exists($this->structure, 'parts')) {
             $parts = $this->structure->parts;
 
-            foreach ($parts as $part)  {
-                foreach ($part->parameters as $parameter)  {
-                    if($parameter->attribute == "charset")  {
+            foreach ($parts as $part) {
+                foreach ($part->parameters as $parameter) {
+                    if ($parameter->attribute == "charset") {
                         $encoding = $parameter->value;
 
                         $encoding = preg_replace('/Content-Transfer-Encoding/', '', $encoding);
@@ -909,7 +909,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -959,7 +959,7 @@ 
         return null;
     }
 
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -975,7 +975,7 @@ 
      */
     public function moveToFolder($mailbox = 'INBOX', $expunge = false, $create_folder = true) {
 
-        if($create_folder) $this->client->createFolder($mailbox, true);
+        if ($create_folder) $this->client->createFolder($mailbox, true);
 
         $target_folder = $this->client->getFolder($mailbox);
         $target_status = $target_folder->getStatus(IMAP::SA_ALL);
@@ -983,8 +983,8 @@ 
         $this->client->openFolder($this->folder_path);
         $status = imap_mail_move($this->client->getConnection(), $this->uid, $mailbox, IMAP::CP_UID);
 
-        if($status === true){
-            if($expunge) $this->client->expunge();
+        if ($status === true) {
+            if ($expunge) $this->client->expunge();
             $this->client->openFolder($target_folder->path);
 
             return $target_folder->getMessage($target_status->uidnext, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -1004,7 +1004,7 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -1020,7 +1020,7 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -1150,7 +1150,7 @@ 
     /**
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1176,7 +1176,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
@@ -1184,8 +1184,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1195,7 +1195,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1206,9 +1206,9 @@ 
      * @return mixed
      * @throws MaskNotFoundException
      */
-    public function mask($mask = null){
+    public function mask($mask = null) {
         $mask = $mask !== null ? $mask : $this->mask;
-        if(class_exists($mask)){
+        if (class_exists($mask)) {
             return new $mask($this);
         }
 

Braces +17 added lines, -9 removed lines

@@ -245,7 +245,7 @@ 
                 return $this->attributes[$name];
             }
 
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = snake_case(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
@@ -365,9 +365,9 @@ 
                 /** @var Attachment $oAttachment */
                 if(is_callable($replaceImages)) {
                     $body = $replaceImages($body, $oAttachment);
-                }elseif(is_string($replaceImages)) {
+                } elseif(is_string($replaceImages)) {
                     call_user_func($replaceImages, [$body, $oAttachment]);
-                }else{
+                } else{
                     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
                         $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
                     }
@@ -398,7 +398,7 @@ 
         if (property_exists($header, 'subject')) {
             if($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = imap_utf8($header->subject);
-            }else{
+            } else{
                 $this->subject = mb_decode_mimeheader($header->subject);
             }
         }
@@ -909,7 +909,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -975,7 +975,9 @@ 
      */
     public function moveToFolder($mailbox = 'INBOX', $expunge = false, $create_folder = true) {
 
-        if($create_folder) $this->client->createFolder($mailbox, true);
+        if($create_folder) {
+            $this->client->createFolder($mailbox, true);
+        }
 
         $target_folder = $this->client->getFolder($mailbox);
         $target_status = $target_folder->getStatus(IMAP::SA_ALL);
@@ -984,7 +986,9 @@ 
         $status = imap_mail_move($this->client->getConnection(), $this->uid, $mailbox, IMAP::CP_UID);
 
         if($status === true){
-            if($expunge) $this->client->expunge();
+            if($expunge) {
+                $this->client->expunge();
+            }
             $this->client->openFolder($target_folder->path);
 
             return $target_folder->getMessage($target_status->uidnext, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -1004,7 +1008,9 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }
@@ -1020,7 +1026,9 @@ 
         $this->client->openFolder($this->folder_path);
 
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }

src/IMAP/Support/PaginatedCollection.php

Spacing +1 added lines, -1 removed lines

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