@@ -54,13 +54,13 @@ |
||
| 54 | 54 | |
| 55 | 55 | public function merge($bindings, $replace = true) |
| 56 | 56 | { |
| 57 | - foreach($bindings as $key => $binding) { |
|
| 58 | - if(isset($this->bindings[$key]) && !$replace) { |
|
| 57 | + foreach ($bindings as $key => $binding) { |
|
| 58 | + if (isset($this->bindings[$key]) && !$replace) { |
|
| 59 | 59 | continue; |
| 60 | 60 | } |
| 61 | - if(is_array($binding)) { |
|
| 61 | + if (is_array($binding)) { |
|
| 62 | 62 | $this->bindings[$key] = ['binding' => $binding[0]]; |
| 63 | - if(isset($binding['singleton'])) { |
|
| 63 | + if (isset($binding['singleton'])) { |
|
| 64 | 64 | $this->bindings[$key]['singleton'] = $binding['singleton']; |
| 65 | 65 | } |
| 66 | 66 | } else { |