@@ -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 | } |