Completed
Pull Request — master (#250)
by Koen
05:10
created
src/IMAP/Query/WhereQuery.php 1 patch
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -77,17 +77,17 @@  discard block
 block discarded – undo
77 77
             foreach($criteria as $arguments){
78 78
                 if(count($arguments) == 1){
79 79
                     $this->where($arguments[0]);
80
-                }elseif(count($arguments) == 2){
80
+                } elseif(count($arguments) == 2){
81 81
                     $this->where($arguments[0], $arguments[1]);
82 82
                 }
83 83
             }
84
-        }else{
84
+        } else{
85 85
             $criteria = $this->validate_criteria($criteria);
86 86
             $value = $this->parse_value($value);
87 87
 
88 88
             if($value === null || $value === ''){
89 89
                 $this->query->push([$criteria]);
90
-            }else{
90
+            } else{
91 91
                 $this->query->push([$criteria, $value]);
92 92
             }
93 93
         }
@@ -102,7 +102,9 @@  discard block
 block discarded – undo
102 102
      */
103 103
     public function orWhere(\Closure $closure = null) {
104 104
         $this->query->push(['OR']);
105
-        if($closure !== null) $closure($this);
105
+        if($closure !== null) {
106
+            $closure($this);
107
+        }
106 108
 
107 109
         return $this;
108 110
     }
@@ -114,7 +116,9 @@  discard block
 block discarded – undo
114 116
      */
115 117
     public function andWhere(\Closure $closure = null) {
116 118
         $this->query->push(['AND']);
117
-        if($closure !== null) $closure($this);
119
+        if($closure !== null) {
120
+            $closure($this);
121
+        }
118 122
 
119 123
         return $this;
120 124
     }
Please login to merge, or discard this patch.
src/IMAP/Providers/LaravelServiceProvider.php 1 patch
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -114,11 +114,15 @@  discard block
 block discarded – undo
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)) {
118
+            $base = empty($base) ? array() : array($base);
119
+        }
118 120
 
119 121
         foreach($arrays as $append) {
120 122
 
121
-            if(!is_array($append)) $append = array($append);
123
+            if(!is_array($append)) {
124
+                $append = array($append);
125
+            }
122 126
 
123 127
             foreach($append as $key => $value) {
124 128
 
@@ -130,7 +134,9 @@  discard block
 block discarded – undo
130 134
                 if(is_array($value) or is_array($base[$key])) {
131 135
                     $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]);
132 136
                 } else if(is_numeric($key)) {
133
-                    if(!in_array($value, $base)) $base[] = $value;
137
+                    if(!in_array($value, $base)) {
138
+                        $base[] = $value;
139
+                    }
134 140
                 } else {
135 141
                     $base[$key] = $value;
136 142
                 }
Please login to merge, or discard this patch.
src/IMAP/Folder.php 1 patch
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -370,7 +370,9 @@  discard block
 block discarded – undo
370 370
      */
371 371
     public function delete($expunge = true) {
372 372
         $status = imap_deletemailbox($this->client->getConnection(), $this->path);
373
-        if($expunge) $this->client->expunge();
373
+        if($expunge) {
374
+            $this->client->expunge();
375
+        }
374 376
 
375 377
         return $status;
376 378
     }
@@ -387,7 +389,9 @@  discard block
 block discarded – undo
387 389
      */
388 390
     public function move($target_mailbox, $expunge = true) {
389 391
         $status = imap_renamemailbox($this->client->getConnection(), $this->path, $target_mailbox);
390
-        if($expunge) $this->client->expunge();
392
+        if($expunge) {
393
+            $this->client->expunge();
394
+        }
391 395
 
392 396
         return $status;
393 397
     }
Please login to merge, or discard this patch.
src/IMAP/Support/Masks/MessageMask.php 1 patch
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -45,7 +45,9 @@  discard block
 block discarded – undo
45 45
      */
46 46
     public function getCustomHTMLBody($callback = false) {
47 47
         $body = $this->getHtmlBody();
48
-        if($body === null) return null;
48
+        if($body === null) {
49
+            return null;
50
+        }
49 51
 
50 52
         if ($callback !== false) {
51 53
             $aAttachment = $this->parent->getAttachments();
@@ -53,7 +55,7 @@  discard block
 block discarded – undo
53 55
                 /** @var Attachment $oAttachment */
54 56
                 if(is_callable($callback)) {
55 57
                     $body = $callback($body, $oAttachment);
56
-                }elseif(is_string($callback)) {
58
+                } elseif(is_string($callback)) {
57 59
                     call_user_func($callback, [$body, $oAttachment]);
58 60
                 }
59 61
             });
