Update to Drupal 8.0-dev-2015-11-17. Commits through da81cd220, Tue Nov 17 15:53:49 2015 +0000, Issue #2617224 by Wim Leers: Move around/fix some documentation.
This commit is contained in:
parent
4afb23bbd3
commit
7784f4c23d
929 changed files with 19798 additions and 5304 deletions
126
vendor/wikimedia/composer-merge-plugin/README.md
vendored
126
vendor/wikimedia/composer-merge-plugin/README.md
vendored
|
@ -1,26 +1,29 @@
|
|||
[](https://packagist.org/packages/wikimedia/composer-merge-plugin) [](https://github.com/wikimedia/composer-merge-plugin/blob/master/LICENSE)
|
||||
[](https://travis-ci.org/wikimedia/composer-merge-plugin)
|
||||
[](https://scrutinizer-ci.com/g/wikimedia/composer-merge-plugin/?branch=master)
|
||||
[![Latest Stable Version]](https://packagist.org/packages/wikimedia/composer-merge-plugin) [![License]](https://github.com/wikimedia/composer-merge-plugin/blob/master/LICENSE)
|
||||
[![Build Status]](https://travis-ci.org/wikimedia/composer-merge-plugin)
|
||||
[![Code Coverage]](https://scrutinizer-ci.com/g/wikimedia/composer-merge-plugin/?branch=master)
|
||||
|
||||
Composer Merge Plugin
|
||||
=====================
|
||||
|
||||
Merge one or more additional composer.json files at [Composer] runtime.
|
||||
Merge multiple composer.json files at [Composer] runtime.
|
||||
|
||||
Composer Merge Plugin is intended to allow easier dependency management for
|
||||
applications which ship a composer.json file and expect some deployments to
|
||||
install additional Composer managed libraries. It does this by allowing the
|
||||
application's top level `composer.json` file to provide a list of optional
|
||||
additional configuration files. When Composer is run it will parse these files
|
||||
and merge their configuration into the base configuration. This combined
|
||||
configuration will allow downloading additional libraries and generating the
|
||||
autoloader. It was specifically created to help with installation of
|
||||
[MediaWiki] which has core Composer managed library requirements and optional
|
||||
libraries and extensions which may also be managed via Composer.
|
||||
and merge their configuration settings into the base configuration. This
|
||||
combined configuration will then be used when downloading additional libraries
|
||||
and generating the autoloader.
|
||||
|
||||
Composer Merge Plugin was created to help with installation of [MediaWiki]
|
||||
which has core library requirements as well as optional libraries and
|
||||
extensions which may be managed via Composer.
|
||||
|
||||
|
||||
Installation
|
||||
------------
|
||||
|
||||
```
|
||||
$ composer require wikimedia/composer-merge-plugin
|
||||
```
|
||||
|
@ -40,58 +43,101 @@ Usage
|
|||
"composer.local.json",
|
||||
"extensions/*/composer.json"
|
||||
],
|
||||
"recurse": false,
|
||||
"require": [
|
||||
"submodule/composer.json"
|
||||
],
|
||||
"recurse": true,
|
||||
"replace": false,
|
||||
"merge-dev": true,
|
||||
"merge-extra": false
|
||||
}
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
The `include` key can specify either a single value or an array of values.
|
||||
Each value is treated as a `glob()` pattern identifying additional
|
||||
composer.json style configuration files to merge into the configuration for
|
||||
the current Composer execution. By default the merge plugin is recursive, if
|
||||
an included file also has a "merge-plugin" section it will also be processed.
|
||||
This functionality can be disabled by setting `"recurse": false` inside the
|
||||
"merge-plugin" section.
|
||||
|
||||
These sections of the found configuration files will be merged into the root
|
||||
package configuration as though they were directly included in the top-level
|
||||
composer.json file:
|
||||
Plugin configuration
|
||||
--------------------
|
||||
|
||||
The plugin reads its configuration from the `merge-plugin` section of your
|
||||
composer.json's `extra` section. An `include` setting is required to tell
|
||||
Composer Merge Plugin which file(s) to merge.
|
||||
|
||||
|
||||
### include
|
||||
|
||||
The `include` setting can specify either a single value or an array of values.
|
||||
Each value is treated as a PHP `glob()` pattern identifying additional
|
||||
composer.json style configuration files to merge into the root package
|
||||
configuration for the current Composer execution.
|
||||
|
||||
The following sections of the found configuration files will be merged into
|
||||
the Composer root package configuration as though they were directly included
|
||||
in the top-level composer.json file:
|
||||
|
||||
* [autoload](https://getcomposer.org/doc/04-schema.md#autoload)
|
||||
* [autoload-dev](https://getcomposer.org/doc/04-schema.md#autoload-dev)
|
||||
(optional, see [merge-dev](#merge-dev) below)
|
||||
* [conflict](https://getcomposer.org/doc/04-schema.md#conflict)
|
||||
* [provide](https://getcomposer.org/doc/04-schema.md#provide)
|
||||
* [replace](https://getcomposer.org/doc/04-schema.md#replace)
|
||||
* [repositories](https://getcomposer.org/doc/04-schema.md#repositories)
|
||||
* [require](https://getcomposer.org/doc/04-schema.md#require)
|
||||
* [require-dev](https://getcomposer.org/doc/04-schema.md#require-dev)
|
||||
(optional, see [merge-dev](#merge-dev) below)
|
||||
* [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)
|
||||
|
||||
A `"merge-extra": true` setting enables the merging of the "extra" section of
|
||||
included files as well. The normal merge mode for the extra 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 an imported config). If `replace` mode is
|
||||
active (see below) then this behavior changes and the last found key will win
|
||||
(the key in the master config is replaced by the key in the imported config).
|
||||
Note that the `merge-plugin` key itself is excluded from this merge process.
|
||||
Your mileage with merging the extra section will vary depending on the plugins
|
||||
being used and the order in which they are processed by Composer.
|
||||
|
||||
By default, Composer's normal conflict resolution engine is used to determine
|
||||
which version of a package should be installed if multiple files specify the
|
||||
same package. A `"replace": true` setting can be provided inside the
|
||||
"merge-plugin" section to change to a "last version specified wins" conflict
|
||||
resolution strategy. In this mode, duplicate package declarations in merged
|
||||
files will overwrite the declarations made in earlier files. Files are loaded
|
||||
in the order specified in the `include` section with globbed files being
|
||||
loaded in alphabetical order.
|
||||
### require
|
||||
|
||||
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
|
||||
|
||||
By default the merge plugin is recursive; if an included file has
|
||||
a `merge-plugin` section it will also be processed. This functionality can be
|
||||
disabled by adding a `"recurse": false` setting.
|
||||
|
||||
|
||||
### replace
|
||||
|
||||
By default, Composer's conflict resolution engine is used to determine which
|
||||
version of a package should be installed when multiple files specify the same
|
||||
package. A `"replace": true` setting can be provided to change to a "last
|
||||
version specified wins" conflict resolution strategy. In this mode, duplicate
|
||||
package declarations found in merged files will overwrite the declarations
|
||||
made by earlier files. Files are loaded in the order specified by the
|
||||
`include` setting with globbed files being processed in alphabetical order.
|
||||
|
||||
|
||||
### merge-dev
|
||||
|
||||
By default, `autoload-dev` and `require-dev` sections of included files are
|
||||
merged. A `"merge-dev": false` setting will disable this behavior.
|
||||
|
||||
|
||||
### merge-extra
|
||||
|
||||
A `"merge-extra": true` setting enables the merging the contents of the
|
||||
`extra` section of included files as well. The normal merge mode for the extra
|
||||
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.
|
||||
|
||||
Note that `merge-plugin` sections are excluded from the merge process, but are
|
||||
always processed by the plugin unless [recursion](#recurse) is disabled.
|
||||
|
||||
|
||||
Running tests
|
||||
-------------
|
||||
|
||||
```
|
||||
$ composer install
|
||||
$ composer test
|
||||
|
@ -100,6 +146,7 @@ $ composer test
|
|||
|
||||
Contributing
|
||||
------------
|
||||
|
||||
Bug, feature requests and other issues should be reported to the [GitHub
|
||||
project]. We accept code and documentation contributions via Pull Requests on
|
||||
GitHub as well.
|
||||
|
@ -119,6 +166,7 @@ GitHub as well.
|
|||
|
||||
License
|
||||
-------
|
||||
|
||||
Composer Merge plugin is licensed under the MIT license. See the `LICENSE`
|
||||
file for more details.
|
||||
|
||||
|
@ -129,3 +177,7 @@ file for more details.
|
|||
[GitHub project]: https://github.com/wikimedia/composer-merge-plugin
|
||||
[PSR-2 Coding Standard]: https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-2-coding-style-guide.md
|
||||
[PHP Code Sniffer]: http://pear.php.net/package/PHP_CodeSniffer
|
||||
[Latest Stable Version]: https://img.shields.io/packagist/v/wikimedia/composer-merge-plugin.svg?style=flat
|
||||
[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
|
||||
|
|
Reference in a new issue