updated core and modules

vendor/wikimedia/composer-merge-plugin/README.md

@@ -24,6 +24,8 @@ extensions which may be managed via Composer.
 Installation
 ------------
 
+Composer Merge Plugin requires [Composer 1.0.0](https://getcomposer.org/) or newer.
+
 ```
 $ composer require wikimedia/composer-merge-plugin
 ```
@@ -32,7 +34,7 @@ $ composer require wikimedia/composer-merge-plugin
 Usage
 -----
 
-```
+```json
 {
     "require": {
         "wikimedia/composer-merge-plugin": "dev-master"
@@ -49,7 +51,9 @@ Usage
             "recurse": true,
             "replace": false,
             "merge-dev": true,
-            "merge-extra": false
+            "merge-extra": false,
+            "merge-extra-deep": false,
+            "merge-scripts": false
         }
     }
 }
@@ -88,11 +92,13 @@ in the top-level composer.json file:
 * [suggest](https://getcomposer.org/doc/04-schema.md#suggest)
 * [extra](https://getcomposer.org/doc/04-schema.md#extra)
   (optional, see [merge-extra](#merge-extra) below)
+* [scripts](https://getcomposer.org/doc/04-schema.md#scripts)
+  (optional, see [merge-scripts](#merge-scripts) below)
 
 
 ### require
 
-The `require` setting is identical to `[include](#include)` except when
+The `require` setting is identical to [`include`](#include) except when
 a pattern fails to match at least one file then it will cause an error.
 
 ### recurse
@@ -127,13 +133,30 @@ section is to accept the first version of any key found (e.g. a key in the
 master config wins over the version found in any imported config). If
 `replace` mode is active ([see above](#replace)) then this behavior changes
 and the last key found will win (e.g. the key in the master config is replaced
-by the key in the imported config). The usefulness of merging the extra
-section will vary depending on the Composer plugins being used and the order
-in which they are processed by Composer.
+by the key in the imported config). If `"merge-extra-deep": true` is specified
+then, the sections are merged similar to array_merge_recursive() - however
+duplicate string array keys are replaced instead of merged, while numeric
+array keys are merged as usual. The usefulness of merging the extra section
+will vary depending on the Composer plugins being used and the order in which
+they are processed by Composer.
 
 Note that `merge-plugin` sections are excluded from the merge process, but are
 always processed by the plugin unless [recursion](#recurse) is disabled.
 
+### merge-scripts
+
+A `"merge-scripts": true` setting enables merging the contents of the
+`scripts` section of included files as well. The normal merge mode for the
+scripts section is to accept the first version of any key found (e.g. a key in
+the master config wins over the version found in any imported config). If
+`replace` mode is active ([see above](#replace)) then this behavior changes
+and the last key found will win (e.g. the key in the master config is replaced
+by the key in the imported config).
+
+Note: [custom commands][] added by merged configuration will work when invoked
+as `composer run-script my-cool-command` but will not be available using the
+normal `composer my-cool-command` shortcut.
+
 
 Running tests
 -------------
@@ -167,7 +190,7 @@ GitHub as well.
 License
 -------
 
-Composer Merge plugin is licensed under the MIT license. See the `LICENSE`
+Composer Merge plugin is licensed under the MIT license. See the [`LICENSE`](LICENSE)
 file for more details.
 
 
@@ -181,3 +204,4 @@ file for more details.
 [License]: https://img.shields.io/packagist/l/wikimedia/composer-merge-plugin.svg?style=flat
 [Build Status]: https://img.shields.io/travis/wikimedia/composer-merge-plugin.svg?style=flat
 [Code Coverage]: https://img.shields.io/scrutinizer/coverage/g/wikimedia/composer-merge-plugin/master.svg?style=flat
+[custom commands]: https://getcomposer.org/doc/articles/scripts.md#writing-custom-commands