Webklex / laravel-imap

src/IMAP/Attachment.php

Spacing +2 added lines, -2 removed lines

@@ -238,14 +238,14 @@
     /**
      * @return string|null
      */
-    public function getMimeType(){
+    public function getMimeType() {
         return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE);
     }
 
     /**
      * @return string|null
      */
-    public function getExtension(){
+    public function getExtension() {
         return ExtensionGuesser::getInstance()->guess($this->getMimeType());
     }
 }
\ No newline at end of file

src/IMAP/Query/WhereQuery.php

Braces +9 added lines, -5 removed lines

@@ -77,17 +77,17 @@ 
             foreach($criteria as $arguments){
                 if(count($arguments) == 1){
                     $this->where($arguments[0]);
-                }elseif(count($arguments) == 2){
+                } elseif(count($arguments) == 2){
                     $this->where($arguments[0], $arguments[1]);
                 }
             }
-        }else{
+        } else{
             $criteria = $this->validate_criteria($criteria);
             $value = $this->parse_value($value);
 
             if($value === null || $value === ''){
                 $this->query->push([$criteria]);
-            }else{
+            } else{
                 $this->query->push([$criteria, $value]);
             }
         }
@@ -102,7 +102,9 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }
@@ -114,7 +116,9 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if($closure !== null) {
+            $closure($this);
+        }
 
         return $this;
     }

Spacing +11 added lines, -11 removed lines