Please login to merge, or discard this patch.
src/IMAP/Client.php 1 patch
Braces   +19 added lines, -13 removed lines patch added patch discarded remove patch
@@ -179,39 +179,39 @@  discard block
 block discarded – undo
179 179
             if(isset($config['masks']['message'])) {
180 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{
185
+            } else{
186 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 192
             if(isset($config['masks']['attachment'])) {
193 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{
198
+            } else{
199 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{
205
+        } else{
206 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 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
         }
@@ -373,7 +373,7 @@  discard block
 block discarded – undo
373 373
             }
374 374
 
375 375
             return $folders;
376
-        }else{
376
+        } else{
377 377
             throw new MailboxFetchingException($this->getLastError());
378 378
         }
379 379
     }
@@ -407,7 +407,9 @@  discard block
 block discarded – undo
407 407
     public function createFolder($name, $expunge = true) {
408 408
         $this->checkConnection();
409 409
         $status = imap_createmailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
410
-        if($expunge) $this->expunge();
410
+        if($expunge) {
411
+            $this->expunge();
412
+        }
411 413
 
412 414
         return $status;
413 415
     }
@@ -424,7 +426,9 @@  discard block
 block discarded – undo
424 426
     public function renameFolder($old_name, $new_name, $expunge = true) {
425 427
         $this->checkConnection();
426 428
         $status = imap_renamemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($old_name), $this->getAddress() . imap_utf7_encode($new_name));
427
-        if($expunge) $this->expunge();
429
+        if($expunge) {
430
+            $this->expunge();
431
+        }
428 432
 
429 433
         return $status;
430 434
     }
@@ -440,7 +444,9 @@  discard block
 block discarded – undo
440 444
     public function deleteFolder($name, $expunge = true) {
441 445
         $this->checkConnection();
442 446
         $status = imap_deletemailbox($this->getConnection(), $this->getAddress() . imap_utf7_encode($name));
443
-        if($expunge) $this->expunge();
447
+        if($expunge) {
448
+            $this->expunge();
449
+        }
444 450
 
445 451
         return $status;
446 452
     }
Please login to merge, or discard this patch.
src/IMAP/Query/Query.php 1 patch
Braces   +11 added lines, -5 removed lines patch added patch discarded remove patch
@@ -68,7 +68,9 @@  discard block
 block discarded – undo
68 68
     public function __construct(Client $client, $charset = 'UTF-8') {
69 69
         $this->setClient($client);
70 70
 
71
-        if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread();
71
+        if(config('imap.options.fetch') === IMAP::FT_PEEK) {
72
+            $this->leaveUnread();
73
+        }
72 74
 
73 75
         $this->date_format = config('imap.date_format', 'd M y');
74 76
 
@@ -106,7 +108,9 @@  discard block
 block discarded – undo
106 108
      * @throws MessageSearchValidationException
107 109
      */
108 110
     protected function parse_date($date) {
109
-        if($date instanceof \Carbon\Carbon) return $date;
111
+        if($date instanceof \Carbon\Carbon) {
112
+            return $date;
113
+        }
110 114
 
111 115
         try {
112 116
             $date = Carbon::parse($date);
@@ -154,7 +158,7 @@  discard block
 block discarded – undo
154 158
          */
155 159
         if($this->getCharset() === null){
156 160
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID);
157
-        }else{
161
+        } else{
158 162
             $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset());
159 163
         }
160 164
 
@@ -243,7 +247,7 @@  discard block
 block discarded – undo
243 247
             } else {
244 248
                 if($statement[1] === null){
245 249
                     $query .= $statement[0];
246
-                }else{
250
+                } else{
247 251
                     $query .= $statement[0].' "'.$statement[1].'"';
248 252
                 }
249 253
             }
@@ -273,7 +277,9 @@  discard block
 block discarded – undo
273 277
      * @return $this
274 278
      */
275 279
     public function limit($limit, $page = 1) {
276
-        if($page >= 1) $this->page = $page;
280
+        if($page >= 1) {
281
+            $this->page = $page;
282
+        }
277 283
         $this->limit = $limit;
278 284
 
279 285
         return $this;
Please login to merge, or discard this patch.
src/IMAP/Attachment.php 1 patch
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
             }
120 120
 
121 121
             return null;
122
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
122
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
123 123
             $name = Str::snake(substr($method, 3));
124 124
 
