| @@ -58,7 +58,7 @@ discard block | ||
| 58 | 58 | * If however the default account is missing a parameter the package default account parameter will be used. | 
| 59 | 59 | * This can be disabled by setting imap.default in your config file to 'false' | 
| 60 | 60 | */ | 
| 61 | -    private function setVendorConfig(){ | |
| 61 | +    private function setVendorConfig() { | |
| 62 | 62 | |
| 63 | 63 | $config_key = 'imap'; | 
| 64 | 64 | $path = __DIR__.'/../../config/'.$config_key.'.php'; | 
| @@ -70,17 +70,17 @@ discard block | ||
| 70 | 70 | |
| 71 | 71 | $config = $this->app['config']->get($config_key); | 
| 72 | 72 | |
| 73 | -        if(is_array($config)){ | |
| 74 | -            if(isset($config['default'])){ | |
| 75 | -                if(isset($config['accounts']) && $config['default'] != false){ | |
| 73 | +        if (is_array($config)) { | |
| 74 | +            if (isset($config['default'])) { | |
| 75 | +                if (isset($config['accounts']) && $config['default'] != false) { | |
| 76 | 76 | |
| 77 | 77 | $default_config = $vendor_config['accounts']['default']; | 
| 78 | -                    if(isset($config['accounts'][$config['default']])){ | |
| 78 | +                    if (isset($config['accounts'][$config['default']])) { | |
| 79 | 79 | $default_config = array_merge($default_config, $config['accounts'][$config['default']]); | 
| 80 | 80 | } | 
| 81 | 81 | |
| 82 | -                    if(is_array($config['accounts'])){ | |
| 83 | -                        foreach($config['accounts'] as $account_key => $account){ | |
| 82 | +                    if (is_array($config['accounts'])) { | |
| 83 | +                        foreach ($config['accounts'] as $account_key => $account) { | |
| 84 | 84 | $config['accounts'][$account_key] = array_merge($default_config, $account); | 
| 85 | 85 | } | 
| 86 | 86 | } | 
| @@ -114,23 +114,23 @@ discard block | ||
| 114 | 114 | $arrays = func_get_args(); | 
| 115 | 115 | $base = array_shift($arrays); | 
| 116 | 116 | |
| 117 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); | |
| 117 | + if (!is_array($base)) $base = empty($base) ? array() : array($base); | |
| 118 | 118 | |
| 119 | -        foreach($arrays as $append) { | |
| 119 | +        foreach ($arrays as $append) { | |
| 120 | 120 | |
| 121 | - if(!is_array($append)) $append = array($append); | |
| 121 | + if (!is_array($append)) $append = array($append); | |
| 122 | 122 | |
| 123 | -            foreach($append as $key => $value) { | |
| 123 | +            foreach ($append as $key => $value) { | |
| 124 | 124 | |
| 125 | -                if(!array_key_exists($key, $base) and !is_numeric($key)) { | |
| 125 | +                if (!array_key_exists($key, $base) and !is_numeric($key)) { | |
| 126 | 126 | $base[$key] = $append[$key]; | 
| 127 | 127 | continue; | 
| 128 | 128 | } | 
| 129 | 129 | |
| 130 | -                if(is_array($value) or is_array($base[$key])) { | |
| 130 | +                if (is_array($value) or is_array($base[$key])) { | |
| 131 | 131 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); | 
| 132 | -                } else if(is_numeric($key)) { | |
| 133 | - if(!in_array($value, $base)) $base[] = $value; | |
| 132 | +                } else if (is_numeric($key)) { | |
| 133 | + if (!in_array($value, $base)) $base[] = $value; | |
| 134 | 134 |                  } else { | 
| 135 | 135 | $base[$key] = $value; | 
| 136 | 136 | } | 
| @@ -355,14 +355,14 @@ | ||
| 355 | 355 | return $status; | 
| 356 | 356 | } | 
| 357 | 357 | |
| 358 | - /** | |
| 359 | - * Delete Folder | |
| 360 | - * @param string $name | |
| 361 | - * @param boolean $expunge | |
| 362 | - * | |
| 363 | - * @return bool | |
| 364 | - * @throws ConnectionFailedException | |
| 365 | - */ | |
| 358 | + /** | |
| 359 | + * Delete Folder | |
| 360 | + * @param string $name | |
| 361 | + * @param boolean $expunge | |
| 362 | + * | |
| 363 | + * @return bool | |
| 364 | + * @throws ConnectionFailedException | |
| 365 | + */ | |
| 366 | 366 |      public function deleteFolder($name, $expunge = true) { | 
| 367 | 367 | $this->checkConnection(); | 
| 368 | 368 | $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); | 
| @@ -173,45 +173,45 @@ discard block | ||
| 173 | 173 | * @throws MaskNotFoundException | 
| 174 | 174 | */ | 
| 175 | 175 |      protected function setMaskFromConfig($config) { | 
| 176 | -        $default_config  = config("imap.masks"); | |
| 176 | +        $default_config = config("imap.masks"); | |
| 177 | 177 | |
| 178 | -        if(isset($config['masks'])){ | |
| 179 | -            if(isset($config['masks']['message'])) { | |
| 180 | -                if(class_exists($config['masks']['message'])) { | |
| 178 | +        if (isset($config['masks'])) { | |
| 179 | +            if (isset($config['masks']['message'])) { | |
| 180 | +                if (class_exists($config['masks']['message'])) { | |
| 181 | 181 | $this->default_message_mask = $config['masks']['message']; | 
| 182 | -                }else{ | |
| 182 | +                } else { | |
| 183 | 183 |                      throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['message']); | 
| 184 | 184 | } | 
| 185 | -            }else{ | |
| 186 | -                if(class_exists($default_config['message'])) { | |
| 185 | +            } else { | |
| 186 | +                if (class_exists($default_config['message'])) { | |
| 187 | 187 | $this->default_message_mask = $default_config['message']; | 
| 188 | -                }else{ | |
| 188 | +                } else { | |
| 189 | 189 |                      throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); | 
| 190 | 190 | } | 
| 191 | 191 | } | 
| 192 | -            if(isset($config['masks']['attachment'])) { | |
| 193 | -                if(class_exists($config['masks']['attachment'])) { | |
| 192 | +            if (isset($config['masks']['attachment'])) { | |
| 193 | +                if (class_exists($config['masks']['attachment'])) { | |
| 194 | 194 | $this->default_message_mask = $config['masks']['attachment']; | 
| 195 | -                }else{ | |
| 195 | +                } else { | |
| 196 | 196 |                      throw new MaskNotFoundException("Unknown mask provided: ".$config['masks']['attachment']); | 
| 197 | 197 | } | 
| 198 | -            }else{ | |
| 199 | -                if(class_exists($default_config['attachment'])) { | |
| 198 | +            } else { | |
| 199 | +                if (class_exists($default_config['attachment'])) { | |
| 200 | 200 | $this->default_message_mask = $default_config['attachment']; | 
| 201 | -                }else{ | |
| 201 | +                } else { | |
| 202 | 202 |                      throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); | 
| 203 | 203 | } | 
| 204 | 204 | } | 
| 205 | -        }else{ | |
| 206 | -            if(class_exists($default_config['message'])) { | |
| 205 | +        } else { | |
| 206 | +            if (class_exists($default_config['message'])) { | |
| 207 | 207 | $this->default_message_mask = $default_config['message']; | 
| 208 | -            }else{ | |
| 208 | +            } else { | |
| 209 | 209 |                  throw new MaskNotFoundException("Unknown mask provided: ".$default_config['message']); | 
| 210 | 210 | } | 
| 211 | 211 | |
| 212 | -            if(class_exists($default_config['attachment'])) { | |
| 212 | +            if (class_exists($default_config['attachment'])) { | |
| 213 | 213 | $this->default_message_mask = $default_config['attachment']; | 
| 214 | -            }else{ | |
| 214 | +            } else { | |
| 215 | 215 |                  throw new MaskNotFoundException("Unknown mask provided: ".$default_config['attachment']); | 
| 216 | 216 | } | 
| 217 | 217 | } | 
| @@ -358,7 +358,7 @@ discard block | ||
| 358 | 358 | $pattern = $parent_folder.($hierarchical ? '%' : '*'); | 
| 359 | 359 | |
| 360 | 360 | $items = imap_getmailboxes($this->connection, $this->getAddress(), $pattern); | 
| 361 | -        if(is_array($items)){ | |
| 361 | +        if (is_array($items)) { | |
| 362 | 362 |              foreach ($items as $item) { | 
| 363 | 363 | $folder = new Folder($this, $item); | 
| 364 | 364 | |
| @@ -373,7 +373,7 @@ discard block | ||
| 373 | 373 | } | 
| 374 | 374 | |
| 375 | 375 | return $folders; | 
| 376 | -        }else{ | |
| 376 | +        } else { | |
| 377 | 377 | throw new MailboxFetchingException($this->getLastError()); | 
| 378 | 378 | } | 
| 379 | 379 | } | 
| @@ -406,8 +406,8 @@ discard block | ||
| 406 | 406 | */ | 
| 407 | 407 |      public function createFolder($name, $expunge = true) { | 
| 408 | 408 | $this->checkConnection(); | 
| 409 | - $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); | |
| 410 | - if($expunge) $this->expunge(); | |
| 409 | + $status = imap_createmailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); | |
| 410 | + if ($expunge) $this->expunge(); | |
| 411 | 411 | |
| 412 | 412 | return $status; | 
| 413 | 413 | } | 
| @@ -423,8 +423,8 @@ discard block | ||
| 423 | 423 | */ | 
| 424 | 424 |      public function renameFolder($old_name, $new_name, $expunge = true) { | 
| 425 | 425 | $this->checkConnection(); | 
| 426 | - $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name)); | |
| 427 | - if($expunge) $this->expunge(); | |
| 426 | + $status = imap_renamemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($old_name), $this->getAddress().imap_utf7_encode($new_name)); | |
| 427 | + if ($expunge) $this->expunge(); | |
| 428 | 428 | |
| 429 | 429 | return $status; | 
| 430 | 430 | } | 
| @@ -439,8 +439,8 @@ discard block | ||
| 439 | 439 | */ | 
| 440 | 440 |      public function deleteFolder($name, $expunge = true) { | 
| 441 | 441 | $this->checkConnection(); | 
| 442 | - $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name)); | |
| 443 | - if($expunge) $this->expunge(); | |
| 442 | + $status = imap_deletemailbox($this->getConnection(), $this->getAddress().imap_utf7_encode($name)); | |
| 443 | + if ($expunge) $this->expunge(); | |
| 444 | 444 | |
| 445 | 445 | return $status; | 
| 446 | 446 | } | 
| @@ -534,7 +534,7 @@ discard block | ||
| 534 | 534 |          if (!$this->validate_cert) { | 
| 535 | 535 | $address .= '/novalidate-cert'; | 
| 536 | 536 | } | 
| 537 | -        if (in_array($this->encryption,['tls','ssl'])) { | |
| 537 | +        if (in_array($this->encryption, ['tls', 'ssl'])) { | |
| 538 | 538 | $address .= '/'.$this->encryption; | 
| 539 | 539 | } | 
| 540 | 540 | |
| @@ -655,7 +655,7 @@ discard block | ||
| 655 | 655 | * @throws InvalidImapTimeoutTypeException | 
| 656 | 656 | */ | 
| 657 | 657 |      public function setTimeout($type, $timeout) { | 
| 658 | -        if(0 <= $type && $type <= 4) { | |
| 658 | +        if (0 <= $type && $type <= 4) { | |
| 659 | 659 | return imap_timeout($type, $timeout); | 
| 660 | 660 | } | 
| 661 | 661 | |
| @@ -669,8 +669,8 @@ discard block | ||
| 669 | 669 | * @return mixed | 
| 670 | 670 | * @throws InvalidImapTimeoutTypeException | 
| 671 | 671 | */ | 
| 672 | -    public function getTimeout($type){ | |
| 673 | -        if(0 <= $type && $type <= 4) { | |
| 672 | +    public function getTimeout($type) { | |
| 673 | +        if (0 <= $type && $type <= 4) { | |
| 674 | 674 | return imap_timeout($type); | 
| 675 | 675 | } | 
| 676 | 676 | |
| @@ -680,7 +680,7 @@ discard block | ||
| 680 | 680 | /** | 
| 681 | 681 | * @return string | 
| 682 | 682 | */ | 
| 683 | -    public function getDefaultMessageMask(){ | |
| 683 | +    public function getDefaultMessageMask() { | |
| 684 | 684 | return $this->default_message_mask; | 
| 685 | 685 | } | 
| 686 | 686 | |
| @@ -691,7 +691,7 @@ discard block | ||
| 691 | 691 | * @throws MaskNotFoundException | 
| 692 | 692 | */ | 
| 693 | 693 |      public function setDefaultMessageMask($mask) { | 
| 694 | -        if(class_exists($mask)) { | |
| 694 | +        if (class_exists($mask)) { | |
| 695 | 695 | $this->default_message_mask = $mask; | 
| 696 | 696 | |
| 697 | 697 | return $this; | 
| @@ -703,7 +703,7 @@ discard block | ||
| 703 | 703 | /** | 
| 704 | 704 | * @return string | 
| 705 | 705 | */ | 
| 706 | -    public function getDefaultAttachmentMask(){ | |
| 706 | +    public function getDefaultAttachmentMask() { | |
| 707 | 707 | return $this->default_attachment_mask; | 
| 708 | 708 | } | 
| 709 | 709 | |
| @@ -714,7 +714,7 @@ discard block | ||
| 714 | 714 | * @throws MaskNotFoundException | 
| 715 | 715 | */ | 
| 716 | 716 |      public function setDefaultAttachmentMask($mask) { | 
| 717 | -        if(class_exists($mask)) { | |
| 717 | +        if (class_exists($mask)) { | |
| 718 | 718 | $this->default_attachment_mask = $mask; | 
| 719 | 719 | |
| 720 | 720 | return $this; | 
| @@ -118,7 +118,7 @@ discard block | ||
| 118 | 118 | |
| 119 | 119 | $this->setDelimiter($structure->delimiter); | 
| 120 | 120 | $this->path = $structure->name; | 
| 121 | - $this->full_name = $this->decodeName($structure->name); | |
| 121 | + $this->full_name = $this->decodeName($structure->name); | |
| 122 | 122 | $this->name = $this->getSimpleName($this->delimiter, $this->full_name); | 
| 123 | 123 | |
| 124 | 124 | $this->parseAttributes($structure->attributes); | 
| @@ -131,7 +131,7 @@ discard block | ||
| 131 | 131 | * @return WhereQuery | 
| 132 | 132 | * @throws Exceptions\ConnectionFailedException | 
| 133 | 133 | */ | 
| 134 | -    public function query($charset = 'UTF-8'){ | |
| 134 | +    public function query($charset = 'UTF-8') { | |
| 135 | 135 | $this->getClient()->checkConnection(); | 
| 136 | 136 | $this->getClient()->openFolder($this); | 
| 137 | 137 | |
| @@ -142,7 +142,7 @@ discard block | ||
| 142 | 142 | * @inheritdoc self::query($charset = 'UTF-8') | 
| 143 | 143 | * @throws Exceptions\ConnectionFailedException | 
| 144 | 144 | */ | 
| 145 | -    public function search($charset = 'UTF-8'){ | |
| 145 | +    public function search($charset = 'UTF-8') { | |
| 146 | 146 | return $this->query($charset); | 
| 147 | 147 | } | 
| 148 | 148 | |
| @@ -150,7 +150,7 @@ discard block | ||
| 150 | 150 | * @inheritdoc self::query($charset = 'UTF-8') | 
| 151 | 151 | * @throws Exceptions\ConnectionFailedException | 
| 152 | 152 | */ | 
| 153 | -    public function messages($charset = 'UTF-8'){ | |
| 153 | +    public function messages($charset = 'UTF-8') { | |
| 154 | 154 | return $this->query($charset); | 
| 155 | 155 | } | 
| 156 | 156 | |
| @@ -314,7 +314,7 @@ discard block | ||
| 314 | 314 | * @deprecated 1.2.1:2.0.0 No longer needed. Use Folder::query() instead | 
| 315 | 315 | * @see Folder::query() | 
| 316 | 316 | */ | 
| 317 | -    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true,  $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { | |
| 317 | +    public function searchMessages(array $where, $fetch_options = null, $fetch_body = true, $fetch_attachment = true, $fetch_flags = true, $limit = null, $page = 1, $charset = "UTF-8") { | |
| 318 | 318 | $this->getClient()->checkConnection(); | 
| 319 | 319 | |
| 320 | 320 | return $this->query($charset)->where($where)->setFetchOptions($fetch_options)->setFetchBody($fetch_body) | 
| @@ -373,7 +373,7 @@ discard block | ||
| 373 | 373 | */ | 
| 374 | 374 |      public function delete($expunge = true) { | 
| 375 | 375 | $status = imap_deletemailbox($this->client->getConnection(), $this->path); | 
| 376 | - if($expunge) $this->client->expunge(); | |
| 376 | + if ($expunge) $this->client->expunge(); | |
| 377 | 377 | |
| 378 | 378 | return $status; | 
| 379 | 379 | } | 
| @@ -390,7 +390,7 @@ discard block | ||
| 390 | 390 | */ | 
| 391 | 391 |      public function move($target_mailbox, $expunge = true) { | 
| 392 | 392 | $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox); | 
| 393 | - if($expunge) $this->client->expunge(); | |
| 393 | + if ($expunge) $this->client->expunge(); | |
| 394 | 394 | |
| 395 | 395 | return $status; | 
| 396 | 396 | } | 
| @@ -439,8 +439,8 @@ discard block | ||
| 439 | 439 | /** | 
| 440 | 440 | * @param $delimiter | 
| 441 | 441 | */ | 
| 442 | -    public function setDelimiter($delimiter){ | |
| 443 | -        if(in_array($delimiter, [null, '', ' ', false]) === true) { | |
| 442 | +    public function setDelimiter($delimiter) { | |
| 443 | +        if (in_array($delimiter, [null, '', ' ', false]) === true) { | |
| 444 | 444 |              $delimiter = config('imap.options.delimiter', '/'); | 
| 445 | 445 | } | 
| 446 | 446 | |
| @@ -93,7 +93,7 @@ discard block | ||
| 93 | 93 | $this->part_number = ($part_number) ? $part_number : $this->part_number; | 
| 94 | 94 | |
| 95 | 95 | $default_mask = $this->oMessage->getClient()->getDefaultAttachmentMask(); | 
| 96 | -        if($default_mask != null) { | |
| 96 | +        if ($default_mask != null) { | |
| 97 | 97 | $this->mask = $default_mask; | 
| 98 | 98 | } | 
| 99 | 99 | |
| @@ -110,10 +110,10 @@ discard block | ||
| 110 | 110 | * @throws MethodNotFoundException | 
| 111 | 111 | */ | 
| 112 | 112 |      public function __call($method, $arguments) { | 
| 113 | -        if(strtolower(substr($method, 0, 3)) === 'get') { | |
| 113 | +        if (strtolower(substr($method, 0, 3)) === 'get') { | |
| 114 | 114 | $name = snake_case(substr($method, 3)); | 
| 115 | 115 | |
| 116 | -            if(isset($this->attributes[$name])) { | |
| 116 | +            if (isset($this->attributes[$name])) { | |
| 117 | 117 | return $this->attributes[$name]; | 
| 118 | 118 | } | 
| 119 | 119 | |
| @@ -147,7 +147,7 @@ discard block | ||
| 147 | 147 | * @return mixed|null | 
| 148 | 148 | */ | 
| 149 | 149 |      public function __get($name) { | 
| 150 | -        if(isset($this->attributes[$name])) { | |
| 150 | +        if (isset($this->attributes[$name])) { | |
| 151 | 151 | return $this->attributes[$name]; | 
| 152 | 152 | } | 
| 153 | 153 | |
| @@ -255,9 +255,9 @@ discard block | ||
| 255 | 255 | * @param $name | 
| 256 | 256 | */ | 
| 257 | 257 |      public function setName($name) { | 
| 258 | -        if($this->config['decoder']['message']['subject'] === 'utf-8') { | |
| 258 | +        if ($this->config['decoder']['message']['subject'] === 'utf-8') { | |
| 259 | 259 | $this->name = imap_utf8($name); | 
| 260 | -        }else{ | |
| 260 | +        } else { | |
| 261 | 261 | $this->name = mb_decode_mimeheader($name); | 
| 262 | 262 | } | 
| 263 | 263 | } | 
| @@ -277,28 +277,28 @@ discard block | ||
| 277 | 277 | /** | 
| 278 | 278 | * @return string|null | 
| 279 | 279 | */ | 
| 280 | -    public function getMimeType(){ | |
| 280 | +    public function getMimeType() { | |
| 281 | 281 | return (new \finfo())->buffer($this->getContent(), FILEINFO_MIME_TYPE); | 
| 282 | 282 | } | 
| 283 | 283 | |
| 284 | 284 | /** | 
| 285 | 285 | * @return string|null | 
| 286 | 286 | */ | 
| 287 | -    public function getExtension(){ | |
| 287 | +    public function getExtension() { | |
| 288 | 288 | return ExtensionGuesser::getInstance()->guess($this->getMimeType()); | 
| 289 | 289 | } | 
| 290 | 290 | |
| 291 | 291 | /** | 
| 292 | 292 | * @return array | 
| 293 | 293 | */ | 
| 294 | -    public function getAttributes(){ | |
| 294 | +    public function getAttributes() { | |
| 295 | 295 | return $this->attributes; | 
| 296 | 296 | } | 
| 297 | 297 | |
| 298 | 298 | /** | 
| 299 | 299 | * @return Message | 
| 300 | 300 | */ | 
| 301 | -    public function getMessage(){ | |
| 301 | +    public function getMessage() { | |
| 302 | 302 | return $this->oMessage; | 
| 303 | 303 | } | 
| 304 | 304 | |
| @@ -306,8 +306,8 @@ discard block | ||
| 306 | 306 | * @param $mask | 
| 307 | 307 | * @return $this | 
| 308 | 308 | */ | 
| 309 | -    public function setMask($mask){ | |
| 310 | -        if(class_exists($mask)){ | |
| 309 | +    public function setMask($mask) { | |
| 310 | +        if (class_exists($mask)) { | |
| 311 | 311 | $this->mask = $mask; | 
| 312 | 312 | } | 
| 313 | 313 | |
| @@ -317,7 +317,7 @@ discard block | ||
| 317 | 317 | /** | 
| 318 | 318 | * @return string | 
| 319 | 319 | */ | 
| 320 | -    public function getMask(){ | |
| 320 | +    public function getMask() { | |
| 321 | 321 | return $this->mask; | 
| 322 | 322 | } | 
| 323 | 323 | |
| @@ -328,9 +328,9 @@ discard block | ||
| 328 | 328 | * @return mixed | 
| 329 | 329 | * @throws MaskNotFoundException | 
| 330 | 330 | */ | 
| 331 | -    public function mask($mask = null){ | |
| 331 | +    public function mask($mask = null) { | |
| 332 | 332 | $mask = $mask !== null ? $mask : $this->mask; | 
| 333 | -        if(class_exists($mask)){ | |
| 333 | +        if (class_exists($mask)) { | |
| 334 | 334 | return new $mask($this); | 
| 335 | 335 | } | 
| 336 | 336 | |
| @@ -75,13 +75,13 @@ discard block | ||
| 75 | 75 | |
| 76 | 76 | $name = camel_case($name); | 
| 77 | 77 | |
| 78 | -        if(strtolower(substr($name, 0, 3)) === 'not') { | |
| 78 | +        if (strtolower(substr($name, 0, 3)) === 'not') { | |
| 79 | 79 | $that = $that->whereNot(); | 
| 80 | 80 | $name = substr($name, 3); | 
| 81 | 81 | } | 
| 82 | 82 | |
| 83 | 83 | $method = 'where'.ucfirst($name); | 
| 84 | -        if(method_exists($this, $method) === true){ | |
| 84 | +        if (method_exists($this, $method) === true) { | |
| 85 | 85 | return call_user_func_array([$that, $method], $arguments); | 
| 86 | 86 | } | 
| 87 | 87 | |
| @@ -98,7 +98,7 @@ discard block | ||
| 98 | 98 |      protected function validate_criteria($criteria) { | 
| 99 | 99 | $criteria = strtoupper($criteria); | 
| 100 | 100 | |
| 101 | -        if(in_array($criteria, $this->available_criteria) === false) { | |
| 101 | +        if (in_array($criteria, $this->available_criteria) === false) { | |
| 102 | 102 | throw new InvalidWhereQueryCriteriaException(); | 
| 103 | 103 | } | 
| 104 | 104 | |
| @@ -113,21 +113,21 @@ discard block | ||
| 113 | 113 | * @throws InvalidWhereQueryCriteriaException | 
| 114 | 114 | */ | 
| 115 | 115 |      public function where($criteria, $value = null) { | 
| 116 | -        if(is_array($criteria)){ | |
| 117 | -            foreach($criteria as $arguments){ | |
| 118 | -                if(count($arguments) == 1){ | |
| 116 | +        if (is_array($criteria)) { | |
| 117 | +            foreach ($criteria as $arguments) { | |
| 118 | +                if (count($arguments) == 1) { | |
| 119 | 119 | $this->where($arguments[0]); | 
| 120 | -                }elseif(count($arguments) == 2){ | |
| 120 | +                }elseif (count($arguments) == 2) { | |
| 121 | 121 | $this->where($arguments[0], $arguments[1]); | 
| 122 | 122 | } | 
| 123 | 123 | } | 
| 124 | -        }else{ | |
| 124 | +        } else { | |
| 125 | 125 | $criteria = $this->validate_criteria($criteria); | 
| 126 | 126 | $value = $this->parse_value($value); | 
| 127 | 127 | |
| 128 | -            if($value === null || $value === ''){ | |
| 128 | +            if ($value === null || $value === '') { | |
| 129 | 129 | $this->query->push([$criteria]); | 
| 130 | -            }else{ | |
| 130 | +            } else { | |
| 131 | 131 | $this->query->push([$criteria, $value]); | 
| 132 | 132 | } | 
| 133 | 133 | } | 
| @@ -142,7 +142,7 @@ discard block | ||
| 142 | 142 | */ | 
| 143 | 143 |      public function orWhere(\Closure $closure = null) { | 
| 144 | 144 | $this->query->push(['OR']); | 
| 145 | - if($closure !== null) $closure($this); | |
| 145 | + if ($closure !== null) $closure($this); | |
| 146 | 146 | |
| 147 | 147 | return $this; | 
| 148 | 148 | } | 
| @@ -154,7 +154,7 @@ discard block | ||
| 154 | 154 | */ | 
| 155 | 155 |      public function andWhere(\Closure $closure = null) { | 
| 156 | 156 | $this->query->push(['AND']); | 
| 157 | - if($closure !== null) $closure($this); | |
| 157 | + if ($closure !== null) $closure($this); | |
| 158 | 158 | |
| 159 | 159 | return $this; | 
| 160 | 160 | } | 
| @@ -404,7 +404,7 @@ discard block | ||
| 404 | 404 | * @return WhereQuery | 
| 405 | 405 | * @throws InvalidWhereQueryCriteriaException | 
| 406 | 406 | */ | 
| 407 | -    public function whereNoXSpam(){ | |
| 407 | +    public function whereNoXSpam() { | |
| 408 | 408 |          return $this->where("X-Spam-Flag NO"); | 
| 409 | 409 | } | 
| 410 | 410 | |
| @@ -412,7 +412,7 @@ discard block | ||
| 412 | 412 | * @return WhereQuery | 
| 413 | 413 | * @throws InvalidWhereQueryCriteriaException | 
| 414 | 414 | */ | 
| 415 | -    public function whereIsXSpam(){ | |
| 415 | +    public function whereIsXSpam() { | |
| 416 | 416 |          return $this->where("X-Spam-Flag YES"); | 
| 417 | 417 | } | 
| 418 | 418 | |
| @@ -422,7 +422,7 @@ discard block | ||
| 422 | 422 | * @return WhereQuery | 
| 423 | 423 | * @throws InvalidWhereQueryCriteriaException | 
| 424 | 424 | */ | 
| 425 | -    public function whereLanguage($country_code){ | |
| 425 | +    public function whereLanguage($country_code) { | |
| 426 | 426 |          return $this->where("Content-Language $country_code"); | 
| 427 | 427 | } | 
| 428 | 428 | } | 
| 429 | 429 | \ No newline at end of file | 
| @@ -189,7 +189,7 @@ discard block | ||
| 189 | 189 |      public function __construct($uid, $msglist, Client $client, $fetch_options = null, $fetch_body = false, $fetch_attachment = false, $fetch_flags = false) { | 
| 190 | 190 | |
| 191 | 191 | $default_mask = $client->getDefaultMessageMask(); | 
| 192 | -        if($default_mask != null) { | |
| 192 | +        if ($default_mask != null) { | |
| 193 | 193 | $this->mask = $default_mask; | 
| 194 | 194 | } | 
| 195 | 195 | |
| @@ -206,7 +206,7 @@ discard block | ||
| 206 | 206 | $this->msglist = $msglist; | 
| 207 | 207 | $this->client = $client; | 
| 208 | 208 | |
| 209 | - $this->uid = ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid; | |
| 209 | + $this->uid = ($this->fetch_options == IMAP::FT_UID) ? $uid : $uid; | |
| 210 | 210 | $this->msgn = ($this->fetch_options == IMAP::FT_UID) ? imap_msgno($this->client->getConnection(), $uid) : $uid; | 
| 211 | 211 | |
| 212 | 212 | $this->parseHeader(); | 
| @@ -229,17 +229,17 @@ discard block | ||
| 229 | 229 | * @throws MethodNotFoundException | 
| 230 | 230 | */ | 
| 231 | 231 |      public function __call($method, $arguments) { | 
| 232 | -        if(strtolower(substr($method, 0, 3)) === 'get') { | |
| 232 | +        if (strtolower(substr($method, 0, 3)) === 'get') { | |
| 233 | 233 | $name = snake_case(substr($method, 3)); | 
| 234 | 234 | |
| 235 | -            if(isset($this->attributes[$name])) { | |
| 235 | +            if (isset($this->attributes[$name])) { | |
| 236 | 236 | return $this->attributes[$name]; | 
| 237 | 237 | } | 
| 238 | 238 | |
| 239 | 239 |          }elseif (strtolower(substr($method, 0, 3)) === 'set') { | 
| 240 | 240 | $name = snake_case(substr($method, 3)); | 
| 241 | 241 | |
| 242 | -            if(isset($this->attributes[$name])) { | |
| 242 | +            if (isset($this->attributes[$name])) { | |
| 243 | 243 | $this->attributes[$name] = array_pop($arguments); | 
| 244 | 244 | |
| 245 | 245 | return $this->attributes[$name]; | 
| @@ -268,7 +268,7 @@ discard block | ||
| 268 | 268 | * @return mixed|null | 
| 269 | 269 | */ | 
| 270 | 270 |      public function __get($name) { | 
| 271 | -        if(isset($this->attributes[$name])) { | |
| 271 | +        if (isset($this->attributes[$name])) { | |
| 272 | 272 | return $this->attributes[$name]; | 
| 273 | 273 | } | 
| 274 | 274 | |
| @@ -352,11 +352,11 @@ discard block | ||
| 352 | 352 |          if ($replaceImages !== false) { | 
| 353 | 353 |              $this->attachments->each(function($oAttachment) use(&$body, $replaceImages) { | 
| 354 | 354 | /** @var Attachment $oAttachment */ | 
| 355 | -                if(is_callable($replaceImages)) { | |
| 355 | +                if (is_callable($replaceImages)) { | |
| 356 | 356 | $body = $replaceImages($body, $oAttachment); | 
| 357 | -                }elseif(is_string($replaceImages)) { | |
| 357 | +                }elseif (is_string($replaceImages)) { | |
| 358 | 358 | call_user_func($replaceImages, [$body, $oAttachment]); | 
| 359 | -                }else{ | |
| 359 | +                } else { | |
| 360 | 360 |                      if ($oAttachment->id && $oAttachment->getImgSrc() != null) { | 
| 361 | 361 |                          $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body); | 
| 362 | 362 | } | 
| @@ -384,14 +384,14 @@ discard block | ||
| 384 | 384 | } | 
| 385 | 385 | |
| 386 | 386 |          if (property_exists($header, 'subject')) { | 
| 387 | -            if($this->config['decoder']['message']['subject'] === 'utf-8') { | |
| 387 | +            if ($this->config['decoder']['message']['subject'] === 'utf-8') { | |
| 388 | 388 | $this->subject = imap_utf8($header->subject); | 
| 389 | -            }else{ | |
| 389 | +            } else { | |
| 390 | 390 | $this->subject = mb_decode_mimeheader($header->subject); | 
| 391 | 391 | } | 
| 392 | 392 | } | 
| 393 | 393 | |
| 394 | -        foreach(['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part){ | |
| 394 | +        foreach (['from', 'to', 'cc', 'bcc', 'reply_to', 'sender'] as $part) { | |
| 395 | 395 | $this->extractHeaderAddressPart($header, $part); | 
| 396 | 396 | } | 
| 397 | 397 | |
| @@ -421,9 +421,9 @@ discard block | ||
| 421 | 421 | * @return int|null | 
| 422 | 422 | */ | 
| 423 | 423 |      private function extractPriority($header) { | 
| 424 | -        if(preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)){ | |
| 424 | +        if (preg_match('/x\-priority\:.*([0-9]{1,2})/i', $header, $priority)) { | |
| 425 | 425 | $priority = isset($priority[1]) ? (int) $priority[1] : 0; | 
| 426 | -            switch($priority){ | |
| 426 | +            switch ($priority) { | |
| 427 | 427 | case IMAP::MESSAGE_PRIORITY_HIGHEST; | 
| 428 | 428 | $priority = IMAP::MESSAGE_PRIORITY_HIGHEST; | 
| 429 | 429 | break; | 
| @@ -474,7 +474,7 @@ discard block | ||
| 474 | 474 |          if (property_exists($header, 'date')) { | 
| 475 | 475 | $date = $header->date; | 
| 476 | 476 | |
| 477 | -            if(preg_match('/\+0580/', $date)) { | |
| 477 | +            if (preg_match('/\+0580/', $date)) { | |
| 478 | 478 |                  $date = str_replace('+0580', '+0530', $date); | 
| 479 | 479 | } | 
| 480 | 480 | |
| @@ -495,7 +495,7 @@ discard block | ||
| 495 | 495 | $date .= 'C'; | 
| 496 | 496 | break; | 
| 497 | 497 | } | 
| 498 | -                try{ | |
| 498 | +                try { | |
| 499 | 499 | $parsed_date = Carbon::parse($date); | 
| 500 | 500 |                  } catch (\Exception $_e) { | 
| 501 | 501 |                      throw new InvalidMessageDateException("Invalid message date. ID:".$this->getMessageId(), 1000, $e); | 
| @@ -517,7 +517,7 @@ discard block | ||
| 517 | 517 | |
| 518 | 518 | $flags = imap_fetch_overview($this->client->getConnection(), $this->uid, IMAP::FT_UID); | 
| 519 | 519 |          if (is_array($flags) && isset($flags[0])) { | 
| 520 | -            foreach($this->available_flags as $flag) { | |
| 520 | +            foreach ($this->available_flags as $flag) { | |
| 521 | 521 | $this->parseFlag($flags, $flag); | 
| 522 | 522 | } | 
| 523 | 523 | } | 
| @@ -614,12 +614,12 @@ discard block | ||
| 614 | 614 |      public function parseBody() { | 
| 615 | 615 | $this->structure = imap_fetchstructure($this->client->getConnection(), $this->uid, IMAP::FT_UID); | 
| 616 | 616 | |
| 617 | -        if(property_exists($this->structure, 'parts')){ | |
| 617 | +        if (property_exists($this->structure, 'parts')) { | |
| 618 | 618 | $parts = $this->structure->parts; | 
| 619 | 619 | |
| 620 | -            foreach ($parts as $part)  { | |
| 621 | -                foreach ($part->parameters as $parameter)  { | |
| 622 | -                    if($parameter->attribute == "charset")  { | |
| 620 | +            foreach ($parts as $part) { | |
| 621 | +                foreach ($part->parameters as $parameter) { | |
| 622 | +                    if ($parameter->attribute == "charset") { | |
| 623 | 623 | $encoding = $parameter->value; | 
| 624 | 624 | |
| 625 | 625 |                          $encoding = preg_replace('/Content-Transfer-Encoding/', '', $encoding); | 
| @@ -890,7 +890,7 @@ discard block | ||
| 890 | 890 | return EncodingAliases::get($parameter->value); | 
| 891 | 891 | } | 
| 892 | 892 | } | 
| 893 | -        }elseif (is_string($structure) === true){ | |
| 893 | +        }elseif (is_string($structure) === true) { | |
| 894 | 894 | return mb_detect_encoding($structure); | 
| 895 | 895 | } | 
| 896 | 896 | |
| @@ -962,7 +962,7 @@ discard block | ||
| 962 | 962 | */ | 
| 963 | 963 |      public function delete($expunge = true) { | 
| 964 | 964 | $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID); | 
| 965 | - if($expunge) $this->client->expunge(); | |
| 965 | + if ($expunge) $this->client->expunge(); | |
| 966 | 966 | |
| 967 | 967 | return $status; | 
| 968 | 968 | } | 
| @@ -976,7 +976,7 @@ discard block | ||
| 976 | 976 | */ | 
| 977 | 977 |      public function restore($expunge = true) { | 
| 978 | 978 | $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID); | 
| 979 | - if($expunge) $this->client->expunge(); | |
| 979 | + if ($expunge) $this->client->expunge(); | |
| 980 | 980 | |
| 981 | 981 | return $status; | 
| 982 | 982 | } | 
| @@ -1100,7 +1100,7 @@ discard block | ||
| 1100 | 1100 | /** | 
| 1101 | 1101 | * @return object|null | 
| 1102 | 1102 | */ | 
| 1103 | -    public function getStructure(){ | |
| 1103 | +    public function getStructure() { | |
| 1104 | 1104 | return $this->structure; | 
| 1105 | 1105 | } | 
| 1106 | 1106 | |
| @@ -1126,7 +1126,7 @@ discard block | ||
| 1126 | 1126 | /** | 
| 1127 | 1127 | * @return array | 
| 1128 | 1128 | */ | 
| 1129 | -    public function getAttributes(){ | |
| 1129 | +    public function getAttributes() { | |
| 1130 | 1130 | return $this->attributes; | 
| 1131 | 1131 | } | 
| 1132 | 1132 | |
| @@ -1134,8 +1134,8 @@ discard block | ||
| 1134 | 1134 | * @param $mask | 
| 1135 | 1135 | * @return $this | 
| 1136 | 1136 | */ | 
| 1137 | -    public function setMask($mask){ | |
| 1138 | -        if(class_exists($mask)){ | |
| 1137 | +    public function setMask($mask) { | |
| 1138 | +        if (class_exists($mask)) { | |
| 1139 | 1139 | $this->mask = $mask; | 
| 1140 | 1140 | } | 
| 1141 | 1141 | |
| @@ -1145,7 +1145,7 @@ discard block | ||
| 1145 | 1145 | /** | 
| 1146 | 1146 | * @return string | 
| 1147 | 1147 | */ | 
| 1148 | -    public function getMask(){ | |
| 1148 | +    public function getMask() { | |
| 1149 | 1149 | return $this->mask; | 
| 1150 | 1150 | } | 
| 1151 | 1151 | |
| @@ -1156,9 +1156,9 @@ discard block | ||
| 1156 | 1156 | * @return mixed | 
| 1157 | 1157 | * @throws MaskNotFoundException | 
| 1158 | 1158 | */ | 
| 1159 | -    public function mask($mask = null){ | |
| 1159 | +    public function mask($mask = null) { | |
| 1160 | 1160 | $mask = $mask !== null ? $mask : $this->mask; | 
| 1161 | -        if(class_exists($mask)){ | |
| 1161 | +        if (class_exists($mask)) { | |
| 1162 | 1162 | return new $mask($this); | 
| 1163 | 1163 | } | 
| 1164 | 1164 | |
| @@ -16,7 +16,7 @@ | ||
| 16 | 16 | * New custom method which can be called through a mask | 
| 17 | 17 | * @return string | 
| 18 | 18 | */ | 
| 19 | -    public function token(){ | |
| 19 | +    public function token() { | |
| 20 | 20 |          return implode('-', [$this->message_id, $this->uid, $this->message_no]); | 
| 21 | 21 | } | 
| 22 | 22 | |
| @@ -16,7 +16,7 @@ | ||
| 16 | 16 | * New custom method which can be called through a mask | 
| 17 | 17 | * @return string | 
| 18 | 18 | */ | 
| 19 | -    public function token(){ | |
| 19 | +    public function token() { | |
| 20 | 20 |          return implode('-', [$this->id, $this->getMessage()->getUid(), $this->name]); | 
| 21 | 21 | } | 
| 22 | 22 | |
| @@ -20,7 +20,7 @@ | ||
| 20 | 20 | /** @var \Webklex\IMAP\Message $message */ | 
| 21 | 21 | $message = $folder->query()->limit(1)->get()->first(); | 
| 22 | 22 | |
| 23 | -$html = $message->getHTMLBody(function($body, $oAttachment){ | |
| 23 | +$html = $message->getHTMLBody(function($body, $oAttachment) { | |
| 24 | 24 | /** @var \Webklex\IMAP\Attachment $oAttachment */ | 
| 25 | 25 |      if ($oAttachment->id && $oAttachment->getImgSrc() != null) { | 
| 26 | 26 | $oMessage = $oAttachment->getMessage(); |