@@ -70,7 +70,7 @@ 
      */
     public function __call($name, $arguments) {
         $method = 'where'.ucfirst($name);
-        if(method_exists($this, $method) === true){
+        if (method_exists($this, $method) === true) {
             return call_user_func_array([$this, $method], $arguments);
         }
 
@@ -87,7 +87,7 @@ 
     protected function validate_criteria($criteria) {
         $criteria = strtoupper($criteria);
 
-        if(in_array($criteria, $this->available_criteria) === false) {
+        if (in_array($criteria, $this->available_criteria) === false) {
             throw new InvalidWhereQueryCriteriaException();
         }
 
@@ -102,21 +102,21 @@ 
      * @throws InvalidWhereQueryCriteriaException
      */
     public function where($criteria, $value = null) {
-        if(is_array($criteria)){
-            foreach($criteria as $arguments){
-                if(count($arguments) == 1){
+        if (is_array($criteria)) {
+            foreach ($criteria as $arguments) {
+                if (count($arguments) == 1) {
                     $this->where($arguments[0]);
-                }elseif(count($arguments) == 2){
+                }elseif (count($arguments) == 2) {
                     $this->where($arguments[0], $arguments[1]);
                 }
             }
-        }else{
+        } else {
             $criteria = $this->validate_criteria($criteria);
             $value = $this->parse_value($value);
 
-            if($value === null || $value === ''){
+            if ($value === null || $value === '') {
                 $this->query->push([$criteria]);
-            }else{
+            } else {
                 $this->query->push([$criteria, $value]);
             }
         }
@@ -131,7 +131,7 @@ 
      */
     public function orWhere(\Closure $closure = null) {
         $this->query->push(['OR']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }
@@ -143,7 +143,7 @@ 
      */
     public function andWhere(\Closure $closure = null) {
         $this->query->push(['AND']);
-        if($closure !== null) $closure($this);
+        if ($closure !== null) $closure($this);
 
         return $this;
     }

src/IMAP/Query/Query.php

Braces +11 added lines, -5 removed lines

@@ -64,7 +64,9 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === FT_PEEK) $this->leaveUnread();
+        if(config('imap.options.fetch') === FT_PEEK) {
+            $this->leaveUnread();
+        }
 
         $this->charset = $charset;
         $this->query = collect();
@@ -100,7 +102,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);
@@ -151,7 +155,7 @@ 
              */
             if($this->getCharset() === null){
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID);
-            }else{
+            } else{
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset());
             }
 
@@ -203,7 +207,7 @@ 
             } else {
                 if($statement[1] === null){
                     $query .= $statement[0];
-                }else{
+                } else{
                     $query .= $statement[0].' "'.$statement[1].'"';
                 }
             }
@@ -232,7 +236,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 +12 added lines, -12 removed lines

@@ -64,7 +64,7 @@ 
     public function __construct(Client $client, $charset = 'UTF-8') {
         $this->setClient($client);
 
-        if(config('imap.options.fetch') === FT_PEEK) $this->leaveUnread();
+        if (config('imap.options.fetch') === FT_PEEK) $this->leaveUnread();
 
         $this->charset = $charset;
         $this->query = collect();
@@ -74,7 +74,7 @@ 
     /**
      * Instance boot method for additional functionality
      */
-    protected function boot(){}
+    protected function boot() {}
 
     /**
      * Parse a given value
@@ -82,8 +82,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('d M y');
                 break;
@@ -100,7 +100,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);
@@ -149,9 +149,9 @@ 
              * 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(), SE_UID);
-            }else{
+            } else {
                 $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), SE_UID, $this->getCharset());
             }
 
@@ -160,13 +160,13 @@ 
                 $available_messages = collect($available_messages);
                 $options = config('imap.options');
 
-                if(strtolower($options['fetch_order']) === 'desc'){
+                if (strtolower($options['fetch_order']) === 'desc') {
                     $available_messages = $available_messages->reverse();
                 }
 
                 $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options) {
                     $oMessage = new Message($msgno, $msglist, $this->getClient(), $this->getFetchOptions(), $this->getFetchBody(), $this->getFetchAttachment(), $this->getFetchFlags());
-                    switch ($options['message_key']){
+                    switch ($options['message_key']) {
                         case 'number':
                             $message_key = $oMessage->getMessageNo();
                             break;
@@ -201,9 +201,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].'"';
                 }
             }
@@ -232,7 +232,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/Providers/LaravelServiceProvider.php

Spacing +15 added lines, -15 removed lines

@@ -58,7 +58,7 @@ 
      * If however the default account is missing a parameter the package default account parameter will be used.
      * This can be disabled by setting imap.default in your config file to 'false'
      */
-    private function setVendorConfig(){
+    private function setVendorConfig() {
 
         $config_key = 'imap';
         $path = __DIR__.'/../../config/'.$config_key.'.php';
@@ -70,17 +70,17 @@ 
 
         $config = $this->app['config']->get($config_key);
 
-        if(is_array($config)){
-            if(isset($config['default'])){
-                if(isset($config['accounts']) && $config['default'] != false){
+        if (is_array($config)) {
+            if (isset($config['default'])) {
+                if (isset($config['accounts']) && $config['default'] != false) {
 
                     $default_config = $vendor_config['accounts']['default'];
-                    if(isset($config['accounts'][$config['default']])){
+                    if (isset($config['accounts'][$config['default']])) {
                         $default_config = array_merge($default_config, $config['accounts'][$config['default']]);
                     }
 
-                    if(is_array($config['accounts'])){
-                        foreach($config['accounts'] as $account_key => $account){
+                    if (is_array($config['accounts'])) {
+                        foreach ($config['accounts'] as $account_key => $account) {
                             $config['accounts'][$account_key] = array_merge($default_config, $account);
                         }
                     }
@@ -114,23 +114,23 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if (!is_array($base)) $base = empty($base) ? array() : array($base);
 
-        foreach($arrays as $append) {
+        foreach ($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if (!is_array($append)) $append = array($append);
 
-            foreach($append as $key => $value) {
+            foreach ($append as $key => $value) {
 
-                if(!array_key_exists($key, $base) and !is_numeric($key)) {
+                if (!array_key_exists($key, $base) and !is_numeric($key)) {
                     $base[$key] = $append[$key];
                     continue;
                 }
 
-                if(is_array($value) or is_array($base[$key])) {
+                if (is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
-                } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                } else if (is_numeric($key)) {
+                    if (!in_array($value, $base)) $base[] = $value;
                 } else {
                     $base[$key] = $value;
                 }

Braces +9 added lines, -3 removed lines

@@ -114,11 +114,15 @@ 
         $arrays = func_get_args();
         $base = array_shift($arrays);
 
-        if(!is_array($base)) $base = empty($base) ? array() : array($base);
+        if(!is_array($base)) {
+            $base = empty($base) ? array() : array($base);
+        }
 
         foreach($arrays as $append) {
 
-            if(!is_array($append)) $append = array($append);
+            if(!is_array($append)) {
+                $append = array($append);
+            }
 
             foreach($append as $key => $value) {
 
@@ -130,7 +134,9 @@ 
                 if(is_array($value) or is_array($base[$key])) {
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
                 } else if(is_numeric($key)) {
-                    if(!in_array($value, $base)) $base[] = $value;
+                    if(!in_array($value, $base)) {
+                        $base[] = $value;
+                    }
                 } else {
                     $base[$key] = $value;
                 }

src/IMAP/Client.php

Indentation +8 added lines, -8 removed lines

@@ -355,14 +355,14 @@
         return $status;
     }
     
-     /**
-     * Delete Folder
-     * @param string $name
-      * @param boolean $expunge
-     *
-     * @return bool
-     * @throws ConnectionFailedException
-     */
+        /**
+         * Delete Folder
+         * @param string $name
+         * @param boolean $expunge
+         *
+         * @return bool
+         * @throws ConnectionFailedException
+         */
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));

Spacing +8 added lines, -8 removed lines

@@ -113,7 +113,7 @@ 
      *
      * @var array $validConfigKeys
      */
-    protected $validConfigKeys = ['host', 'port', 'encryption', 'validate_cert', 'username', 'password','protocol'];
+    protected $validConfigKeys = ['host', 'port', 'encryption', 'validate_cert', 'username', 'password', 'protocol'];
 
     /**
      * Client constructor.
@@ -332,8 +332,8 @@ 
      */
     public function createFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        $status = imap_createmailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -349,8 +349,8 @@ 
      */
     public function renameFolder($old_name, $new_name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name));
-        if($expunge) $this->expunge();
+        $status = imap_renamemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($old_name), $this->getAddress().imap_utf7_encode($new_name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -365,8 +365,8 @@ 
      */
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
-        $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        $status = imap_deletemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name));
+        if ($expunge) $this->expunge();
 
         return $status;
     }
@@ -456,7 +456,7 @@ 
         if (!$this->validate_cert) {
             $address .= '/novalidate-cert';
         }
-        if (in_array($this->encryption,['tls','ssl'])) {
+        if (in_array($this->encryption, ['tls', 'ssl'])) {
             $address .= '/'.$this->encryption;
         }
         $address .= '}';

Braces +9 added lines, -3 removed lines

@@ -333,7 +333,9 @@ 
     public function createFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }
@@ -350,7 +352,9 @@ 
     public function renameFolder($old_name, $new_name, $expunge = true) {
         $this->checkConnection();
         $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name));
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }
@@ -366,7 +370,9 @@ 
     public function deleteFolder($name, $expunge = true) {
         $this->checkConnection();
         $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
-        if($expunge) $this->expunge();
+        if($expunge) {
+            $this->expunge();
+        }
 
         return $status;
     }

src/IMAP/Folder.php

Braces +6 added lines, -2 removed lines

@@ -370,7 +370,9 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_deletemailbox($this->client->getConnection(), $this->path);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }
@@ -387,7 +389,9 @@ 
      */
     public function move($target_mailbox, $expunge = true) {
         $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }

Spacing +8 added lines, -8 removed lines

@@ -131,7 +131,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);
 
@@ -142,7 +142,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);
     }
 
@@ -150,7 +150,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);
     }
 
@@ -317,7 +317,7 @@ 
      * @deprecated 1.2.1:2.0.0 No longer needed. Use Folder::query() instead
      * @see Folder::query()
      */
-    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true,  $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") {
+    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") {
         $this->getClient()->checkConnection();
 
         return $this->query($charset)->where($where)->setFetchOptions($fetch_options)->setFetchBody($fetch_body)
@@ -376,7 +376,7 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_deletemailbox($this->client->getConnection(), $this->path);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -393,7 +393,7 @@ 
      */
     public function move($target_mailbox, $expunge = true) {
         $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -442,8 +442,8 @@ 
     /**
      * @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 = config('imap.options.delimiter', '/');
         }
 

src/IMAP/Message.php

Braces +7 added lines, -3 removed lines

@@ -722,7 +722,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        } elseif (is_string($structure) === true){
             return mb_detect_encoding($structure);
         }
 
@@ -792,7 +792,9 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_delete($this->client->getConnection(), $this->uid, FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }
@@ -806,7 +808,9 @@ 
      */
     public function restore($expunge = true) {
         $status = imap_undelete($this->client->getConnection(), $this->uid, FT_UID);
-        if($expunge) $this->client->expunge();
+        if($expunge) {
+            $this->client->expunge();
+        }
 
         return $status;
     }

Spacing +10 added lines, -10 removed lines

@@ -186,7 +186,7 @@ 
         $this->msglist = $msglist;
         $this->client = $client;
 
-        $this->uid =  ($this->fetch_options == FT_UID) ? $uid : $uid;
+        $this->uid = ($this->fetch_options == FT_UID) ? $uid : $uid;
         $this->msgn = ($this->fetch_options == FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid;
 
         $this->parseHeader();
@@ -293,9 +293,9 @@ 
             $header = imap_rfc822_parse_headers($this->header);
         }
 
-        if(preg_match('/x\-priority\:.*([0-9]{1,2})/i', $this->header, $priority)){
+        if (preg_match('/x\-priority\:.*([0-9]{1,2})/i', $this->header, $priority)) {
             $priority = isset($priority[1]) ? (int) $priority[1] : 0;
-            switch($priority){
+            switch ($priority) {
                 case self::PRIORITY_HIGHEST;
                     $this->priority = self::PRIORITY_HIGHEST;
                     break;
@@ -481,12 +481,12 @@ 
     public function parseBody() {
         $structure = imap_fetchstructure($this->client->getConnection(), $this->uid, FT_UID);
 
-        if(property_exists($structure, 'parts')){
+        if (property_exists($structure, 'parts')) {
             $parts = $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);
@@ -726,7 +726,7 @@ 
                     return EncodingAliases::get($parameter->value);
                 }
             }
-        }elseif (is_string($structure) === true){
+        }elseif (is_string($structure) === true) {
             return mb_detect_encoding($structure);
         }
 
@@ -796,7 +796,7 @@ 
      */
     public function delete($expunge = true) {
         $status = imap_delete($this->client->getConnection(), $this->uid, FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }
@@ -810,7 +810,7 @@ 
      */
     public function restore($expunge = true) {
         $status = imap_undelete($this->client->getConnection(), $this->uid, FT_UID);
-        if($expunge) $this->client->expunge();
+        if ($expunge) $this->client->expunge();
 
         return $status;
     }