Webklex / laravel-imap

examples/custom_message_mask.php

Spacing +1 added lines, -1 removed lines

@@ -16,7 +16,7 @@
      * New custom method which can be called through a mask
      * @return string
      */
-    public function my_token(){
+    public function my_token() {
         return implode('-', [$this->message_id, $this->uid, $this->message_no]);
     }
 

src/IMAP/Query/Query.php

Braces +11 added lines, -5 removed lines

@@ -69,7 +69,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');
 
@@ -107,7 +109,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);
@@ -159,7 +163,7 @@ 
         try {
             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());
             }
         } catch (\Exception $e) {
@@ -300,7 +304,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -330,7 +334,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 +19 added lines, -19 removed lines

@@ -69,7 +69,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');
 
@@ -81,7 +81,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -89,8 +89,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;
@@ -107,7 +107,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);
@@ -146,7 +146,7 @@ 
      * @return \Illuminate\Support\Collection
      * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException
      */
-    protected function search(){
+    protected function search() {
         $this->generate_query();
         $available_messages = [];
 
@@ -159,14 +159,14 @@ 
         try {
             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());
             }
         } catch (\Exception $e) {
             if (strpos($e, ' [BADCHARSET (')) {
                 preg_match('/ \[BADCHARSET \((.*)\)\]/', $e, $matches);
                 if (isset($matches[1])) {
-                    if ($matches[1] !== $this->getCharset()){
+                    if ($matches[1] !== $this->getCharset()) {
                         $this->setCharset($matches[1]);
                         return $this->search();
                     }
@@ -210,15 +210,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;
@@ -249,7 +249,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;
 
@@ -264,13 +264,13 @@ 
      * @throws \Webklex\IMAP\Exceptions\ConnectionFailedException
      * @throws \Webklex\IMAP\Exceptions\InvalidMessageDateException
      */
-    public function idle(callable $callback = null, $timeout = 10){
+    public function idle(callable $callback = null, $timeout = 10) {
         $known_messages = [];
         $this->getClient()->overview()->each(function($message) use(&$known_messages){
             /** @var object $message */
             $known_messages[] = $message->uid;
         });
-        while ($this->getClient()->isConnected()){
+        while ($this->getClient()->isConnected()) {
             $this->getClient()->expunge();
             $new_messages = [];
             $this->getClient()->overview()->each(function($message) use(&$new_messages, &$known_messages){
@@ -281,10 +281,10 @@ 
                 }
             });
 
-            foreach($new_messages as $msg) {
+            foreach ($new_messages as $msg) {
                 $message = new Message($msg->uid, $msg->msgno, $this->getClient());
                 MessageNewEvent::dispatch($message);
-                if ($callback){
+                if ($callback) {
                     $callback($message);
                 }
             }
@@ -304,9 +304,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].'"';
                 }
             }
@@ -336,7 +336,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/IMAP/Message.php

Spacing +35 added lines, -35 removed lines

@@ -200,7 +200,7 @@ 
     public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = null, $fetch_attachment = null, $fetch_flags = null) {
 
         $default_mask = $client->getDefaultMessageMask();
-        if($default_mask != null) {
+        if ($default_mask != null) {
             $this->mask = $default_mask;
         }
 
@@ -219,7 +219,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();
@@ -242,17 +242,17 @@ 
      * @throws MethodNotFoundException
      */
     public function __call($method, $arguments) {
-        if(strtolower(substr($method, 0, 3)) === 'get') {
+        if (strtolower(substr($method, 0, 3)) === 'get') {
             $name = Str::snake(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 return $this->attributes[$name];
             }
 
         }elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
-            if(in_array($name, array_keys($this->attributes))) {
+            if (in_array($name, array_keys($this->attributes))) {
                 $this->attributes[$name] = array_pop($arguments);
 
                 return $this->attributes[$name];
@@ -281,7 +281,7 @@ 
      * @return mixed|null
      */
     public function __get($name) {
-        if(isset($this->attributes[$name])) {
+        if (isset($this->attributes[$name])) {
             return $this->attributes[$name];
         }
 
@@ -377,16 +377,16 @@ 
         }
 
         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);
-            }elseif($this->config['decoder']['message']['subject'] === 'iconv') {
+            }elseif ($this->config['decoder']['message']['subject'] === 'iconv') {
                 $this->subject = iconv_mime_decode($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);
         }
 
@@ -416,9 +416,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;
@@ -469,7 +469,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);
             }
 
@@ -492,7 +492,7 @@ 
                         $date = trim(array_pop($array));
                         break;
                 }
-                try{
+                try {
                     $parsed_date = Carbon::parse($date);
                 } catch (\Exception $_e) {
                     throw new InvalidMessageDateException("Invalid message date. ID:".$this->getMessageId(), 1000, $e);
@@ -515,7 +515,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);
             }
         }
@@ -587,7 +587,7 @@ 
             } else {
                 $personalParts = \imap_mime_header_decode($address->personal);
 
-                if(is_array($personalParts)) {
+                if (is_array($personalParts)) {
                     $address->personal = '';
                     foreach ($personalParts as $p) {
                         $encoding = (property_exists($p, 'charset')) ? $p->charset : $this->getEncoding($p->text);
@@ -615,12 +615,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);
@@ -899,7 +899,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -949,7 +949,7 @@ 
         return null;
     }
 
-    public function getFolder(){
+    public function getFolder() {
         return $this->client->getFolder($this->folder_path);
     }
 
@@ -965,7 +965,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);
@@ -973,8 +973,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);
 
             $message = $target_folder->getMessage($target_status->uidnext, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -996,7 +996,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();
         MessageDeletedEvent::dispatch($this);
 
         return $status;
@@ -1013,7 +1013,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();
         MessageRestoredEvent::dispatch($this);
 
         return $status;
@@ -1090,7 +1090,7 @@ 
      * @return string
      * @throws Exceptions\ConnectionFailedException
      */
-    public function getToken(){
+    public function getToken() {
         return base64_encode(implode('-', [$this->message_id, $this->subject, strlen($this->getRawBody())]));
     }
 
@@ -1153,7 +1153,7 @@ 
     /**
      * @return object|null
      */
-    public function getStructure(){
+    public function getStructure() {
         return $this->structure;
     }
 
@@ -1179,7 +1179,7 @@ 
     /**
      * @return array
      */
-    public function getAttributes(){
+    public function getAttributes() {
         return $this->attributes;
     }
 
@@ -1187,8 +1187,8 @@ 
      * @param $mask
      * @return $this
      */
-    public function setMask($mask){
-        if(class_exists($mask)){
+    public function setMask($mask) {
+        if (class_exists($mask)) {
             $this->mask = $mask;
         }
 
@@ -1198,7 +1198,7 @@ 
     /**
      * @return string
      */
-    public function getMask(){
+    public function getMask() {
         return $this->mask;
     }
 
@@ -1209,9 +1209,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 +16 added lines, -8 removed lines

@@ -249,7 +249,7 @@ 
                 return $this->attributes[$name];
             }
 
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
             $name = Str::snake(substr($method, 3));
 
             if(in_array($name, array_keys($this->attributes))) {
@@ -379,9 +379,9 @@ 
         if (property_exists($header, 'subject')) {
             if($this->config['decoder']['message']['subject'] === 'utf-8') {
                 $this->subject = \imap_utf8($header->subject);
-            }elseif($this->config['decoder']['message']['subject'] === 'iconv') {
+            } elseif($this->config['decoder']['message']['subject'] === 'iconv') {
                 $this->subject = iconv_mime_decode($header->subject);
-            }else{
+            } else{
                 $this->subject = mb_decode_mimeheader($header->subject);
             }
         }
@@ -899,7 +899,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -965,7 +965,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);
@@ -974,7 +976,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);
 
             $message = $target_folder->getMessage($target_status->uidnext, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -996,7 +1000,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();
+        }
         MessageDeletedEvent::dispatch($this);
 
         return $status;
@@ -1013,7 +1019,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();
+        }
         MessageRestoredEvent::dispatch($this);
 
         return $status;