diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-20 09:00:55 +0100 |
commit | a2190ac74dd4d7080b12bab90e552d7aa81209ef (patch) | |
tree | 8b31f38de9882d18df54cf8d9e0de74167a094eb /vendor/wikimedia/composer-merge-plugin/composer.json | |
parent | 15e69f7b20b6596b9148030acce5b59993b95a45 (diff) | |
parent | 257401d8b2cf661adf36c84b0e3fd1cf85e33c22 (diff) |
Merge branch 'mw-1.26'
Diffstat (limited to 'vendor/wikimedia/composer-merge-plugin/composer.json')
-rw-r--r-- | vendor/wikimedia/composer-merge-plugin/composer.json | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/vendor/wikimedia/composer-merge-plugin/composer.json b/vendor/wikimedia/composer-merge-plugin/composer.json index 5ef429ad..dce70e7d 100644 --- a/vendor/wikimedia/composer-merge-plugin/composer.json +++ b/vendor/wikimedia/composer-merge-plugin/composer.json @@ -3,18 +3,23 @@ "description": "Composer plugin to merge multiple composer.json files", "type": "composer-plugin", "license": "MIT", + "authors": [ + { + "name": "Bryan Davis", + "email": "bd808@wikimedia.org" + } + ], "minimum-stability": "dev", "prefer-stable": true, "require": { - "php": ">=5.3.2", - "composer-plugin-api": "1.0.0" + "composer-plugin-api": "^1.0", + "php": ">=5.3.2" }, "require-dev": { "composer/composer": "1.0.*@dev", - "phpunit/phpunit": "~4.0", "jakub-onderka/php-parallel-lint": "~0.8", - "squizlabs/php_codesniffer": "~2.1.0", - "phpspec/prophecy-phpunit": "~1.0" + "phpunit/phpunit": "~4.8|~5.0", + "squizlabs/php_codesniffer": "~2.1.0" }, "autoload": { "psr-4": { @@ -22,6 +27,9 @@ } }, "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + }, "class": "Wikimedia\\Composer\\MergePlugin" }, "config": { |