jenkins-bot has submitted this change and it was merged.
Change subject: Update required version of Monolog to 1.12.0
......................................................................
Update required version of Monolog to 1.12.0
To stay in sync with version in core/vendor.
Corresponding change in DonationInterface/vendor is Ibe85af85460cc85
That and the follow-on change to clean up unlintable files should
be merged and the submodule updated in the deployment branch during
the next DI deploy.
Change-Id: I5a5f9e916a381e65f251c503433cd04d413ac9eb
---
M composer.json
M composer.lock
2 files changed, 26 insertions(+), 20 deletions(-)
Approvals:
Awight: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.json b/composer.json
index fe5c8c4..b67d86c 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,6 @@
},
"require": {
"psr/log": "1.0.0",
- "monolog/monolog": "1.7.0"
+ "monolog/monolog": "1.12.0"
}
}
diff --git a/composer.lock b/composer.lock
index 5346e48..a9fac59 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,52 +4,58 @@
"Read more about it at
http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file";,
"This file is @generated automatically"
],
- "hash": "f66f26ac4c1ee0614474a94ce1de827c",
+ "hash": "ee21c14716f26b1f74a27244319420c9",
"packages": [
{
"name": "monolog/monolog",
- "version": "1.7.0",
+ "version": "1.12.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git";,
- "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57"
+ "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
},
"dist": {
"type": "zip",
- "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/6225b22de9dcf36546be3a0b2fa8e3d986153f57";,
- "reference": "6225b22de9dcf36546be3a0b2fa8e3d986153f57",
+ "url":
"https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f";,
+ "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
+ "provide": {
+ "psr/log-implementation": "1.0.0"
+ },
"require-dev": {
- "aws/aws-sdk-php": "~2.4.8",
- "doctrine/couchdb": "dev-master",
- "mlehner/gelf-php": "1.0.*",
- "phpunit/phpunit": "~3.7.0",
- "raven/raven": "0.5.*",
- "ruflin/elastica": "0.90.*"
+ "aws/aws-sdk-php": "~2.4, >2.4.8",
+ "doctrine/couchdb": "~1.0@dev",
+ "graylog2/gelf-php": "~1.0",
+ "phpunit/phpunit": "~4.0",
+ "raven/raven": "~0.5",
+ "ruflin/elastica": "0.90.*",
+ "videlalvaro/php-amqplib": "~2.4"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services
like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB
server",
"ext-amqp": "Allow sending log messages to an AMQP server
(1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
- "mlehner/gelf-php": "Allow sending log messages to a GrayLog2
server",
+ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2
server",
"raven/raven": "Allow sending log messages to a Sentry server",
- "ruflin/elastica": "Allow sending log messages to an Elastic
Search server"
+ "rollbar/rollbar": "Allow sending log messages to Rollbar",
+ "ruflin/elastica": "Allow sending log messages to an Elastic
Search server",
+ "videlalvaro/php-amqplib": "Allow sending log messages to an
AMQP server using php-amqplib"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.7.x-dev"
+ "dev-master": "1.12.x-dev"
}
},
"autoload": {
- "psr-0": {
- "Monolog": "src/"
+ "psr-4": {
+ "Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/";,
@@ -60,8 +66,7 @@
{
"name": "Jordi Boggiano",
"email": "j.boggi...@seld.be",
- "homepage": "http://seld.be";,
- "role": "Developer"
+ "homepage": "http://seld.be";
}
],
"description": "Sends your logs to files, sockets, inboxes,
databases and various web services",
@@ -71,7 +76,7 @@
"logging",
"psr-3"
],
- "time": "2013-11-14 19:48:31"
+ "time": "2014-12-29 21:29:35"
},
{
"name": "psr/log",
@@ -117,6 +122,7 @@
"minimum-stability": "stable",
"stability-flags": [],
"prefer-stable": false,
+ "prefer-lowest": false,
"platform": [],
"platform-dev": []
}
--
To view, visit https://gerrit.wikimedia.org/r/202436
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a5f9e916a381e65f251c503433cd04d413ac9eb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: Ssmith <ssm...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
