@@ -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 | } |
@@ -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 |
@@ -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(); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | * Get the message html body |
30 | 30 | * @return null |
31 | 31 | */ |
32 | - public function getHtmlBody(){ |
|
32 | + public function getHtmlBody() { |
|
33 | 33 | $bodies = $this->parent->getBodies(); |
34 | 34 | if (!isset($bodies['html'])) { |
35 | 35 | return null; |
@@ -46,15 +46,15 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function getCustomHTMLBody($callback = false) { |
48 | 48 | $body = $this->getHtmlBody(); |
49 | - if($body === null) return null; |
|
49 | + if ($body === null) return null; |
|
50 | 50 | |
51 | 51 | if ($callback !== false) { |
52 | 52 | $aAttachment = $this->parent->getAttachments(); |
53 | 53 | $aAttachment->each(function($oAttachment) use(&$body, $callback) { |
54 | 54 | /** @var Attachment $oAttachment */ |
55 | - if(is_callable($callback)) { |
|
55 | + if (is_callable($callback)) { |
|
56 | 56 | $body = $callback($body, $oAttachment); |
57 | - }elseif(is_string($callback)) { |
|
57 | + }elseif (is_string($callback)) { |
|
58 | 58 | call_user_func($callback, [$body, $oAttachment]); |
59 | 59 | } |
60 | 60 | }); |
@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | * @return string|null |
71 | 71 | */ |
72 | 72 | public function getHTMLBodyWithEmbeddedBase64Images() { |
73 | - return $this->getCustomHTMLBody(function($body, $oAttachment){ |
|
73 | + return $this->getCustomHTMLBody(function($body, $oAttachment) { |
|
74 | 74 | /** @var \Webklex\IMAP\Attachment $oAttachment */ |
75 | 75 | if ($oAttachment->id && $oAttachment->getImgSrc() != null) { |
76 | 76 | $body = str_replace('cid:'.$oAttachment->id, $oAttachment->getImgSrc(), $body); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function __construct(Client $client, $charset = 'UTF-8') { |
66 | 66 | $this->setClient($client); |
67 | 67 | |
68 | - if(config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
68 | + if (config('imap.options.fetch') === IMAP::FT_PEEK) $this->leaveUnread(); |
|
69 | 69 | |
70 | 70 | $this->charset = $charset; |
71 | 71 | $this->query = collect(); |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | /** |
76 | 76 | * Instance boot method for additional functionality |
77 | 77 | */ |
78 | - protected function boot(){} |
|
78 | + protected function boot() {} |
|
79 | 79 | |
80 | 80 | /** |
81 | 81 | * Parse a given value |
@@ -83,8 +83,8 @@ discard block |
||
83 | 83 | * |
84 | 84 | * @return string |
85 | 85 | */ |
86 | - protected function parse_value($value){ |
|
87 | - switch(true){ |
|
86 | + protected function parse_value($value) { |
|
87 | + switch (true) { |
|
88 | 88 | case $value instanceof \Carbon\Carbon: |
89 | 89 | $value = $value->format('d M y'); |
90 | 90 | break; |
@@ -101,7 +101,7 @@ discard block |
||
101 | 101 | * @throws MessageSearchValidationException |
102 | 102 | */ |
103 | 103 | protected function parse_date($date) { |
104 | - if($date instanceof \Carbon\Carbon) return $date; |
|
104 | + if ($date instanceof \Carbon\Carbon) return $date; |
|
105 | 105 | |
106 | 106 | try { |
107 | 107 | $date = Carbon::parse($date); |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | * Don't set the charset if it isn't used - prevent strange outlook mail server errors |
151 | 151 | * @see https://github.com/Webklex/laravel-imap/issues/100 |
152 | 152 | */ |
153 | - if($this->getCharset() === null){ |
|
153 | + if ($this->getCharset() === null) { |
|
154 | 154 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID); |
155 | - }else{ |
|
155 | + } else { |
|
156 | 156 | $available_messages = imap_search($this->getClient()->getConnection(), $this->getRawQuery(), IMAP::SE_UID, $this->getCharset()); |
157 | 157 | } |
158 | 158 | |
@@ -161,15 +161,15 @@ discard block |
||
161 | 161 | $available_messages = collect($available_messages); |
162 | 162 | $options = config('imap.options'); |
163 | 163 | |
164 | - if(strtolower($options['fetch_order']) === 'desc'){ |
|
164 | + if (strtolower($options['fetch_order']) === 'desc') { |
|
165 | 165 | $available_messages = $available_messages->reverse(); |
166 | 166 | } |
167 | 167 | |
168 | - $query =& $this; |
|
168 | + $query = & $this; |
|
169 | 169 | |
170 | 170 | $available_messages->forPage($this->page, $this->limit)->each(function($msgno, $msglist) use(&$messages, $options, $query) { |
171 | 171 | $oMessage = new Message($msgno, $msglist, $query->getClient(), $query->getFetchOptions(), $query->getFetchBody(), $query->getFetchAttachment(), $query->getFetchFlags()); |
172 | - switch ($options['message_key']){ |
|
172 | + switch ($options['message_key']) { |
|
173 | 173 | case 'number': |
174 | 174 | $message_key = $oMessage->getMessageNo(); |
175 | 175 | break; |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | * @return \Illuminate\Pagination\LengthAwarePaginator |
201 | 201 | * @throws GetMessagesFailedException |
202 | 202 | */ |
203 | - public function paginate($per_page = 5, $page = null, $page_name = 'imap_page'){ |
|
203 | + public function paginate($per_page = 5, $page = null, $page_name = 'imap_page') { |
|
204 | 204 | $this->page = $page > $this->page ? $page : $this->page; |
205 | 205 | $this->limit = $per_page; |
206 | 206 | |
@@ -218,9 +218,9 @@ discard block |
||
218 | 218 | if (count($statement) == 1) { |
219 | 219 | $query .= $statement[0]; |
220 | 220 | } else { |
221 | - if($statement[1] === null){ |
|
221 | + if ($statement[1] === null) { |
|
222 | 222 | $query .= $statement[0]; |
223 | - }else{ |
|
223 | + } else { |
|
224 | 224 | $query .= $statement[0].' "'.$statement[1].'"'; |
225 | 225 | } |
226 | 226 | } |
@@ -250,7 +250,7 @@ discard block |
||
250 | 250 | * @return $this |
251 | 251 | */ |
252 | 252 | public function limit($limit, $page = 1) { |
253 | - if($page >= 1) $this->page = $page; |
|
253 | + if ($page >= 1) $this->page = $page; |
|
254 | 254 | $this->limit = $limit; |
255 | 255 | |
256 | 256 | return $this; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | public function __construct($parent) { |
39 | 39 | $this->parent = $parent; |
40 | 40 | |
41 | - if(method_exists($this->parent, 'getAttributes')){ |
|
41 | + if (method_exists($this->parent, 'getAttributes')) { |
|
42 | 42 | $this->attributes = array_merge($this->attributes, $this->parent->getAttributes()); |
43 | 43 | } |
44 | 44 | |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | /** |
49 | 49 | * Boot method made to be used by any custom mask |
50 | 50 | */ |
51 | - protected function boot(){} |
|
51 | + protected function boot() {} |
|
52 | 52 | |
53 | 53 | /** |
54 | 54 | * Call dynamic attribute setter and getter methods and inherit the parent calls |
@@ -59,17 +59,17 @@ discard block |
||
59 | 59 | * @throws MethodNotFoundException |
60 | 60 | */ |
61 | 61 | public function __call($method, $arguments) { |
62 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
62 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
63 | 63 | $name = snake_case(substr($method, 3)); |
64 | 64 | |
65 | - if(isset($this->attributes[$name])) { |
|
65 | + if (isset($this->attributes[$name])) { |
|
66 | 66 | return $this->attributes[$name]; |
67 | 67 | } |
68 | 68 | |
69 | 69 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
70 | 70 | $name = snake_case(substr($method, 3)); |
71 | 71 | |
72 | - if(isset($this->attributes[$name])) { |
|
72 | + if (isset($this->attributes[$name])) { |
|
73 | 73 | $this->attributes[$name] = array_pop($arguments); |
74 | 74 | |
75 | 75 | return $this->attributes[$name]; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | |
78 | 78 | } |
79 | 79 | |
80 | - if(method_exists($this->parent, $method) === true){ |
|
80 | + if (method_exists($this->parent, $method) === true) { |
|
81 | 81 | return call_user_func_array([$this->parent, $method], $arguments); |
82 | 82 | } |
83 | 83 | |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | * @return mixed|null |
103 | 103 | */ |
104 | 104 | public function __get($name) { |
105 | - if(isset($this->attributes[$name])) { |
|
105 | + if (isset($this->attributes[$name])) { |
|
106 | 106 | return $this->attributes[$name]; |
107 | 107 | } |
108 | 108 | |
@@ -112,14 +112,14 @@ discard block |
||
112 | 112 | /** |
113 | 113 | * @return mixed |
114 | 114 | */ |
115 | - public function getParent(){ |
|
115 | + public function getParent() { |
|
116 | 116 | return $this->parent; |
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
120 | 120 | * @return array |
121 | 121 | */ |
122 | - public function getAttributes(){ |
|
122 | + public function getAttributes() { |
|
123 | 123 | return $this->attributes; |
124 | 124 | } |
125 | 125 |