Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289971
Change subject: Update vendor and composer.lock
......................................................................
Update vendor and composer.lock
Change-Id: Ibf579b09b9f86c0b0c81dd862b314886ea9182ca
---
M composer.lock
M vendor
2 files changed, 18 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/289971/1
diff --git a/composer.lock b/composer.lock
index daf752b..9fd158a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,8 @@
"Read more about it at
https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "4146cd04549aaf5db0eb67f9c81c15b6",
+ "hash": "594f1bda515b860c0fc3b8a4279c86fb",
+ "content-hash": "32538f75050cde2ca8ffabb56d4d8786",
"packages": [
{
"name": "cssjanus/cssjanus",
@@ -323,31 +324,33 @@
},
{
"name": "wikimedia/composer-merge-plugin",
- "version": "v1.0.0",
+ "version": "v1.3.1",
"source": {
"type": "git",
"url":
"https://github.com/wikimedia/composer-merge-plugin.git";,
- "reference": "ed426b785f9f786b33be4fd78584e43f4e962356"
+ "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ed426b785f9f786b33be4fd78584e43f4e962356";,
- "reference": "ed426b785f9f786b33be4fd78584e43f4e962356",
+ "url":
"https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4";,
+ "reference": "0bdf8543d445ee067c9ba7d5d4a5dde70b9785f4",
"shasum": ""
},
"require": {
- "composer-plugin-api": "1.0.0",
+ "composer-plugin-api": "^1.0",
"php": ">=5.3.2"
},
"require-dev": {
"composer/composer": "1.0.*@dev",
"jakub-onderka/php-parallel-lint": "~0.8",
- "phpspec/prophecy-phpunit": "~1.0",
- "phpunit/phpunit": "~4.0",
+ "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": {
@@ -359,8 +362,14 @@
"license": [
"MIT"
],
+ "authors": [
+ {
+ "name": "Bryan Davis",
+ "email": "bd...@wikimedia.org"
+ }
+ ],
"description": "Composer plugin to merge multiple composer.json
files",
- "time": "2015-02-21 00:57:13"
+ "time": "2016-03-08 17:11:37"
},
{
"name": "wikimedia/utfnormal",
diff --git a/vendor b/vendor
index d3696d1..2f625a2 160000
--- a/vendor
+++ b/vendor
-Subproject commit d3696d1b338f8e3fa1238cc444c0a11c9c3d5390
+Subproject commit 2f625a2a1a50b635b22031d3d06f5fba764a8c7e
--
To view, visit https://gerrit.wikimedia.org/r/289971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf579b09b9f86c0b0c81dd862b314886ea9182ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_25
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
