EBernhardson has submitted this change and it was merged.
Change subject: Merge remote-tracking branch 'origin/master' into es2.x
......................................................................
Merge remote-tracking branch 'origin/master' into es2.x
Change-Id: Id542ef40595b93d5c5af806cce15df7068462d95
---
M composer.lock
M composer/autoload_static.php
M composer/installed.json
3 files changed, 96 insertions(+), 66 deletions(-)
Approvals:
EBernhardson: Verified; Looks good to me, approved
diff --git a/composer.lock b/composer.lock
index 02a2aad..6434fca 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,13 +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 (6fbbc9 Update default branch)
- "hash": "ab4d86afae911d53afb28b77fe7ae5d8",
- "content-hash": "c39b250acbb8e348d46509fcdaef24b0",
-=======
- "hash": "92fec9f4618c90943af51d690cc7393f",
- "content-hash": "55f53c0a9cecd4c22bf025f3f955591a",
->>>>>>> BRANCH (f3a65a Add justinrainbow/json-schema)
+ "hash": "4064fbe009ba723670ebb861d9793b95",
+ "content-hash": "f5361eb3e8f8ba3336d2089ccd5b38cc",
"packages": [
{
"name": "composer/semver",
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 20402df..4d23593 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -28,6 +28,10 @@
array (
'Monolog\\' => 8,
),
+ 'J' =>
+ array (
+ 'JsonSchema\\' => 11,
+ ),
'F' =>
array (
'Firebase\\JWT\\' => 13,
@@ -67,6 +71,10 @@
'Monolog\\' =>
array (
0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
+ ),
+ 'JsonSchema\\' =>
+ array (
+ 0 => __DIR__ . '/..' . '/justinrainbow/json-schema/src/JsonSchema',
),
'Firebase\\JWT\\' =>
array (
@@ -450,6 +458,33 @@
'Firebase\\JWT\\SignatureInvalidException' => __DIR__ . '/..' .
'/firebase/php-jwt/src/SignatureInvalidException.php',
'HtmlFormatter\\HtmlFormatter' => __DIR__ . '/..' .
'/wikimedia/html-formatter/src/HtmlFormatter.php',
'IPSet\\IPSet' => __DIR__ . '/..' . '/wikimedia/ip-set/src/IPSet.php',
+ 'JsonSchema\\Constraints\\CollectionConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/CollectionConstraint.php',
+ 'JsonSchema\\Constraints\\Constraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/Constraint.php',
+ 'JsonSchema\\Constraints\\ConstraintInterface' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/ConstraintInterface.php',
+ 'JsonSchema\\Constraints\\EnumConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/EnumConstraint.php',
+ 'JsonSchema\\Constraints\\Factory' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/Factory.php',
+ 'JsonSchema\\Constraints\\FormatConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/FormatConstraint.php',
+ 'JsonSchema\\Constraints\\NumberConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/NumberConstraint.php',
+ 'JsonSchema\\Constraints\\ObjectConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/ObjectConstraint.php',
+ 'JsonSchema\\Constraints\\SchemaConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/SchemaConstraint.php',
+ 'JsonSchema\\Constraints\\StringConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/StringConstraint.php',
+ 'JsonSchema\\Constraints\\TypeConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/TypeConstraint.php',
+ 'JsonSchema\\Constraints\\UndefinedConstraint' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Constraints/UndefinedConstraint.php',
+ 'JsonSchema\\Exception\\InvalidArgumentException' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidArgumentException.php',
+ 'JsonSchema\\Exception\\InvalidSchemaMediaTypeException' => __DIR__ .
'/..' .
'/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSchemaMediaTypeException.php',
+ 'JsonSchema\\Exception\\InvalidSourceUriException' => __DIR__ . '/..'
.
'/justinrainbow/json-schema/src/JsonSchema/Exception/InvalidSourceUriException.php',
+ 'JsonSchema\\Exception\\JsonDecodingException' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Exception/JsonDecodingException.php',
+ 'JsonSchema\\Exception\\ResourceNotFoundException' => __DIR__ . '/..'
.
'/justinrainbow/json-schema/src/JsonSchema/Exception/ResourceNotFoundException.php',
+ 'JsonSchema\\Exception\\UriResolverException' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Exception/UriResolverException.php',
+ 'JsonSchema\\RefResolver' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/RefResolver.php',
+ 'JsonSchema\\Uri\\Retrievers\\AbstractRetriever' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/AbstractRetriever.php',
+ 'JsonSchema\\Uri\\Retrievers\\Curl' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/Curl.php',
+ 'JsonSchema\\Uri\\Retrievers\\FileGetContents' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/FileGetContents.php',
+ 'JsonSchema\\Uri\\Retrievers\\PredefinedArray' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/PredefinedArray.php',
+ 'JsonSchema\\Uri\\Retrievers\\UriRetrieverInterface' => __DIR__ .
'/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/Retrievers/UriRetrieverInterface.php',
+ 'JsonSchema\\Uri\\UriResolver' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/UriResolver.php',
+ 'JsonSchema\\Uri\\UriRetriever' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Uri/UriRetriever.php',
+ 'JsonSchema\\Validator' => __DIR__ . '/..' .
'/justinrainbow/json-schema/src/JsonSchema/Validator.php',
'Kafka\\Client' => __DIR__ . '/..' .
'/nmred/kafka-php/src/Kafka/Client.php',
'Kafka\\ClusterMetaData' => __DIR__ . '/..' .
'/nmred/kafka-php/src/Kafka/ClusterMetaData.php',
'Kafka\\Consumer' => __DIR__ . '/..' .
'/nmred/kafka-php/src/Kafka/Consumer.php',
diff --git a/composer/installed.json b/composer/installed.json
index 59f3f51..856f676 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -1751,64 +1751,6 @@
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";
},
{
-<<<<<<< HEAD (6fbbc9 Update default branch)
- "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-18 07:56:36",
- "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"
-=======
"name": "justinrainbow/json-schema",
"version": "1.6.1",
"version_normalized": "1.6.1.0",
@@ -1874,7 +1816,65 @@
"keywords": [
"json",
"schema"
->>>>>>> BRANCH (f3a65a Add justinrainbow/json-schema)
+ ]
+ },
+ {
+ "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-18 07:56:36",
+ "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"
]
}
]
--
To view, visit https://gerrit.wikimedia.org/r/286764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id542ef40595b93d5c5af806cce15df7068462d95
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es2.x
Gerrit-Owner: EBernhardson <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
