@@ -139,16 +139,16 @@ |
||
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - /** |
|
| 143 | - * For each key, calls `set()`, which calls `offsetSet()` (from ArrayAccess). |
|
| 144 | - * |
|
| 145 | - * The provided `$data` can be a simple array or an object which implements `Traversable` |
|
| 146 | - * (such as a `ConfigInterface` instance). |
|
| 147 | - * |
|
| 148 | - * @param array|Traversable|ConfigInterface $data The data to set. |
|
| 149 | - * @return AbstractConfig Chainable |
|
| 150 | - * @see self::offsetSet() |
|
| 151 | - */ |
|
| 142 | + /** |
|
| 143 | + * For each key, calls `set()`, which calls `offsetSet()` (from ArrayAccess). |
|
| 144 | + * |
|
| 145 | + * The provided `$data` can be a simple array or an object which implements `Traversable` |
|
| 146 | + * (such as a `ConfigInterface` instance). |
|
| 147 | + * |
|
| 148 | + * @param array|Traversable|ConfigInterface $data The data to set. |
|
| 149 | + * @return AbstractConfig Chainable |
|
| 150 | + * @see self::offsetSet() |
|
| 151 | + */ |
|
| 152 | 152 | public function merge($data) |
| 153 | 153 | { |
| 154 | 154 | foreach ($data as $k => $v) { |