@@ -30,8 +30,8 @@ |
||
| 30 | 30 | */ |
| 31 | 31 | public function boot() { |
| 32 | 32 | $this->publishes([ |
| 33 | - __DIR__ . '/../config/imap.php' => config_path('imap.php'), |
|
| 34 | - ]); |
|
| 33 | + __DIR__ . '/../config/imap.php' => config_path('imap.php'), |
|
| 34 | + ]); |
|
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | /** |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | */ |
| 31 | 31 | public function boot() { |
| 32 | 32 | $this->publishes([ |
| 33 | - __DIR__ . '/../config/imap.php' => config_path('imap.php'), |
|
| 33 | + __DIR__.'/../config/imap.php' => config_path('imap.php'), |
|
| 34 | 34 | ]); |
| 35 | 35 | } |
| 36 | 36 | |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | private function setVendorConfig() { |
| 62 | 62 | |
| 63 | 63 | $config_key = 'imap'; |
| 64 | - $path = __DIR__ . '/../config/' . $config_key . '.php'; |
|
| 64 | + $path = __DIR__.'/../config/'.$config_key.'.php'; |
|
| 65 | 65 | |
| 66 | 66 | $vendor_config = require $path; |
| 67 | 67 | $config = $this->app['config']->get($config_key, []); |
@@ -114,11 +114,15 @@ 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)) { |
|
| 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 |
||
| 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 | } |