125 125
             $this->attributes[$name] = array_pop($arguments);
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
     public function setName($name) {
259 259
         if($this->config['decoder']['message']['subject'] === 'utf-8') {
260 260
             $this->name = imap_utf8($name);
261
-        }else{
261
+        } else{
262 262
             $this->name = mb_decode_mimeheader($name);
263 263
         }
264 264
     }
Please login to merge, or discard this patch.
src/IMAP/Support/Masks/Mask.php 1 patch
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
                 return $this->attributes[$name];
68 68
             }
69 69
 
70
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
70
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
71 71
             $name = Str::snake(substr($method, 3));
72 72
 
73 73
             if(isset($this->attributes[$name])) {
Please login to merge, or discard this patch.
src/IMAP/Message.php 1 patch
Braces   +17 added lines, -9 removed lines patch added patch discarded remove patch
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
246 246
                 return $this->attributes[$name];
247 247
             }
248 248
 
249
-        }elseif (strtolower(substr($method, 0, 3)) === 'set') {
249
+        } elseif (strtolower(substr($method, 0, 3)) === 'set') {
250 250
             $name = Str::snake(substr($method, 3));
251 251
 
252 252
             if(in_array($name, array_keys($this->attributes))) {
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
                 /** @var Attachment $oAttachment */
367 367
                 if(is_callable($replaceImages)) {
368 368
                     $body = $replaceImages($body, $oAttachment);
369
-                }elseif(is_string($replaceImages)) {
369
+                } elseif(is_string($replaceImages)) {
370 370
                     call_user_func($replaceImages, [$body, $oAttachment]);
371
-                }else{
371
+                } else{
372 372
                     if ($oAttachment->id && $oAttachment->getImgSrc() != null) {
373 373
                         $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body);
374 374
                     }
@@ -399,7 +399,7 @@  discard block
 block discarded – undo
399 399
         if (property_exists($header, 'subject')) {
400 400
             if($this->config['decoder']['message']['subject'] === 'utf-8') {
401 401
                 $this->subject = imap_utf8($header->subject);
402
-            }else{
402
+            } else{
403 403
                 $this->subject = mb_decode_mimeheader($header->subject);
404 404
             }
405 405
         }
@@ -915,7 +915,7 @@  discard block
 block discarded – undo
915 915
                     return EncodingAliases::get($parameter->value);
916 916
                 }
917 917
             }
918
-        }elseif (is_string($structure) === true){
918
+        } elseif (is_string($structure) === true){
919 919
             return mb_detect_encoding($structure);
920 920
         }
921 921
 
@@ -981,7 +981,9 @@  discard block
 block discarded – undo
981 981
      */
982 982
     public function moveToFolder($mailbox = 'INBOX', $expunge = false, $create_folder = true) {
983 983
 
984
-        if($create_folder) $this->client->createFolder($mailbox, true);
984
+        if($create_folder) {
985
+            $this->client->createFolder($mailbox, true);
986
+        }
985 987
 
986 988
         $target_folder = $this->client->getFolder($mailbox);
987 989
         $target_status = $target_folder->getStatus(IMAP::SA_ALL);
@@ -990,7 +992,9 @@  discard block
 block discarded – undo
990 992
         $status = imap_mail_move($this->client->getConnection(), $this->uid, $mailbox, IMAP::CP_UID);
991 993
 
992 994
         if($status === true){
993
-            if($expunge) $this->client->expunge();
995
+            if($expunge) {
996
+                $this->client->expunge();
997
+            }
994 998
             $this->client->openFolder($target_folder->path);
995 999
 
996 1000
             return $target_folder->getMessage($target_status->uidnext, null, $this->fetch_options, $this->fetch_body, $this->fetch_attachment, $this->fetch_flags);
@@ -1010,7 +1014,9 @@  discard block
 block discarded – undo
1010 1014
         $this->client->openFolder($this->folder_path);
1011 1015
 
1012 1016
         $status = imap_delete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
1013
-        if($expunge) $this->client->expunge();
1017
+        if($expunge) {
1018
+            $this->client->expunge();
1019
+        }
1014 1020
 
1015 1021
         return $status;
1016 1022
     }
@@ -1026,7 +1032,9 @@  discard block
 block discarded – undo
1026 1032
         $this->client->openFolder($this->folder_path);
1027 1033
 
1028 1034
         $status = imap_undelete($this->client->getConnection(), $this->uid, IMAP::FT_UID);
1029
-        if($expunge) $this->client->expunge();
1035
+        if($expunge) {
1036
+            $this->client->expunge();
1037
+        }
1030 1038
 
1031 1039
         return $status;
1032 1040
     }
Please login to merge, or discard this patch.