DCausse has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/340767 )
Change subject: Merge remote-tracking branch 'origin' into es5
......................................................................
Merge remote-tracking branch 'origin' into es5
Change-Id: Ib89daa99761b17dd6d90317f259bf0f554abd70f
---
M composer.lock
M composer/installed.json
2 files changed, 259 insertions(+), 283 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vendor
refs/changes/67/340767/1
diff --git a/composer.lock b/composer.lock
index 9e55fae..7e9bc73 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,12 +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"
],
-<<<<<<< HEAD (c0a280 Update Elastica to 5.1.0)
- "hash": "b402f41955c4c7c743ae7f80765b3e46",
- "content-hash": "b01ea70effa5647f643e7bb7859ee838",
-=======
- "content-hash": "6e6efa02e9989ec950e3970b20d4b0b9",
->>>>>>> BRANCH (feb01a Add wikimedia/timestamp 1.0.0)
+ "hash": "9236ce6c44959f93716f6f7f25ca16f3",
+ "content-hash": "1255177b764145c4f6bb83813f0fac08",
"packages": [
{
"name": "composer/semver",
@@ -71,7 +67,7 @@
"validation",
"versioning"
],
- "time": "2016-08-30T16:08:34+00:00"
+ "time": "2016-08-30 16:08:34"
},
{
"name": "cssjanus/cssjanus",
@@ -106,7 +102,7 @@
"Apache-2.0"
],
"description": "Convert CSS stylesheets between left-to-right and
right-to-left.",
- "time": "2016-12-24T09:16:21+00:00"
+ "time": "2016-12-24 09:16:21"
},
{
"name": "firebase/php-jwt",
@@ -149,7 +145,7 @@
],
"description": "A simple library to encode and decode JSON Web
Tokens (JWT) in PHP. Should conform to the current spec.",
"homepage": "https://github.com/firebase/php-jwt";,
- "time": "2016-07-18T04:51:16+00:00"
+ "time": "2016-07-18 04:51:16"
},
{
"name": "james-heinrich/getid3",
@@ -185,7 +181,7 @@
"php",
"tags"
],
- "time": "2016-12-14T14:29:29+00:00"
+ "time": "2016-12-14 14:29:29"
},
{
"name": "justinrainbow/json-schema",
@@ -251,7 +247,7 @@
"json",
"schema"
],
- "time": "2016-08-26T12:45:49+00:00"
+ "time": "2016-08-26 12:45:49"
},
{
"name": "liuggio/statsd-php-client",
@@ -301,7 +297,7 @@
"php",
"statsd"
],
- "time": "2015-07-23T23:12:45+00:00"
+ "time": "2015-07-23 23:12:45"
},
{
"name": "mediawiki/at-ease",
@@ -348,7 +344,7 @@
],
"description": "Safe replacement to @ for suppressing warnings.",
"homepage": "https://www.mediawiki.org/wiki/at-ease";,
- "time": "2015-09-18T07:02:06+00:00"
+ "time": "2015-09-18 07:02:06"
},
{
"name": "monolog/monolog",
@@ -426,7 +422,7 @@
"logging",
"psr-3"
],
- "time": "2016-04-02T13:12:58+00:00"
+ "time": "2016-04-02 13:12:58"
},
{
"name": "nmred/kafka-php",
@@ -466,7 +462,7 @@
"client",
"kafka"
],
- "time": "2015-12-02T12:06:23+00:00"
+ "time": "2015-12-02 12:06:23"
},
{
"name": "oojs/oojs-ui",
@@ -545,7 +541,7 @@
],
"description": "Provides library of common widgets, layouts, and
windows.",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
- "time": "2017-02-28T22:56:52+00:00"
+ "time": "2017-02-28 22:56:52"
},
{
"name": "oyejorge/less.php",
@@ -607,7 +603,7 @@
"php",
"stylesheet"
],
- "time": "2015-12-30T05:47:36+00:00"
+ "time": "2015-12-30 05:47:36"
},
{
"name": "pear/console_getopt",
@@ -654,7 +650,7 @@
}
],
"description": "More info available on:
http://pear.php.net/package/Console_Getopt";,
- "time": "2015-07-20T20:28:12+00:00"
+ "time": "2015-07-20 20:28:12"
},
{
"name": "pear/mail",
@@ -712,7 +708,7 @@
],
"description": "Class that provides multiple interfaces for
sending emails.",
"homepage": "http://pear.php.net/package/Mail";,
- "time": "2016-01-31T21:32:18+00:00"
+ "time": "2016-01-31 21:32:18"
},
{
"name": "pear/mail_mime",
@@ -758,7 +754,7 @@
],
"description": "Mail_Mime provides classes to create MIME
messages",
"homepage": "http://pear.php.net/package/Mail_Mime";,
- "time": "2015-09-13T12:42:41+00:00"
+ "time": "2015-09-13 12:42:41"
},
{
"name": "pear/mail_mime-decode",
@@ -806,7 +802,7 @@
}
],
"description": "More info available on:
http://pear.php.net/package/Mail_mimeDecode";,
- "time": "2014-04-15T19:29:16+00:00"
+ "time": "2014-04-15 19:29:16"
},
{
"name": "pear/net_smtp",
@@ -866,7 +862,7 @@
"mail",
"smtp"
],
- "time": "2017-01-14T18:19:55+00:00"
+ "time": "2017-01-14 18:19:55"
},
{
"name": "pear/net_socket",
@@ -919,7 +915,7 @@
}
],
"description": "More info available on:
http://pear.php.net/package/Net_Socket";,
- "time": "2014-02-20T19:27:06+00:00"
+ "time": "2014-02-20 19:27:06"
},
{
"name": "pear/pear-core-minimal",
@@ -963,7 +959,7 @@
}
],
"description": "Minimal set of PEAR core files to be used as
composer dependency",
- "time": "2015-10-17T11:41:19+00:00"
+ "time": "2015-10-17 11:41:19"
},
{
"name": "pear/pear_exception",
@@ -1018,7 +1014,7 @@
"keywords": [
"exception"
],
- "time": "2015-02-10T20:07:52+00:00"
+ "time": "2015-02-10 20:07:52"
},
{
"name": "pimple/pimple",
@@ -1064,7 +1060,7 @@
"container",
"dependency injection"
],
- "time": "2015-09-11T15:10:35+00:00"
+ "time": "2015-09-11 15:10:35"
},
{
"name": "psr/log",
@@ -1111,7 +1107,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2016-10-10 12:19:37"
},
{
"name": "ruflin/elastica",
@@ -1124,17 +1120,33 @@
"dist": {
"type": "zip",
"url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
- "reference": null,
- "shasum": null
+ "reference": "tags/5.1.0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6.0",
+ "psr/log": "~1.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~3.0",
+ "guzzlehttp/guzzle": "~6.0"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow using IAM authentication with Amazon
ElasticSearch Service",
+ "egeloen/http-adapter": "Allow using httpadapter transport",
+ "guzzlehttp/guzzle": "Allow using guzzle 6 as the http
transport",
+ "monolog/monolog": "Logging request"
},
"type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.1.x-dev"
+ }
+ },
"autoload": {
"psr-4": {
"Elastica\\": "lib/Elastica/"
}
-<<<<<<< HEAD (c0a280 Update Elastica to 5.1.0)
- }
-=======
},
"notification-url": "https://packagist.org/downloads/";,
"license": [
@@ -1152,8 +1164,7 @@
"client",
"search"
],
- "time": "2016-03-18T07:56:36+00:00"
->>>>>>> BRANCH (feb01a Add wikimedia/timestamp 1.0.0)
+ "time": "2017-02-15 11:19:35"
},
{
"name": "stil/gd-text",
@@ -1184,7 +1195,7 @@
"MIT"
],
"description": "A class drawing multiline and aligned text on
pictures. Uses GD extension.",
- "time": "2015-01-02T12:21:25+00:00"
+ "time": "2015-01-02 12:21:25"
},
{
"name": "symfony/process",
@@ -1233,7 +1244,7 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com";,
- "time": "2016-07-28T11:13:34+00:00"
+ "time": "2016-07-28 11:13:34"
},
{
"name": "wikimedia/assert",
@@ -1278,7 +1289,7 @@
"precondition",
"qa"
],
- "time": "2015-04-29T17:23:50+00:00"
+ "time": "2015-04-29 17:23:50"
},
{
"name": "wikimedia/avro",
@@ -1345,7 +1356,7 @@
"keywords": [
"serialization"
],
- "time": "2015-09-05T18:49:27+00:00"
+ "time": "2015-09-05 18:49:27"
},
{
"name": "wikimedia/base-convert",
@@ -1391,7 +1402,7 @@
],
"description": "Convert an arbitrarily-long string from one
numeric base to another, optionally zero-padding to a minimum column width.",
"homepage": "https://www.mediawiki.org/wiki/base_convert";,
- "time": "2015-10-29T22:19:02+00:00"
+ "time": "2015-10-29 22:19:02"
},
{
"name": "wikimedia/cdb",
@@ -1444,7 +1455,7 @@
],
"description": "Constant Database (CDB) wrapper library for PHP.
Provides pure-PHP fallback when dba_* functions are absent.",
"homepage": "https://www.mediawiki.org/wiki/CDB";,
- "time": "2016-05-29T07:39:26+00:00"
+ "time": "2016-05-29 07:39:26"
},
{
"name": "wikimedia/cldr-plural-rule-parser",
@@ -1490,7 +1501,7 @@
],
"description": "Evaluates plural rules specified in the CLDR
project notation.",
"homepage": "https://www.mediawiki.org/wiki/CLDRPluralRuleParser";,
- "time": "2015-08-28T17:03:03+00:00"
+ "time": "2015-08-28 17:03:03"
},
{
"name": "wikimedia/composer-merge-plugin",
@@ -1539,7 +1550,7 @@
}
],
"description": "Composer plugin to merge multiple composer.json
files",
- "time": "2016-03-08T17:11:37+00:00"
+ "time": "2016-03-08 17:11:37"
},
{
"name": "wikimedia/html-formatter",
@@ -1581,7 +1592,7 @@
],
"description": "Performs transformations of HTML by wrapping
around libxml2 and working around its countless bugs.",
"homepage": "https://www.mediawiki.org/wiki/HtmlFormatter";,
- "time": "2016-04-07T21:25:47+00:00"
+ "time": "2016-04-07 21:25:47"
},
{
"name": "wikimedia/ip-set",
@@ -1623,7 +1634,7 @@
],
"description": "Efficiently match IP addresses against a set of
CIDR specifications.",
"homepage": "https://github.com/wikimedia/IPSet";,
- "time": "2016-02-12T15:19:10+00:00"
+ "time": "2016-02-12 15:19:10"
},
{
"name": "wikimedia/php-session-serializer",
@@ -1667,7 +1678,7 @@
],
"description": "Provides methods like PHP's session_encode and
session_decode that don't mess with $_SESSION",
"homepage":
"https://www.mediawiki.org/wiki/Php-session-serializer";,
- "time": "2016-10-01T13:19:49+00:00"
+ "time": "2016-10-01 13:19:49"
},
{
"name": "wikimedia/relpath",
@@ -1709,7 +1720,7 @@
],
"description": "Compute a relative filepath between two paths.",
"homepage": "https://www.mediawiki.org/wiki/RelPath";,
- "time": "2015-09-29T21:17:03+00:00"
+ "time": "2015-09-29 21:17:03"
},
{
"name": "wikimedia/remex-html",
@@ -1750,7 +1761,7 @@
}
],
"description": "Fast HTML 5 parser",
- "time": "2017-02-24T05:24:34+00:00"
+ "time": "2017-02-24 05:24:34"
},
{
"name": "wikimedia/running-stat",
@@ -1792,7 +1803,7 @@
],
"description": "PHP implementations of online statistical
algorithms",
"homepage": "https://www.mediawiki.org/wiki/RunningStat";,
- "time": "2015-10-28T22:29:15+00:00"
+ "time": "2015-10-28 22:29:15"
},
{
"name": "wikimedia/scoped-callback",
@@ -1834,7 +1845,7 @@
],
"description": "Class for asserting that a callback happens when a
dummy object leaves scope",
"homepage": "https://www.mediawiki.org/wiki/ScopedCallback";,
- "time": "2016-09-29T07:03:03+00:00"
+ "time": "2016-09-29 07:03:03"
},
{
"name": "wikimedia/textcat",
@@ -1879,7 +1890,7 @@
}
],
"description": "PHP port of the TextCat language guesser utility,
see http://odur.let.rug.nl/~vannoord/TextCat/.";,
- "time": "2017-01-23T16:52:10+00:00"
+ "time": "2017-01-23 16:52:10"
},
{
"name": "wikimedia/timestamp",
@@ -1924,7 +1935,7 @@
],
"description": "Creation, parsing, and conversion of timestamps",
"homepage": "https://www.mediawiki.org/wiki/Timestamp";,
- "time": "2016-09-30T10:00:56+00:00"
+ "time": "2016-09-30 10:00:56"
},
{
"name": "wikimedia/utfnormal",
@@ -1967,7 +1978,7 @@
],
"description": "Contains Unicode normalization routines, including
both pure PHP implementations and automatic use of the 'intl' PHP extension
when present",
"homepage": "https://www.mediawiki.org/wiki/utfnormal";,
- "time": "2016-05-24T13:13:30+00:00"
+ "time": "2016-05-24 13:13:30"
},
{
"name": "wikimedia/wait-condition-loop",
@@ -2009,7 +2020,7 @@
],
"description": "Wait loop that reaches a condition or times out",
"homepage": "https://www.mediawiki.org/wiki/WaitConditionLoop";,
- "time": "2016-10-01T06:58:30+00:00"
+ "time": "2016-10-01 06:58:30"
},
{
"name": "wikimedia/wrappedstring",
@@ -2051,7 +2062,7 @@
],
"description": "Automatically compact sequentially-outputted
strings that share a common prefix / suffix pair.",
"homepage": "https://www.mediawiki.org/wiki/WrappedString";,
- "time": "2016-07-21T00:41:10+00:00"
+ "time": "2016-07-21 00:41:10"
},
{
"name": "zordius/lightncandy",
@@ -2098,7 +2109,7 @@
"php",
"template"
],
- "time": "2015-11-05T07:14:57+00:00"
+ "time": "2015-11-05 07:14:57"
}
],
"packages-dev": [],
diff --git a/composer/installed.json b/composer/installed.json
index c46e538..02d7311 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -24,7 +24,7 @@
"suggest": {
"monolog/monolog": "Monolog, in order to do generate statistic
from log >=1.2.0)"
},
- "time": "2015-07-23T23:12:45+00:00",
+ "time": "2015-07-23 23:12:45",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -74,7 +74,7 @@
"phpunit/phpunit": "~4.0",
"satooshi/php-coveralls": "dev-master"
},
- "time": "2015-12-02T12:06:23+00:00",
+ "time": "2015-12-02 12:06:23",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -117,7 +117,7 @@
"phpunit/phpunit": "~4.5",
"squizlabs/php_codesniffer": "2.3.0"
},
- "time": "2015-09-18T07:02:06+00:00",
+ "time": "2015-09-18 07:02:06",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -163,7 +163,7 @@
"require-dev": {
"phpunit/phpunit": "~4.8.18"
},
- "time": "2015-12-30T05:47:36+00:00",
+ "time": "2015-12-30 05:47:36",
"bin": [
"bin/lessc"
],
@@ -227,7 +227,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2015-02-10T20:07:52+00:00",
+ "time": "2015-02-10 20:07:52",
"type": "class",
"extra": {
"branch-alias": {
@@ -278,7 +278,7 @@
"reference": "82f05cd1aa3edf34e19aa7c8ca312ce13a6a577f",
"shasum": ""
},
- "time": "2015-07-20T20:28:12+00:00",
+ "time": "2015-07-20 20:28:12",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -334,7 +334,7 @@
"replace": {
"rsky/pear-core-min": "self.version"
},
- "time": "2015-10-17T11:41:19+00:00",
+ "time": "2015-10-17 11:41:19",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -376,7 +376,7 @@
"require": {
"pear/pear-core-minimal": "*"
},
- "time": "2015-09-13T12:42:41+00:00",
+ "time": "2015-09-13 12:42:41",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -427,7 +427,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2014-04-15T19:29:16+00:00",
+ "time": "2014-04-15 19:29:16",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -477,7 +477,7 @@
"require-dev": {
"phpunit/phpunit": "*"
},
- "time": "2014-02-20T19:27:06+00:00",
+ "time": "2014-02-20 19:27:06",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -529,7 +529,7 @@
"require-dev": {
"phpunit/phpunit": "3.7.*"
},
- "time": "2015-04-29T17:23:50+00:00",
+ "time": "2015-04-29 17:23:50",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -583,7 +583,7 @@
"suggest": {
"ext-gmp": "Large integer support for 32-bit platforms."
},
- "time": "2015-09-05T18:49:27+00:00",
+ "time": "2015-09-05 18:49:27",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -650,7 +650,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.0",
"phpunit/phpunit": "4.6.*"
},
- "time": "2015-10-29T22:19:02+00:00",
+ "time": "2015-10-29 22:19:02",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -698,7 +698,7 @@
"mediawiki/mediawiki-codesniffer": "^0.3.0.0",
"phpunit/phpunit": "^4.7.7.0"
},
- "time": "2015-08-28T17:03:03+00:00",
+ "time": "2015-08-28 17:03:03",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -746,7 +746,7 @@
"mediawiki/mediawiki-codesniffer": "^0.4.0.0",
"phpunit/phpunit": "^4.8.9.0"
},
- "time": "2015-09-29T21:17:03+00:00",
+ "time": "2015-09-29 21:17:03",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -790,7 +790,7 @@
"mediawiki/mediawiki-codesniffer": "^0.5.0.0",
"phpunit/phpunit": "4.6.*"
},
- "time": "2015-10-28T22:29:15+00:00",
+ "time": "2015-10-28 22:29:15",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -832,7 +832,7 @@
"require-dev": {
"phpunit/phpunit": "4.0.17"
},
- "time": "2015-11-05T07:14:57+00:00",
+ "time": "2015-11-05 07:14:57",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -885,7 +885,7 @@
"phpunit/phpunit": "~4.8|~5.0",
"squizlabs/php_codesniffer": "~2.1.0"
},
- "time": "2016-03-08T17:11:37+00:00",
+ "time": "2016-03-08 17:11:37",
"type": "composer-plugin",
"extra": {
"branch-alias": {
@@ -936,7 +936,7 @@
"suggest": {
"pear/net_smtp": "Install optionally via your project's
composer.json"
},
- "time": "2016-01-31T21:32:18+00:00",
+ "time": "2016-01-31 21:32:18",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1019,7 +1019,7 @@
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic
Search server"
},
- "time": "2016-04-02T13:12:58+00:00",
+ "time": "2016-04-02 13:12:58",
"type": "library",
"extra": {
"branch-alias": {
@@ -1075,7 +1075,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.1",
"phpunit/phpunit": "4.7.2"
},
- "time": "2016-04-07T21:25:47+00:00",
+ "time": "2016-04-07 21:25:47",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1096,68 +1096,6 @@
"homepage": "https://www.mediawiki.org/wiki/HtmlFormatter";
},
{
-<<<<<<< HEAD (c0a280 Update Elastica to 5.1.0)
-=======
- "name": "ruflin/elastica",
- "version": "3.1.1",
- "version_normalized": "3.1.1.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ruflin/Elastica.git";,
- "reference": "571dd533f56057f2afc5f447759b09bbcc012a0d"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/ruflin/Elastica/zipball/571dd533f56057f2afc5f447759b09bbcc012a0d";,
- "reference": "571dd533f56057f2afc5f447759b09bbcc012a0d",
- "shasum": ""
- },
- "require": {
- "php": ">=5.4.0",
- "psr/log": "~1.0"
- },
- "require-dev": {
- "aws/aws-sdk-php": "~3.0",
- "guzzlehttp/guzzle": "~6.0"
- },
- "suggest": {
- "aws/aws-sdk-php": "Allow using IAM authentication with Amazon
ElasticSearch Service",
- "egeloen/http-adapter": "Allow using httpadapter transport",
- "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport
(Requires php 5.5)",
- "monolog/monolog": "Logging request"
- },
- "time": "2016-03-18T07:56:36+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.1.x-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Elastica\\": "lib/Elastica/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Nicolas Ruflin",
- "homepage": "http://ruflin.com/";
- }
- ],
- "description": "Elasticsearch Client",
- "homepage": "http://elastica.io/";,
- "keywords": [
- "client",
- "search"
- ]
- },
- {
->>>>>>> BRANCH (feb01a Add wikimedia/timestamp 1.0.0)
"name": "wikimedia/ip-set",
"version": "1.1.0",
"version_normalized": "1.1.0.0",
@@ -1180,7 +1118,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.1",
"phpunit/phpunit": "4.7.2"
},
- "time": "2016-02-12T15:19:10+00:00",
+ "time": "2016-02-12 15:19:10",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1224,7 +1162,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.0",
"phpunit/phpunit": "4.6.*"
},
- "time": "2016-05-29T07:39:26+00:00",
+ "time": "2016-05-29 07:39:26",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1279,7 +1217,7 @@
"mediawiki/mediawiki-codesniffer": "0.4.0",
"phpunit/phpunit": "^4.7.7.0"
},
- "time": "2016-07-21T00:41:10+00:00",
+ "time": "2016-07-21 00:41:10",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1323,7 +1261,7 @@
"mediawiki/mediawiki-codesniffer": "0.7.2",
"phpunit/phpunit": "4.8.27"
},
- "time": "2016-09-29T07:03:03+00:00",
+ "time": "2016-09-29 07:03:03",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1367,7 +1305,7 @@
"mediawiki/mediawiki-codesniffer": "0.7.2",
"phpunit/phpunit": "4.8.24"
},
- "time": "2016-10-01T06:58:30+00:00",
+ "time": "2016-10-01 06:58:30",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1410,7 +1348,7 @@
"phpunit/phpunit": "^4.5 || ^5.0.5",
"phpunit/phpunit-mock-objects": "2.3.0 || ^3.0"
},
- "time": "2016-08-30T16:08:34+00:00",
+ "time": "2016-08-30 16:08:34",
"type": "library",
"extra": {
"branch-alias": {
@@ -1475,7 +1413,7 @@
"phpdocumentor/phpdocumentor": "~2",
"phpunit/phpunit": "^4.8.22"
},
- "time": "2016-08-26T12:45:49+00:00",
+ "time": "2016-08-26 12:45:49",
"bin": [
"bin/validate-json"
],
@@ -1545,7 +1483,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.0",
"phpunit/phpunit": "~4.5"
},
- "time": "2016-10-01T13:19:49+00:00",
+ "time": "2016-10-01 13:19:49",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1590,7 +1528,7 @@
"mediawiki/mediawiki-codesniffer": "0.4.0",
"phpunit/phpunit": "4.6.*"
},
- "time": "2016-05-24T13:13:30+00:00",
+ "time": "2016-05-24 13:13:30",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1629,7 +1567,7 @@
"require": {
"php": ">=5.3.0"
},
- "time": "2016-07-18T04:51:16+00:00",
+ "time": "2016-07-18 04:51:16",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1675,7 +1613,7 @@
"ext-gd": "*",
"php": ">=5.3"
},
- "time": "2015-01-02T12:21:25+00:00",
+ "time": "2015-01-02 12:21:25",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1712,7 +1650,7 @@
"mediawiki/mediawiki-codesniffer": "0.5.0",
"phpunit/phpunit": "4.6.*"
},
- "time": "2017-01-23T16:52:10+00:00",
+ "time": "2017-01-23 16:52:10",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1759,7 +1697,7 @@
"phpunit/phpunit": "4.8.*",
"squizlabs/php_codesniffer": "2.3.*"
},
- "time": "2016-12-24T09:16:21+00:00",
+ "time": "2016-12-24 09:16:21",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1791,7 +1729,7 @@
"require": {
"php": ">=5.3.0"
},
- "time": "2016-12-14T14:29:29+00:00",
+ "time": "2016-12-14 14:29:29",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1829,7 +1767,7 @@
"require": {
"php": ">=5.3.0"
},
- "time": "2016-10-10T12:19:37+00:00",
+ "time": "2016-10-10 12:19:37",
"type": "library",
"extra": {
"branch-alias": {
@@ -1886,7 +1824,7 @@
"suggest": {
"pear/auth_sasl": "Install optionally via your project's
composer.json"
},
- "time": "2017-01-14T18:19:55+00:00",
+ "time": "2017-01-14 18:19:55",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1940,7 +1878,7 @@
"require": {
"php": ">=5.3.0"
},
- "time": "2015-09-11T15:10:35+00:00",
+ "time": "2015-09-11 15:10:35",
"type": "library",
"extra": {
"branch-alias": {
@@ -1971,100 +1909,6 @@
]
},
{
- "name": "symfony/process",
- "version": "v3.0.9",
- "version_normalized": "3.0.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/symfony/process.git";,
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505";,
- "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
- "shasum": ""
- },
- "require": {
- "php": ">=5.5.9"
- },
- "time": "2016-07-28T11:13:34+00:00",
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev"
- }
- },
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Symfony\\Component\\Process\\": ""
- },
- "exclude-from-classmap": [
- "/Tests/"
- ]
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Fabien Potencier",
- "email": "[email protected]"
- },
- {
- "name": "Symfony Community",
- "homepage": "https://symfony.com/contributors";
- }
- ],
- "description": "Symfony Process Component",
- "homepage": "https://symfony.com";
- },
- {
- "name": "wikimedia/remex-html",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/wikimedia/mediawiki-libs-RemexHtml.git";,
- "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32"
- },
- "dist": {
- "type": "zip",
- "url":
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32";,
- "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32",
- "shasum": ""
- },
- "require": {
- "ext-mbstring": "*",
- "wikimedia/utfnormal": "1.*"
- },
- "require-dev": {
- "mediawiki/mediawiki-codesniffer": "0.7.2",
- "phpunit/phpunit": "4.*"
- },
- "time": "2017-02-24T05:24:34+00:00",
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "RemexHtml\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/";,
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Tim Starling",
- "email": "[email protected]"
- }
- ],
- "description": "Fast HTML 5 parser"
- },
- {
"name": "oojs/oojs-ui",
"version": "v0.19.4",
"version_normalized": "0.19.4.0",
@@ -2088,7 +1932,7 @@
"mediawiki/mediawiki-codesniffer": "0.6.0",
"phpunit/phpunit": "4.8.21"
},
- "time": "2017-02-28T22:56:52+00:00",
+ "time": "2017-02-28 22:56:52",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -2146,6 +1990,159 @@
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
},
{
+ "name": "symfony/process",
+ "version": "v3.0.9",
+ "version_normalized": "3.0.9.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/symfony/process.git";,
+ "reference": "768debc5996f599c4372b322d9061dba2a4bf505"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505";,
+ "reference": "768debc5996f599c4372b322d9061dba2a4bf505",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.5.9"
+ },
+ "time": "2016-07-28 11:13:34",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.0-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Symfony\\Component\\Process\\": ""
+ },
+ "exclude-from-classmap": [
+ "/Tests/"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Fabien Potencier",
+ "email": "[email protected]"
+ },
+ {
+ "name": "Symfony Community",
+ "homepage": "https://symfony.com/contributors";
+ }
+ ],
+ "description": "Symfony Process Component",
+ "homepage": "https://symfony.com";
+ },
+ {
+ "name": "ruflin/elastica",
+ "version": "5.1.0",
+ "version_normalized": "5.1.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/ruflin/Elastica.git";,
+ "reference": "tags/5.1.0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
+ "reference": "tags/5.1.0",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.6.0",
+ "psr/log": "~1.0"
+ },
+ "require-dev": {
+ "aws/aws-sdk-php": "~3.0",
+ "guzzlehttp/guzzle": "~6.0"
+ },
+ "suggest": {
+ "aws/aws-sdk-php": "Allow using IAM authentication with Amazon
ElasticSearch Service",
+ "egeloen/http-adapter": "Allow using httpadapter transport",
+ "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport",
+ "monolog/monolog": "Logging request"
+ },
+ "time": "2017-02-15 11:19:35",
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "5.1.x-dev"
+ }
+ },
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "Elastica\\": "lib/Elastica/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Nicolas Ruflin",
+ "homepage": "http://ruflin.com/";
+ }
+ ],
+ "description": "Elasticsearch Client",
+ "homepage": "http://elastica.io/";,
+ "keywords": [
+ "client",
+ "search"
+ ]
+ },
+ {
+ "name": "wikimedia/remex-html",
+ "version": "1.0.0",
+ "version_normalized": "1.0.0.0",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/wikimedia/mediawiki-libs-RemexHtml.git";,
+ "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32"
+ },
+ "dist": {
+ "type": "zip",
+ "url":
"https://api.github.com/repos/wikimedia/mediawiki-libs-RemexHtml/zipball/c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32";,
+ "reference": "c58f9e0264dabfeb0865f7ea9dbb0a67ce771c32",
+ "shasum": ""
+ },
+ "require": {
+ "ext-mbstring": "*",
+ "wikimedia/utfnormal": "1.*"
+ },
+ "require-dev": {
+ "mediawiki/mediawiki-codesniffer": "0.7.2",
+ "phpunit/phpunit": "4.*"
+ },
+ "time": "2017-02-24 05:24:34",
+ "type": "library",
+ "installation-source": "dist",
+ "autoload": {
+ "psr-4": {
+ "RemexHtml\\": "src/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/";,
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Tim Starling",
+ "email": "[email protected]"
+ }
+ ],
+ "description": "Fast HTML 5 parser"
+ },
+ {
"name": "wikimedia/timestamp",
"version": "v1.0.0",
"version_normalized": "1.0.0.0",
@@ -2168,7 +2165,7 @@
"mediawiki/mediawiki-codesniffer": "0.7.2",
"phpunit/phpunit": "4.8.24"
},
- "time": "2016-09-30T10:00:56+00:00",
+ "time": "2016-09-30 10:00:56",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -2189,39 +2186,7 @@
"email": "[email protected]"
}
],
-<<<<<<< HEAD (c0a280 Update Elastica to 5.1.0)
- "description": "Pimple, a simple Dependency Injection Container",
- "homepage": "http://pimple.sensiolabs.org";,
- "keywords": [
- "container",
- "dependency injection"
- ]
- },
- {
- "name": "ruflin/elastica",
- "version": "5.1.0",
- "version_normalized": "5.1.0.0",
- "source": {
- "type": "git",
- "url": "https://github.com/ruflin/Elastica.git";,
- "reference": "tags/5.1.0"
- },
- "dist": {
- "type": "zip",
- "url": "https://github.com/ruflin/Elastica/archive/5.1.0.zip";,
- "reference": null,
- "shasum": null
- },
- "type": "library",
- "installation-source": "dist",
- "autoload": {
- "psr-4": {
- "Elastica\\": "lib/Elastica/"
- }
- }
-=======
"description": "Creation, parsing, and conversion of timestamps",
"homepage": "https://www.mediawiki.org/wiki/Timestamp";
->>>>>>> BRANCH (feb01a Add wikimedia/timestamp 1.0.0)
}
]
--
To view, visit https://gerrit.wikimedia.org/r/340767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib89daa99761b17dd6d90317f259bf0f554abd70f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es5
Gerrit-Owner: DCausse <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
