@@ -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 | } |
@@ -238,20 +238,20 @@ discard block |
||
238 | 238 | return array_keys($arr) !== range(0, count($arr) - 1); |
239 | 239 | }; |
240 | 240 | |
241 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
241 | + if (!is_array($base)) $base = empty($base) ? array() : array($base); |
|
242 | 242 | |
243 | - foreach($arrays as $append) { |
|
243 | + foreach ($arrays as $append) { |
|
244 | 244 | |
245 | - if(!is_array($append)) $append = array($append); |
|
245 | + if (!is_array($append)) $append = array($append); |
|
246 | 246 | |
247 | - foreach($append as $key => $value) { |
|
247 | + foreach ($append as $key => $value) { |
|
248 | 248 | |
249 | - if(!array_key_exists($key, $base) and !is_numeric($key)) { |
|
249 | + if (!array_key_exists($key, $base) and !is_numeric($key)) { |
|
250 | 250 | $base[$key] = $append[$key]; |
251 | 251 | continue; |
252 | 252 | } |
253 | 253 | |
254 | - if( |
|
254 | + if ( |
|
255 | 255 | ( |
256 | 256 | is_array($value) |
257 | 257 | && $isAssoc($value) |
@@ -265,9 +265,9 @@ discard block |
||
265 | 265 | // else merging $baseConfig['dispositions'] = ['attachment', 'inline'] with $customConfig['dispositions'] = ['attachment'] |
266 | 266 | // results in $resultConfig['dispositions'] = ['attachment', 'inline'] |
267 | 267 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
268 | - } else if(is_numeric($key)) { |
|
269 | - if(!in_array($value, $base)) $base[] = $value; |
|
270 | - } else { |
|
268 | + }else if (is_numeric($key)) { |
|
269 | + if (!in_array($value, $base)) $base[] = $value; |
|
270 | + }else { |
|
271 | 271 | $base[$key] = $value; |
272 | 272 | } |
273 | 273 |
@@ -80,13 +80,13 @@ discard block |
||
80 | 80 | if($value === null) { |
81 | 81 | if(isset(self::$config[$part])) { |
82 | 82 | $value = self::$config[$part]; |
83 | - }else{ |
|
83 | + } else{ |
|
84 | 84 | break; |
85 | 85 | } |
86 | - }else{ |
|
86 | + } else{ |
|
87 | 87 | if(isset($value[$part])) { |
88 | 88 | $value = $value[$part]; |
89 | - }else{ |
|
89 | + } else{ |
|
90 | 90 | break; |
91 | 91 | } |
92 | 92 | } |
@@ -234,15 +234,21 @@ discard block |
||
234 | 234 | |
235 | 235 | // From https://stackoverflow.com/a/173479 |
236 | 236 | $isAssoc = function(array $arr) { |
237 | - if (array() === $arr) return false; |
|
237 | + if (array() === $arr) { |
|
238 | + return false; |
|
239 | + } |
|
238 | 240 | return array_keys($arr) !== range(0, count($arr) - 1); |
239 | 241 | }; |
240 | 242 | |
241 | - if(!is_array($base)) $base = empty($base) ? array() : array($base); |
|
243 | + if(!is_array($base)) { |
|
244 | + $base = empty($base) ? array() : array($base); |
|
245 | + } |
|
242 | 246 | |
243 | 247 | foreach($arrays as $append) { |
244 | 248 | |
245 | - if(!is_array($append)) $append = array($append); |
|
249 | + if(!is_array($append)) { |
|
250 | + $append = array($append); |
|
251 | + } |
|
246 | 252 | |
247 | 253 | foreach($append as $key => $value) { |
248 | 254 | |
@@ -266,7 +272,9 @@ discard block |
||
266 | 272 | // results in $resultConfig['dispositions'] = ['attachment', 'inline'] |
267 | 273 | $base[$key] = $this->array_merge_recursive_distinct($base[$key], $append[$key]); |
268 | 274 | } else if(is_numeric($key)) { |
269 | - if(!in_array($value, $base)) $base[] = $value; |
|
275 | + if(!in_array($value, $base)) { |
|
276 | + $base[] = $value; |
|
277 | + } |
|
270 | 278 | } else { |
271 | 279 | $base[$key] = $value; |
272 | 280 | } |