Ejegg has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/405822 )
Change subject: WIP merged vendor dirs for payments-wiki
......................................................................
WIP merged vendor dirs for payments-wiki
Use the composer merge plugin to put all the extension dependencies
into the top-level vendor directory.
TODO: make sure we can update CI to work for all the things, including
dev dependencies and adding new dependencies
Bug: T185547
Depends-On: I09db8170994a187b06816e88d5d01e73567b46a1
Depends-On: I8090150374e1146cebf1f62aeb92ca43c31d0f89
Depends-On: I795169577204fabea276364c966b65a321d6a7fb
Change-Id: Ic3a88c5bbb73fac7dd3f9e4d55fb59f0f299a2d6
---
M composer.json
M extensions/DonationInterface
M extensions/FundraisingEmailUnsubscribe
M vendor
4 files changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/22/405822/1
diff --git a/composer.json b/composer.json
index 3880520..2c32d80 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,8 @@
"nmred/kafka-php": "0.1.5",
"phpunit/phpunit": "4.8.36",
"wikimedia/testing-access-wrapper": "~1.0",
- "wikimedia/avro": "1.7.7"
+ "wikimedia/avro": "1.7.7",
+ "etsy/phan": "0.8"
},
"suggest": {
"ext-apc": "Local data and opcode cache",
@@ -93,7 +94,8 @@
"extra": {
"merge-plugin": {
"include": [
- "composer.local.json"
+ "composer.local.json",
+ "extensions/*/composer.json"
],
"merge-dev": false
}
diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index 6ddd13b..279d86c 160000
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit 6ddd13bb7b227354a5338745b587ca3d9e69497a
+Subproject commit 279d86c4869d6a4284d54e01c83ac9527076c819
diff --git a/extensions/FundraisingEmailUnsubscribe
b/extensions/FundraisingEmailUnsubscribe
index b4f69ed..2609bae 160000
--- a/extensions/FundraisingEmailUnsubscribe
+++ b/extensions/FundraisingEmailUnsubscribe
@@ -1 +1 @@
-Subproject commit b4f69edb163d459a48fec7599b48003fb1982023
+Subproject commit 2609bae6d88fdfadefca69dde9910c5dc6486e48
diff --git a/vendor b/vendor
index ec4d316..7ad981a 160000
--- a/vendor
+++ b/vendor
@@ -1 +1 @@
-Subproject commit ec4d3165a5e97ed273a3e518ba657a5f389f8abb
+Subproject commit 7ad981a35e100a6b0a6ca0ec5743a48b83d74ac4
--
To view, visit https://gerrit.wikimedia.org/r/405822
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic3a88c5bbb73fac7dd3f9e4d55fb59f0f299a2d6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
