Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298329
Change subject: Update composer libs to match REL1_26
......................................................................
Update composer libs to match REL1_26
DO NOT DEPLOY AGAINST REL1_25!
Change-Id: I3e9dc2cbd7260b54c0d5d8eef512b16c01b10390
---
M composer.json
M composer.lock
2 files changed, 42 insertions(+), 36 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/29/298329/1
diff --git a/composer.json b/composer.json
index 3846e2f..4dc4121 100644
--- a/composer.json
+++ b/composer.json
@@ -22,10 +22,10 @@
"coderkungfu/php-queue": "dev-master",
"fusesource/stomp-php": "2.1.*",
"minfraud/http": "^1.70",
- "monolog/monolog": "1.12.0",
+ "monolog/monolog": "1.14.0",
"predis/predis": "1.*",
"psr/log": "1.0.0",
- "zordius/lightncandy": "0.18",
+ "zordius/lightncandy": "0.21",
"amzn/login-and-pay-with-amazon-sdk-php": "dev-master",
"symfony/yaml": "2.8.3"
},
diff --git a/composer.lock b/composer.lock
index 845d450..f64e7e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +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": "f32d8a3c3a03bc107a599b141317d49e",
- "content-hash": "47e786eb13a9c848b45f71174ba3c3bc",
+ "hash": "12b4452cc790d4f2a592624e531c6b23",
+ "content-hash": "19d409ad9c439f4722b09ef91285ea46",
"packages": [
{
"name": "amzn/login-and-pay-with-amazon-sdk-php",
@@ -93,7 +93,7 @@
"source": {
"type": "git",
"url":
"https://gerrit.wikimedia.org/r/p/wikimedia/fundraising/php-queue.git";,
- "reference": "c5a5200e3b5df3ec5f02ff27e8e6d9a07ce10b5e"
+ "reference": "073e90318804bd0c5f0a2bf9da2d97794189fde5"
},
"require": {
"clio/clio": "@stable",
@@ -101,19 +101,15 @@
"php": ">=5.3.0"
},
"require-dev": {
- "amazonwebservices/aws-sdk-for-php": "dev-master",
- "aws/aws-sdk-php": "dev-master",
- "ext-memcache": "*",
- "iron-io/iron_mq": "dev-master",
- "microsoft/windowsazure": "dev-master",
- "mrpoundsign/pheanstalk-5.3": "dev-master",
- "predis/predis": "1.*"
+ "jakub-onderka/php-parallel-lint": "0.9",
+ "phpunit/phpunit": "4.4.*"
},
"suggest": {
"Respect/Rest": "For a REST server to post job data",
"amazonwebservices/aws-sdk-for-php": "For AWS SQS backend
support (legacy version)",
"aws/aws-sdk-php": "For AWS SQS backend support",
"clio/clio": "Support for daemonizing PHP CLI runner",
+ "ext-memcache": "*",
"fusesource/stomp-php": "For the STOMP backend",
"iron-io/iron_mq": "For IronMQ backend support",
"microsoft/windowsazure": "For Windows Azure Service Bus
backend support",
@@ -132,6 +128,12 @@
"PHPQueue": "src/"
}
},
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "phpunit"
+ ]
+ },
"license": [
"MIT"
],
@@ -147,7 +149,7 @@
"queue",
"transaction"
],
- "time": "2015-08-25 20:02:50"
+ "time": "2016-07-06 16:43:54"
},
{
"name": "fusesource/stomp-php",
@@ -241,16 +243,16 @@
},
{
"name": "monolog/monolog",
- "version": "1.12.0",
+ "version": "1.14.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git";,
- "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+ "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f";,
- "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+ "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/b287fbbe1ca27847064beff2bad7fb6920bf08cc";,
+ "reference": "b287fbbe1ca27847064beff2bad7fb6920bf08cc",
"shasum": ""
},
"require": {
@@ -261,12 +263,15 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "aws/aws-sdk-php": "~2.4, >2.4.8",
+ "aws/aws-sdk-php": "^2.4.9",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
- "phpunit/phpunit": "~4.0",
- "raven/raven": "~0.5",
- "ruflin/elastica": "0.90.*",
+ "php-console/php-console": "^3.1.3",
+ "phpunit/phpunit": "~4.5",
+ "phpunit/phpunit-mock-objects": "2.3.0",
+ "raven/raven": "~0.8",
+ "ruflin/elastica": ">=0.90 <3.0",
+ "swiftmailer/swiftmailer": "~5.3",
"videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
@@ -275,6 +280,7 @@
"ext-amqp": "Allow sending log messages to an AMQP server
(1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2
server",
+ "php-console/php-console": "Allow sending log messages to
Google Chrome",
"raven/raven": "Allow sending log messages to a Sentry server",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic
Search server",
@@ -283,7 +289,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.12.x-dev"
+ "dev-master": "1.14.x-dev"
}
},
"autoload": {
@@ -309,27 +315,27 @@
"logging",
"psr-3"
],
- "time": "2014-12-29 21:29:35"
+ "time": "2015-06-19 13:29:54"
},
{
"name": "predis/predis",
- "version": "v1.0.3",
+ "version": "v1.1.1",
"source": {
"type": "git",
"url": "https://github.com/nrk/predis.git";,
- "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04"
+ "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/nrk/predis/zipball/84060b9034d756b4d79641667d7f9efe1aeb8e04";,
- "reference": "84060b9034d756b4d79641667d7f9efe1aeb8e04",
+ "url":
"https://api.github.com/repos/nrk/predis/zipball/f0210e38881631afeafb56ab43405a92cafd9fd1";,
+ "reference": "f0210e38881631afeafb56ab43405a92cafd9fd1",
"shasum": ""
},
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.9"
},
"require-dev": {
- "phpunit/phpunit": "~4.0"
+ "phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-curl": "Allows access to Webdis when paired with
phpiredis",
@@ -352,14 +358,14 @@
"homepage": "http://clorophilla.net";
}
],
- "description": "Flexible and feature-complete PHP client library
for Redis",
+ "description": "Flexible and feature-complete Redis client for PHP
and HHVM",
"homepage": "http://github.com/nrk/predis";,
"keywords": [
"nosql",
"predis",
"redis"
],
- "time": "2015-07-30 18:34:15"
+ "time": "2016-06-16 16:22:20"
},
{
"name": "psr/log",
@@ -450,16 +456,16 @@
},
{
"name": "zordius/lightncandy",
- "version": "v0.18",
+ "version": "v0.21",
"source": {
"type": "git",
"url": "https://github.com/zordius/lightncandy.git";,
- "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
+ "reference": "015fed62d0ae6fe7601d3910b8e4b6a6964f86a0"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05";,
- "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
+ "url":
"https://api.github.com/repos/zordius/lightncandy/zipball/015fed62d0ae6fe7601d3910b8e4b6a6964f86a0";,
+ "reference": "015fed62d0ae6fe7601d3910b8e4b6a6964f86a0",
"shasum": ""
},
"require": {
@@ -493,7 +499,7 @@
"php",
"template"
],
- "time": "2015-01-01 04:37:19"
+ "time": "2015-05-08 01:56:46"
}
],
"packages-dev": [],
--
To view, visit https://gerrit.wikimedia.org/r/298329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e9dc2cbd7260b54c0d5d8eef512b16c01b10390
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
