@@ -220,17 +220,17 @@ |
||
220 | 220 | } |
221 | 221 | } |
222 | 222 | |
223 | - /** |
|
224 | - * For each key, calls `set()`, which calls `offsetSet()` (from ArrayAccess). |
|
225 | - * |
|
226 | - * The provided `$data` can be a simple array or an object which implements `Traversable` |
|
227 | - * (such as a `ConfigInterface` instance). |
|
228 | - * |
|
229 | - * @param array|Traversable $data The data to set. |
|
230 | - * @return AbstractConfig Chainable |
|
231 | - * @see self::set() |
|
232 | - * @see self::offsetSet() |
|
233 | - */ |
|
223 | + /** |
|
224 | + * For each key, calls `set()`, which calls `offsetSet()` (from ArrayAccess). |
|
225 | + * |
|
226 | + * The provided `$data` can be a simple array or an object which implements `Traversable` |
|
227 | + * (such as a `ConfigInterface` instance). |
|
228 | + * |
|
229 | + * @param array|Traversable $data The data to set. |
|
230 | + * @return AbstractConfig Chainable |
|
231 | + * @see self::set() |
|
232 | + * @see self::offsetSet() |
|
233 | + */ |
|
234 | 234 | public function merge($data) |
235 | 235 | { |
236 | 236 | foreach ($data as $k => $v) { |