@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | public function __construct($parent) { |
44 | 44 | $this->parent = $parent; |
45 | 45 | |
46 | - if(method_exists($this->parent, 'getAttributes')){ |
|
46 | + if (method_exists($this->parent, 'getAttributes')) { |
|
47 | 47 | $this->attributes = array_merge($this->attributes, $this->parent->getAttributes()); |
48 | 48 | } |
49 | 49 | |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | /** |
54 | 54 | * Boot method made to be used by any custom mask |
55 | 55 | */ |
56 | - protected function boot(){} |
|
56 | + protected function boot() {} |
|
57 | 57 | |
58 | 58 | /** |
59 | 59 | * Call dynamic attribute setter and getter methods and inherit the parent calls |
@@ -64,17 +64,17 @@ discard block |
||
64 | 64 | * @throws MethodNotFoundException |
65 | 65 | */ |
66 | 66 | public function __call($method, $arguments) { |
67 | - if(strtolower(substr($method, 0, 3)) === 'get') { |
|
67 | + if (strtolower(substr($method, 0, 3)) === 'get') { |
|
68 | 68 | $name = Str::snake(substr($method, 3)); |
69 | 69 | |
70 | - if(isset($this->attributes[$name])) { |
|
70 | + if (isset($this->attributes[$name])) { |
|
71 | 71 | return $this->attributes[$name]; |
72 | 72 | } |
73 | 73 | |
74 | 74 | }elseif (strtolower(substr($method, 0, 3)) === 'set') { |
75 | 75 | $name = Str::snake(substr($method, 3)); |
76 | 76 | |
77 | - if(isset($this->attributes[$name])) { |
|
77 | + if (isset($this->attributes[$name])) { |
|
78 | 78 | $this->attributes[$name] = array_pop($arguments); |
79 | 79 | |
80 | 80 | return $this->attributes[$name]; |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | } |
84 | 84 | |
85 | - if(method_exists($this->parent, $method) === true){ |
|
85 | + if (method_exists($this->parent, $method) === true) { |
|
86 | 86 | return call_user_func_array([$this->parent, $method], $arguments); |
87 | 87 | } |
88 | 88 | |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | * @return mixed|null |
110 | 110 | */ |
111 | 111 | public function __get($name) { |
112 | - if(isset($this->attributes[$name])) { |
|
112 | + if (isset($this->attributes[$name])) { |
|
113 | 113 | return $this->attributes[$name]; |
114 | 114 | } |
115 | 115 | |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | * |
122 | 122 | * @return mixed |
123 | 123 | */ |
124 | - public function getParent(){ |
|
124 | + public function getParent() { |
|
125 | 125 | return $this->parent; |
126 | 126 | } |
127 | 127 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * |
131 | 131 | * @return array |
132 | 132 | */ |
133 | - public function getAttributes(){ |
|
133 | + public function getAttributes() { |
|
134 | 134 | return $this->attributes; |
135 | 135 | } |
136 | 136 |
@@ -30,13 +30,13 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @return null |
32 | 32 | */ |
33 | - public function getHtmlBody(){ |
|
33 | + public function getHtmlBody() { |
|
34 | 34 | $bodies = $this->parent->getBodies(); |
35 | 35 | if (!isset($bodies['html'])) { |
36 | 36 | return null; |
37 | 37 | } |
38 | 38 | |
39 | - if(is_object($bodies['html']) && property_exists($bodies['html'], 'content')) { |
|
39 | + if (is_object($bodies['html']) && property_exists($bodies['html'], 'content')) { |
|
40 | 40 | return $bodies['html']->content; |
41 | 41 | } |
42 | 42 | return $bodies['html']; |
@@ -50,15 +50,15 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function getCustomHTMLBody($callback = false) { |
52 | 52 | $body = $this->getHtmlBody(); |
53 | - if($body === null) return null; |
|
53 | + if ($body === null) return null; |
|
54 | 54 | |
55 | 55 | if ($callback !== false) { |
56 | 56 | $aAttachment = $this->parent->getAttachments(); |
57 | 57 | $aAttachment->each(function($oAttachment) use(&$body, $callback) { |
58 | 58 | /** @var Attachment $oAttachment */ |
59 | - if(is_callable($callback)) { |
|
59 | + if (is_callable($callback)) { |
|
60 | 60 | $body = $callback($body, $oAttachment); |
61 | - }elseif(is_string($callback)) { |
|
61 | + }elseif (is_string($callback)) { |
|
62 | 62 | call_user_func($callback, [$body, $oAttachment]); |
63 | 63 | } |
64 | 64 | }); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | * @return string|null |
75 | 75 | */ |
76 | 76 | public function getHTMLBodyWithEmbeddedBase64Images() { |
77 | - return $this->getCustomHTMLBody(function($body, $oAttachment){ |
|
77 | + return $this->getCustomHTMLBody(function($body, $oAttachment) { |
|
78 | 78 | /** @var Attachment $oAttachment */ |
79 | 79 | if ($oAttachment->id) { |
80 | 80 | $body = str_replace('cid:'.$oAttachment->id, 'data:'.$oAttachment->getContentType().';base64, '.base64_encode($oAttachment->getContent()), $body); |
@@ -73,7 +73,7 @@ |
||
73 | 73 | * @return int|null |
74 | 74 | */ |
75 | 75 | public function total($total = null) { |
76 | - if($total === null) { |
|
76 | + if ($total === null) { |
|
77 | 77 | return $this->total; |
78 | 78 | } |
79 | 79 |
@@ -38,11 +38,11 @@ discard block |
||
38 | 38 | * @param object $object |
39 | 39 | */ |
40 | 40 | public function __construct($object) { |
41 | - if (property_exists($object, "personal")){ $this->personal = $object->personal; } |
|
42 | - if (property_exists($object, "mailbox")){ $this->mailbox = $object->mailbox; } |
|
43 | - if (property_exists($object, "host")){ $this->host = $object->host; } |
|
44 | - if (property_exists($object, "mail")){ $this->mail = $object->mail; } |
|
45 | - if (property_exists($object, "full")){ $this->full = $object->full; } |
|
41 | + if (property_exists($object, "personal")) { $this->personal = $object->personal; } |
|
42 | + if (property_exists($object, "mailbox")) { $this->mailbox = $object->mailbox; } |
|
43 | + if (property_exists($object, "host")) { $this->host = $object->host; } |
|
44 | + if (property_exists($object, "mail")) { $this->mail = $object->mail; } |
|
45 | + if (property_exists($object, "full")) { $this->full = $object->full; } |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | |
@@ -60,7 +60,7 @@ discard block |
||
60 | 60 | * |
61 | 61 | * @return array |
62 | 62 | */ |
63 | - public function __serialize(){ |
|
63 | + public function __serialize() { |
|
64 | 64 | return [ |
65 | 65 | "personal" => $this->personal, |
66 | 66 | "mailbox" => $this->mailbox, |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | * |
76 | 76 | * @return array |
77 | 77 | */ |
78 | - public function toArray(){ |
|
78 | + public function toArray() { |
|
79 | 79 | return $this->__serialize(); |
80 | 80 | } |
81 | 81 | |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | * |
85 | 85 | * @return string |
86 | 86 | */ |
87 | - public function toString(){ |
|
87 | + public function toString() { |
|
88 | 88 | return $this->__toString(); |
89 | 89 | } |
90 | 90 | } |
91 | 91 | \ No newline at end of file |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | break; |
127 | 127 | } |
128 | 128 | |
129 | - return (string)$value; |
|
129 | + return (string) $value; |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
@@ -162,7 +162,7 @@ discard block |
||
162 | 162 | if ($statement[1] === null) { |
163 | 163 | $query .= $statement[0]; |
164 | 164 | } else { |
165 | - $query .= $statement[0] . ' "' . $statement[1] . '"'; |
|
165 | + $query .= $statement[0].' "'.$statement[1].'"'; |
|
166 | 166 | } |
167 | 167 | } |
168 | 168 | $query .= ' '; |
@@ -247,18 +247,18 @@ discard block |
||
247 | 247 | * @throws GetMessagesFailedException |
248 | 248 | * @throws ReflectionException |
249 | 249 | */ |
250 | - protected function make($uid, $msglist, $header, $content, $flags){ |
|
250 | + protected function make($uid, $msglist, $header, $content, $flags) { |
|
251 | 251 | try { |
252 | 252 | return Message::make($uid, $msglist, $this->getClient(), $header, $content, $flags, $this->getFetchOptions(), $this->sequence); |
253 | - }catch (MessageNotFoundException $e) { |
|
253 | + } catch (MessageNotFoundException $e) { |
|
254 | 254 | $this->setError($uid, $e); |
255 | - }catch (RuntimeException $e) { |
|
255 | + } catch (RuntimeException $e) { |
|
256 | 256 | $this->setError($uid, $e); |
257 | - }catch (MessageFlagException $e) { |
|
257 | + } catch (MessageFlagException $e) { |
|
258 | 258 | $this->setError($uid, $e); |
259 | - }catch (InvalidMessageDateException $e) { |
|
259 | + } catch (InvalidMessageDateException $e) { |
|
260 | 260 | $this->setError($uid, $e); |
261 | - }catch (MessageContentFetchingException $e) { |
|
261 | + } catch (MessageContentFetchingException $e) { |
|
262 | 262 | $this->setError($uid, $e); |
263 | 263 | } |
264 | 264 | |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | * |
276 | 276 | * @return string |
277 | 277 | */ |
278 | - protected function getMessageKey($message_key, $msglist, $message){ |
|
278 | + protected function getMessageKey($message_key, $msglist, $message) { |
|
279 | 279 | switch ($message_key) { |
280 | 280 | case 'number': |
281 | 281 | $key = $message->getMessageNo(); |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | $key = $message->getMessageId(); |
291 | 291 | break; |
292 | 292 | } |
293 | - return (string)$key; |
|
293 | + return (string) $key; |
|
294 | 294 | } |
295 | 295 | |
296 | 296 | /** |
@@ -782,7 +782,7 @@ discard block |
||
782 | 782 | * |
783 | 783 | * @return boolean |
784 | 784 | */ |
785 | - public function hasErrors($uid = null){ |
|
785 | + public function hasErrors($uid = null) { |
|
786 | 786 | if ($uid !== null) { |
787 | 787 | return $this->hasError($uid); |
788 | 788 | } |
@@ -795,7 +795,7 @@ discard block |
||
795 | 795 | * |
796 | 796 | * @return boolean |
797 | 797 | */ |
798 | - public function hasError($uid){ |
|
798 | + public function hasError($uid) { |
|
799 | 799 | return isset($this->errors[$uid]); |
800 | 800 | } |
801 | 801 | |
@@ -804,7 +804,7 @@ discard block |
||
804 | 804 | * |
805 | 805 | * @return array |
806 | 806 | */ |
807 | - public function errors(){ |
|
807 | + public function errors() { |
|
808 | 808 | return $this->getErrors(); |
809 | 809 | } |
810 | 810 | |
@@ -813,7 +813,7 @@ discard block |
||
813 | 813 | * |
814 | 814 | * @return array |
815 | 815 | */ |
816 | - public function getErrors(){ |
|
816 | + public function getErrors() { |
|
817 | 817 | return $this->errors; |
818 | 818 | } |
819 | 819 | |
@@ -823,7 +823,7 @@ discard block |
||
823 | 823 | * |
824 | 824 | * @return Exception|null |
825 | 825 | */ |
826 | - public function error($uid){ |
|
826 | + public function error($uid) { |
|
827 | 827 | return $this->getError($uid); |
828 | 828 | } |
829 | 829 | |
@@ -833,7 +833,7 @@ discard block |
||
833 | 833 | * |
834 | 834 | * @return Exception|null |
835 | 835 | */ |
836 | - public function getError($uid){ |
|
836 | + public function getError($uid) { |
|
837 | 837 | if ($this->hasError($uid)) { |
838 | 838 | return $this->errors[$uid]; |
839 | 839 | } |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | } |
86 | 86 | |
87 | 87 | if (strpos(strtolower($name), "where") === false) { |
88 | - $method = 'where' . ucfirst($name); |
|
88 | + $method = 'where'.ucfirst($name); |
|
89 | 89 | } else { |
90 | 90 | $method = lcfirst($name); |
91 | 91 | } |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | return call_user_func_array([$that, $method], $arguments); |
95 | 95 | } |
96 | 96 | |
97 | - throw new MethodNotFoundException("Method " . self::class . '::' . $method . '() is not supported'); |
|
97 | + throw new MethodNotFoundException("Method ".self::class.'::'.$method.'() is not supported'); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | foreach ($criteria as $key => $value) { |
139 | 139 | if (is_numeric($key)) { |
140 | 140 | $this->where($value); |
141 | - }else{ |
|
141 | + } else { |
|
142 | 142 | $this->where($key, $value); |
143 | 143 | } |
144 | 144 | } |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | * |
157 | 157 | * @throws InvalidWhereQueryCriteriaException |
158 | 158 | */ |
159 | - protected function push_search_criteria(string $criteria, $value){ |
|
159 | + protected function push_search_criteria(string $criteria, $value) { |
|
160 | 160 | $criteria = $this->validate_criteria($criteria); |
161 | 161 | $value = $this->parse_value($value); |
162 | 162 | |
@@ -540,7 +540,7 @@ discard block |
||
540 | 540 | * @return $this|mixed |
541 | 541 | */ |
542 | 542 | public function unless($value, $callback, $default = null) { |
543 | - if (! $value) { |
|
543 | + if (!$value) { |
|
544 | 544 | return $callback($this, $value) ?: $this; |
545 | 545 | } elseif ($default) { |
546 | 546 | return $default($this, $value) ?: $this; |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @throws MessageContentFetchingException |
78 | 78 | * @throws InvalidMessageDateException |
79 | 79 | */ |
80 | - protected function parse(){ |
|
80 | + protected function parse() { |
|
81 | 81 | $this->findContentType(); |
82 | 82 | $this->parts = $this->find_parts(); |
83 | 83 | } |
@@ -85,12 +85,12 @@ discard block |
||
85 | 85 | /** |
86 | 86 | * Determine the message content type |
87 | 87 | */ |
88 | - public function findContentType(){ |
|
88 | + public function findContentType() { |
|
89 | 89 | $content_type = $this->header->get("content_type"); |
90 | 90 | $content_type = (is_array($content_type)) ? implode(' ', $content_type) : $content_type; |
91 | - if(stripos($content_type, 'multipart') === 0) { |
|
91 | + if (stripos($content_type, 'multipart') === 0) { |
|
92 | 92 | $this->type = IMAP::MESSAGE_TYPE_MULTIPART; |
93 | - }else{ |
|
93 | + } else { |
|
94 | 94 | $this->type = IMAP::MESSAGE_TYPE_TEXT; |
95 | 95 | } |
96 | 96 | } |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | * @return Part[] |
104 | 104 | * @throws InvalidMessageDateException |
105 | 105 | */ |
106 | - private function parsePart($context, $part_number = 0){ |
|
106 | + private function parsePart($context, $part_number = 0) { |
|
107 | 107 | $body = $context; |
108 | 108 | while (($pos = strpos($body, "\r\n")) > 0) { |
109 | 109 | $body = substr($body, $pos + 2); |
@@ -126,10 +126,10 @@ discard block |
||
126 | 126 | * @return array |
127 | 127 | * @throws InvalidMessageDateException |
128 | 128 | */ |
129 | - private function detectParts($boundary, $context, $part_number = 0){ |
|
130 | - $base_parts = explode( $boundary, $context); |
|
129 | + private function detectParts($boundary, $context, $part_number = 0) { |
|
130 | + $base_parts = explode($boundary, $context); |
|
131 | 131 | $final_parts = []; |
132 | - foreach($base_parts as $ctx) { |
|
132 | + foreach ($base_parts as $ctx) { |
|
133 | 133 | $ctx = substr($ctx, 2); |
134 | 134 | if ($ctx !== "--" && $ctx != "") { |
135 | 135 | $parts = $this->parsePart($ctx, $part_number); |
@@ -150,9 +150,9 @@ discard block |
||
150 | 150 | * @throws MessageContentFetchingException |
151 | 151 | * @throws InvalidMessageDateException |
152 | 152 | */ |
153 | - public function find_parts(){ |
|
154 | - if($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
155 | - if (($boundary = $this->header->getBoundary()) === null) { |
|
153 | + public function find_parts() { |
|
154 | + if ($this->type === IMAP::MESSAGE_TYPE_MULTIPART) { |
|
155 | + if (($boundary = $this->header->getBoundary()) === null) { |
|
156 | 156 | throw new MessageContentFetchingException("no content found", 0); |
157 | 157 | } |
158 | 158 | |
@@ -168,7 +168,7 @@ discard block |
||
168 | 168 | * @return string|null |
169 | 169 | * @Depricated since version 2.4.4 |
170 | 170 | */ |
171 | - public function getBoundary(){ |
|
171 | + public function getBoundary() { |
|
172 | 172 | return $this->header->getBoundary(); |
173 | 173 | } |
174 | 174 | } |
@@ -159,10 +159,10 @@ discard block |
||
159 | 159 | * |
160 | 160 | * @throws InvalidMessageDateException |
161 | 161 | */ |
162 | - protected function parse(){ |
|
162 | + protected function parse() { |
|
163 | 163 | if ($this->header === null) { |
164 | 164 | $body = $this->findHeaders(); |
165 | - }else{ |
|
165 | + } else { |
|
166 | 166 | $body = $this->raw; |
167 | 167 | } |
168 | 168 | |
@@ -174,11 +174,11 @@ discard block |
||
174 | 174 | $this->name = $this->header->get("name"); |
175 | 175 | $this->filename = $this->header->get("filename"); |
176 | 176 | |
177 | - if(!empty($this->header->get("id"))) { |
|
177 | + if (!empty($this->header->get("id"))) { |
|
178 | 178 | $this->id = $this->header->get("id"); |
179 | - } else if(!empty($this->header->get("x_attachment_id"))){ |
|
179 | + } else if (!empty($this->header->get("x_attachment_id"))) { |
|
180 | 180 | $this->id = $this->header->get("x_attachment_id"); |
181 | - } else if(!empty($this->header->get("content_id"))){ |
|
181 | + } else if (!empty($this->header->get("content_id"))) { |
|
182 | 182 | $this->id = strtr($this->header->get("content_id"), [ |
183 | 183 | '<' => '', |
184 | 184 | '>' => '' |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | } |
187 | 187 | |
188 | 188 | $content_types = $this->header->get("content_type"); |
189 | - if(!empty($content_types)){ |
|
189 | + if (!empty($content_types)) { |
|
190 | 190 | $this->subtype = $this->parseSubtype($content_types); |
191 | 191 | $content_type = $content_types; |
192 | 192 | if (is_array($content_types)) { |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | * @return string |
208 | 208 | * @throws InvalidMessageDateException |
209 | 209 | */ |
210 | - private function findHeaders(){ |
|
210 | + private function findHeaders() { |
|
211 | 211 | $body = $this->raw; |
212 | 212 | while (($pos = strpos($body, "\r\n")) > 0) { |
213 | 213 | $body = substr($body, $pos + 2); |
@@ -226,16 +226,16 @@ discard block |
||
226 | 226 | * |
227 | 227 | * @return string |
228 | 228 | */ |
229 | - private function parseSubtype($content_type){ |
|
229 | + private function parseSubtype($content_type) { |
|
230 | 230 | if (is_array($content_type)) { |
231 | - foreach ($content_type as $part){ |
|
232 | - if ((strpos($part, "/")) !== false){ |
|
231 | + foreach ($content_type as $part) { |
|
232 | + if ((strpos($part, "/")) !== false) { |
|
233 | 233 | return $this->parseSubtype($part); |
234 | 234 | } |
235 | 235 | } |
236 | 236 | return null; |
237 | 237 | } |
238 | - if (($pos = strpos($content_type, "/")) !== false){ |
|
238 | + if (($pos = strpos($content_type, "/")) !== false) { |
|
239 | 239 | return substr($content_type, $pos + 1); |
240 | 240 | } |
241 | 241 | return null; |
@@ -244,9 +244,9 @@ discard block |
||
244 | 244 | /** |
245 | 245 | * Try to parse the disposition if any is present |
246 | 246 | */ |
247 | - private function parseDisposition(){ |
|
247 | + private function parseDisposition() { |
|
248 | 248 | $content_disposition = $this->header->get("content_disposition"); |
249 | - if($content_disposition !== null) { |
|
249 | + if ($content_disposition !== null) { |
|
250 | 250 | $this->ifdisposition = true; |
251 | 251 | $this->disposition = (is_array($content_disposition)) ? implode(' ', $content_disposition) : $content_disposition; |
252 | 252 | } |
@@ -255,9 +255,9 @@ discard block |
||
255 | 255 | /** |
256 | 256 | * Try to parse the description if any is present |
257 | 257 | */ |
258 | - private function parseDescription(){ |
|
258 | + private function parseDescription() { |
|
259 | 259 | $content_description = $this->header->get("content_description"); |
260 | - if($content_description !== null) { |
|
260 | + if ($content_description !== null) { |
|
261 | 261 | $this->ifdescription = true; |
262 | 262 | $this->description = $content_description; |
263 | 263 | } |
@@ -266,9 +266,9 @@ discard block |
||
266 | 266 | /** |
267 | 267 | * Try to parse the encoding if any is present |
268 | 268 | */ |
269 | - private function parseEncoding(){ |
|
269 | + private function parseEncoding() { |
|
270 | 270 | $encoding = $this->header->get("content_transfer_encoding"); |
271 | - if($encoding !== null) { |
|
271 | + if ($encoding !== null) { |
|
272 | 272 | switch (strtolower($encoding)) { |
273 | 273 | case "quoted-printable": |
274 | 274 | $this->encoding = IMAP::MESSAGE_ENC_QUOTED_PRINTABLE; |
@@ -298,7 +298,7 @@ discard block |
||
298 | 298 | * |
299 | 299 | * @return bool |
300 | 300 | */ |
301 | - public function isAttachment(){ |
|
301 | + public function isAttachment() { |
|
302 | 302 | $valid_disposition = in_array(strtolower($this->disposition), ClientManager::get('options.dispositions')); |
303 | 303 | |
304 | 304 | if ($this->type == IMAP::MESSAGE_TYPE_TEXT && ($this->ifdisposition == 0 || (empty($this->disposition))) && !$valid_disposition) { |
@@ -76,17 +76,17 @@ discard block |
||
76 | 76 | public static function get($key, $default = null) { |
77 | 77 | $parts = explode('.', $key); |
78 | 78 | $value = null; |
79 | - foreach($parts as $part) { |
|
80 | - if($value === null) { |
|
81 | - if(isset(self::$config[$part])) { |
|
79 | + foreach ($parts as $part) { |
|
80 | + if ($value === null) { |
|
81 | + if (isset(self::$config[$part])) { |
|
82 | 82 | $value = self::$config[$part]; |
83 | - }else{ |
|
83 | + } else { |
|
84 | 84 | break; |
85 | 85 | } |
86 | - }else{ |
|
87 | - if(isset($value[$part])) { |
|
86 | + } else { |
|
87 | + if (isset($value[$part])) { |
|
88 | 88 | $value = $value[$part]; |
89 | - }else{ |
|
89 | + } else { |
|
90 | 90 | break; |
91 | 91 | } |
92 | 92 | } |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | */ |
177 | 177 | public function setConfig($config) { |
178 | 178 | |
179 | - if(is_array($config) === false) { |
|
179 | + if (is_array($config) === false) { |
|
180 | 180 | $config = require $config; |
181 | 181 | } |
182 | 182 | |
@@ -186,17 +186,17 @@ discard block |
||
186 | 186 | $vendor_config = require $path; |
187 | 187 | $config = $this->array_merge_recursive_distinct($vendor_config, $config); |
188 | 188 | |
189 | - if(is_array($config)){ |
|
190 | - if(isset($config['default'])){ |
|
191 | - if(isset($config['accounts']) && $config['default'] != false){ |
|
189 | + if (is_array($config)) { |
|
190 | + if (isset($config['default'])) { |
|
191 | + if (isset($config['accounts']) && $config['default'] != false) { |
|
192 | 192 | |
193 | 193 | $default_config = $vendor_config['accounts']['default']; |
194 | - if(isset($config['accounts'][$config['default']])){ |
|
194 | + if (isset($config['accounts'][$config['default']])) { |
|
195 | 195 | $default_config = array_merge($default_config, $config['accounts'][$config['default']]); |
196 | 196 | } |
197 | 197 | |
198 | - if(is_array($config['accounts'])){ |
|
199 | - foreach($config['accounts'] as $account_key => $account){ |
|
198 | + if (is_array($config['accounts'])) { |
|
199 | + foreach ($config['accounts'] as $account_key => $account) { |
|
200 | 200 | $config['accounts'][$account_key] = array_merge($default_config, $account); |
201 | 201 | } |
202 | 202 | } |
@@ -232,23 +232,23 @@ discard block |
||
232 | 232 | $arrays = func_get_args(); |
233 | 233 | $base = array_shift($arrays); |
234 | 234 | |
235 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
235 | + if (!is_array($base)) $base = empty($base) ? array() : array($base); |
|
236 | 236 | |
237 | - foreach($arrays as $append) { |
|
237 | + foreach ($arrays as $append) { |
|
238 | 238 | |
239 | - if(!is_array($append)) $append = array($append); |
|
239 | + if (!is_array($append)) $append = array($append); |
|
240 | 240 | |
241 | - foreach($append as $key => $value) { |
|
241 | + foreach ($append as $key => $value) { |
|
242 | 242 | |
243 | - if(!array_key_exists($key, $base) and !is_numeric($key)) { |
|
243 | + if (!array_key_exists($key, $base) and !is_numeric($key)) { |
|
244 | 244 | $base[$key] = $append[$key]; |
245 | 245 | continue; |
246 | 246 | } |
247 | 247 | |
248 | - if(is_array($value) or is_array($base[$key])) { |
|
248 | + if (is_array($value) or is_array($base[$key])) { |
|
249 | 249 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
250 | - } else if(is_numeric($key)) { |
|
251 | - if(!in_array($value, $base)) $base[] = $value; |
|
250 | + } else if (is_numeric($key)) { |
|
251 | + if (!in_array($value, $base)) $base[] = $value; |
|
252 | 252 | } else { |
253 | 253 | $base[$key] = $value; |
254 | 254 | } |