Eileen has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364130 )
Change subject: Add composer-merge-plugin
......................................................................
Add composer-merge-plugin
T169593
Change-Id: I6d44d7006b7c8815433d270a4a8a46b4d4b9e606
---
M composer.json
M composer.lock
2 files changed, 89 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm
refs/changes/30/364130/1
diff --git a/composer.json b/composer.json
index 345150b..27af0c7 100644
--- a/composer.json
+++ b/composer.json
@@ -24,13 +24,22 @@
"phpmailer/phpmailer": "5.2.*",
"phpseclib/phpseclib": "~2.0",
"predis/predis": "1.*",
- "twig/twig": "1.*"
+ "twig/twig": "1.*",
+ "wikimedia/composer-merge-plugin": "^1.4"
},
"repositories": [
- {
- "type": "git",
- "url": "https://github.com/ejegg/login-and-pay-with-amazon-sdk-php";
- }
+ {
+ "type": "git",
+ "url": "https://github.com/ejegg/login-and-pay-with-amazon-sdk-php";
+ },
+ {
+ "type": "git",
+ "url": "https://github.com/eileenmcnaughton/omnimail-silverpop";
+ },
+ {
+ "type": "git",
+ "url": "https://github.com/eileenmcnaughton/silverpop-php-connector";
+ }
],
"require-dev": {
"phpunit/phpunit": "5.*",
@@ -38,8 +47,24 @@
"jakub-onderka/php-console-highlighter": "~0.3.2"
},
"scripts": {
- "test": [
- "parallel-lint -e php,module,install,inc --exclude
vendor ."
- ]
+ "test": [
+ "parallel-lint -e php,module,install,inc --exclude vendor --exclude
sites/default/civicrm/extensions/org.wikimedia.omnimail/vendor."
+ ]
+ },
+ "minimum-stability": "dev",
+ "prefer-stable": true,
+ "extra": {
+ "merge-plugin": {
+ "include": [
+ "sites/default/civicrm/extensions/*/composer.json"
+ ],
+ "recurse": true,
+ "replace": false,
+ "ignore-duplicates": false,
+ "merge-dev": true,
+ "merge-extra": false,
+ "merge-extra-deep": false,
+ "merge-scripts": false
+ }
}
}
diff --git a/composer.lock b/composer.lock
index e086b90..ef63c35 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "content-hash": "9d359779ffaa56b80b732235f55a98e9",
+ "content-hash": "7099968f02637a7ce97dae3c0569ac66",
"packages": [
{
"name": "addshore/psr-6-mediawiki-bagostuff-adapter",
@@ -88,7 +88,7 @@
"payment",
"payments"
],
- "time": "2016-02-17T00:44:20+00:00"
+ "time": "2016-02-17 00:53:20"
},
{
"name": "clio/clio",
@@ -198,7 +198,7 @@
"queue",
"transaction"
],
- "time": "2017-04-17T14:11:55+00:00"
+ "time": "2017-04-17 14:11:55"
},
{
"name": "cogpowered/finediff",
@@ -1139,6 +1139,55 @@
"time": "2017-01-11T19:36:15+00:00"
},
{
+ "name": "wikimedia/composer-merge-plugin",
+ "version": "v1.4.0",
+ "source": {
+ "type": "git",
+ "url":
"https://github.com/wikimedia/composer-merge-plugin.git";,
+ "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ca453f9f13d8b05f86f20ea10be992a782e6f78c";,
+ "reference": "ca453f9f13d8b05f86f20ea10be992a782e6f78c",
+ "shasum": ""
+ },
+ "require": {
+ "composer-plugin-api": "^1.0",
+ "php": ">=5.3.2"
+ },
+ "require-dev": {
+ "composer/composer": "~1.0.0",
+ "jakub-onderka/php-parallel-lint": "~0.8",
+ "phpunit/phpunit": "~4.8|~5.0",
+ "squizlabs/php_codesniffer": "~2.1.0"
+ },
+ "type": "composer-plugin",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ },
+ "class": "Wikimedia\\Composer\\MergePlugin"
+ },
+ "autoload": {
+ "psr-4": {
+ "Wikimedia\\Composer\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Bryan Davis",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "Composer plugin to merge multiple composer.json
files",
+ "time": "2017-03-13T16:52:55+00:00"
+ },
+ {
"name": "wikimedia/donation-interface",
"version": "dev-master",
"source": {
@@ -1184,7 +1233,7 @@
"GPL-2.0"
],
"description": "Wikimedia Foundation payment processing library",
- "time": "2017-04-13T00:15:19+00:00"
+ "time": "2017-04-13 00:15:19"
},
{
"name": "wikimedia/smash-pig",
@@ -1243,7 +1292,7 @@
"donations",
"payments"
],
- "time": "2017-04-22T00:12:45+00:00"
+ "time": "2017-04-22 00:12:45"
},
{
"name": "zordius/lightncandy",
@@ -2688,14 +2737,14 @@
}
],
"aliases": [],
- "minimum-stability": "stable",
+ "minimum-stability": "dev",
"stability-flags": {
"amzn/login-and-pay-with-amazon-sdk-php": 20,
"coderkungfu/php-queue": 20,
"wikimedia/donation-interface": 20,
"wikimedia/smash-pig": 20
},
- "prefer-stable": false,
+ "prefer-stable": true,
"prefer-lowest": false,
"platform": [],
"platform-dev": []
--
To view, visit https://gerrit.wikimedia.org/r/364130
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6d44d7006b7c8815433d270a4a8a46b4d4b9e606
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
