jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/340770 )
Change subject: Merge remote-tracking branch 'origin/master' into es5
......................................................................
Merge remote-tracking branch 'origin/master' into es5
Change-Id: Icb1ef1cd2d0e7e01134a5f4dac62ee42f9dbfe36
---
M composer.lock
M composer/LICENSE
M composer/autoload_static.php
M composer/installed.json
4 files changed, 193 insertions(+), 254 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 9e55fae..d730ca9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,12 +4,7 @@
"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)
+ "content-hash": "1255177b764145c4f6bb83813f0fac08",
"packages": [
{
"name": "composer/semver",
@@ -1124,17 +1119,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 +1163,7 @@
"client",
"search"
],
- "time": "2016-03-18T07:56:36+00:00"
->>>>>>> BRANCH (feb01a Add wikimedia/timestamp 1.0.0)
+ "time": "2017-02-15T11:19:35+00:00"
},
{
"name": "stil/gd-text",
diff --git a/composer/LICENSE b/composer/LICENSE
index b0794ff..1a28124 100644
--- a/composer/LICENSE
+++ b/composer/LICENSE
@@ -1,3 +1,4 @@
+
Copyright (c) 2016 Nils Adermann, Jordi Boggiano
Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -17,3 +18,4 @@
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
+
diff --git a/composer/autoload_static.php b/composer/autoload_static.php
index 345b7ad..c7065a5 100644
--- a/composer/autoload_static.php
+++ b/composer/autoload_static.php
@@ -256,18 +256,20 @@
'Composer\\Semver\\Semver' => __DIR__ . '/..' .
'/composer/semver/src/Semver.php',
'Composer\\Semver\\VersionParser' => __DIR__ . '/..' .
'/composer/semver/src/VersionParser.php',
'Console_Getopt' => __DIR__ . '/..' .
'/pear/console_getopt/Console/Getopt.php',
- 'Elastica\\AbstractScript' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/AbstractScript.php',
'Elastica\\AbstractUpdateAction' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/AbstractUpdateAction.php',
'Elastica\\Aggregation\\AbstractAggregation' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/AbstractAggregation.php',
'Elastica\\Aggregation\\AbstractSimpleAggregation' => __DIR__ . '/..'
. '/ruflin/elastica/lib/Elastica/Aggregation/AbstractSimpleAggregation.php',
'Elastica\\Aggregation\\AbstractTermsAggregation' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/AbstractTermsAggregation.php',
'Elastica\\Aggregation\\Avg' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Avg.php',
+ 'Elastica\\Aggregation\\BucketScript' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/BucketScript.php',
'Elastica\\Aggregation\\Cardinality' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Cardinality.php',
+ 'Elastica\\Aggregation\\Children' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Children.php',
'Elastica\\Aggregation\\DateHistogram' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/DateHistogram.php',
'Elastica\\Aggregation\\DateRange' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/DateRange.php',
'Elastica\\Aggregation\\ExtendedStats' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/ExtendedStats.php',
'Elastica\\Aggregation\\Filter' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Filter.php',
'Elastica\\Aggregation\\Filters' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Filters.php',
+ 'Elastica\\Aggregation\\GeoCentroid' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/GeoCentroid.php',
'Elastica\\Aggregation\\GeoDistance' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/GeoDistance.php',
'Elastica\\Aggregation\\GeohashGrid' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/GeohashGrid.php',
'Elastica\\Aggregation\\GlobalAggregation' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/GlobalAggregation.php',
@@ -281,6 +283,7 @@
'Elastica\\Aggregation\\Range' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Range.php',
'Elastica\\Aggregation\\ReverseNested' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/ReverseNested.php',
'Elastica\\Aggregation\\ScriptedMetric' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/ScriptedMetric.php',
+ 'Elastica\\Aggregation\\SerialDiff' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/SerialDiff.php',
'Elastica\\Aggregation\\SignificantTerms' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/SignificantTerms.php',
'Elastica\\Aggregation\\Stats' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Stats.php',
'Elastica\\Aggregation\\Sum' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Aggregation/Sum.php',
@@ -329,46 +332,14 @@
'Elastica\\Exception\\QueryBuilderException' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Exception/QueryBuilderException.php',
'Elastica\\Exception\\ResponseException' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Exception/ResponseException.php',
'Elastica\\Exception\\RuntimeException' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Exception/RuntimeException.php',
- 'Elastica\\Filter\\AbstractFilter' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/AbstractFilter.php',
- 'Elastica\\Filter\\AbstractGeoDistance' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/AbstractGeoDistance.php',
- 'Elastica\\Filter\\AbstractGeoShape' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/AbstractGeoShape.php',
- 'Elastica\\Filter\\AbstractMulti' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/AbstractMulti.php',
- 'Elastica\\Filter\\Bool' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Bool.php',
- 'Elastica\\Filter\\BoolAnd' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/BoolAnd.php',
- 'Elastica\\Filter\\BoolFilter' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/BoolFilter.php',
- 'Elastica\\Filter\\BoolNot' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/BoolNot.php',
- 'Elastica\\Filter\\BoolOr' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/BoolOr.php',
- 'Elastica\\Filter\\Exists' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Exists.php',
- 'Elastica\\Filter\\GeoBoundingBox' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoBoundingBox.php',
- 'Elastica\\Filter\\GeoDistance' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoDistance.php',
- 'Elastica\\Filter\\GeoDistanceRange' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoDistanceRange.php',
- 'Elastica\\Filter\\GeoPolygon' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoPolygon.php',
- 'Elastica\\Filter\\GeoShapePreIndexed' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoShapePreIndexed.php',
- 'Elastica\\Filter\\GeoShapeProvided' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeoShapeProvided.php',
- 'Elastica\\Filter\\GeohashCell' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/GeohashCell.php',
- 'Elastica\\Filter\\HasChild' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/HasChild.php',
- 'Elastica\\Filter\\HasParent' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/HasParent.php',
- 'Elastica\\Filter\\Ids' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Ids.php',
- 'Elastica\\Filter\\Indices' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Indices.php',
- 'Elastica\\Filter\\Limit' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Limit.php',
- 'Elastica\\Filter\\MatchAll' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/MatchAll.php',
- 'Elastica\\Filter\\Missing' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Missing.php',
- 'Elastica\\Filter\\Nested' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Nested.php',
- 'Elastica\\Filter\\NumericRange' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/NumericRange.php',
- 'Elastica\\Filter\\Prefix' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Prefix.php',
- 'Elastica\\Filter\\Query' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Query.php',
- 'Elastica\\Filter\\Range' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Range.php',
- 'Elastica\\Filter\\Regexp' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Regexp.php',
- 'Elastica\\Filter\\Script' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Script.php',
- 'Elastica\\Filter\\Term' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Term.php',
- 'Elastica\\Filter\\Terms' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Terms.php',
- 'Elastica\\Filter\\Type' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Filter/Type.php',
'Elastica\\Index' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Index.php',
'Elastica\\IndexTemplate' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/IndexTemplate.php',
'Elastica\\Index\\Settings' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Index/Settings.php',
'Elastica\\Index\\Stats' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Index/Stats.php',
'Elastica\\JSON' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/JSON.php',
'Elastica\\Log' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Log.php',
+ 'Elastica\\Multi\\MultiBuilder' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Multi/MultiBuilder.php',
+ 'Elastica\\Multi\\MultiBuilderInterface' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Multi/MultiBuilderInterface.php',
'Elastica\\Multi\\ResultSet' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Multi/ResultSet.php',
'Elastica\\Multi\\Search' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Multi/Search.php',
'Elastica\\NameableInterface' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/NameableInterface.php',
@@ -376,36 +347,26 @@
'Elastica\\Node\\Info' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Node/Info.php',
'Elastica\\Node\\Stats' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Node/Stats.php',
'Elastica\\Param' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Param.php',
- 'Elastica\\Percolator' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Percolator.php',
'Elastica\\Query' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query.php',
'Elastica\\QueryBuilder' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder.php',
'Elastica\\QueryBuilder\\DSL' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/DSL.php',
'Elastica\\QueryBuilder\\DSL\\Aggregation' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/DSL/Aggregation.php',
- 'Elastica\\QueryBuilder\\DSL\\Filter' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/DSL/Filter.php',
'Elastica\\QueryBuilder\\DSL\\Query' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/DSL/Query.php',
'Elastica\\QueryBuilder\\DSL\\Suggest' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/DSL/Suggest.php',
'Elastica\\QueryBuilder\\Facade' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Facade.php',
'Elastica\\QueryBuilder\\Version' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version.php',
'Elastica\\QueryBuilder\\Version\\Latest' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Latest.php',
- 'Elastica\\QueryBuilder\\Version\\Version090' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version090.php',
- 'Elastica\\QueryBuilder\\Version\\Version100' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version100.php',
- 'Elastica\\QueryBuilder\\Version\\Version110' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version110.php',
- 'Elastica\\QueryBuilder\\Version\\Version120' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version120.php',
- 'Elastica\\QueryBuilder\\Version\\Version130' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version130.php',
- 'Elastica\\QueryBuilder\\Version\\Version140' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version140.php',
- 'Elastica\\QueryBuilder\\Version\\Version150' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version150.php',
+ 'Elastica\\QueryBuilder\\Version\\Version240' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/QueryBuilder/Version/Version240.php',
'Elastica\\Query\\AbstractGeoDistance' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/AbstractGeoDistance.php',
'Elastica\\Query\\AbstractGeoShape' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/AbstractGeoShape.php',
'Elastica\\Query\\AbstractQuery' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/AbstractQuery.php',
'Elastica\\Query\\Bool' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Bool.php',
'Elastica\\Query\\BoolQuery' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/BoolQuery.php',
'Elastica\\Query\\Boosting' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Boosting.php',
- 'Elastica\\Query\\Builder' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Builder.php',
'Elastica\\Query\\Common' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Common.php',
'Elastica\\Query\\ConstantScore' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/ConstantScore.php',
'Elastica\\Query\\DisMax' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/DisMax.php',
'Elastica\\Query\\Exists' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Exists.php',
- 'Elastica\\Query\\Filtered' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Filtered.php',
'Elastica\\Query\\FunctionScore' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/FunctionScore.php',
'Elastica\\Query\\Fuzzy' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Fuzzy.php',
'Elastica\\Query\\GeoBoundingBox' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/GeoBoundingBox.php',
@@ -418,18 +379,18 @@
'Elastica\\Query\\HasChild' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/HasChild.php',
'Elastica\\Query\\HasParent' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/HasParent.php',
'Elastica\\Query\\Ids' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Ids.php',
- 'Elastica\\Query\\Image' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Image.php',
'Elastica\\Query\\Indices' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Indices.php',
+ 'Elastica\\Query\\InnerHits' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/InnerHits.php',
'Elastica\\Query\\Limit' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Limit.php',
'Elastica\\Query\\Match' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Match.php',
'Elastica\\Query\\MatchAll' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/MatchAll.php',
'Elastica\\Query\\MatchPhrase' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/MatchPhrase.php',
'Elastica\\Query\\MatchPhrasePrefix' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/MatchPhrasePrefix.php',
- 'Elastica\\Query\\Missing' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Missing.php',
'Elastica\\Query\\MoreLikeThis' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/MoreLikeThis.php',
'Elastica\\Query\\MultiMatch' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/MultiMatch.php',
'Elastica\\Query\\Nested' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Nested.php',
'Elastica\\Query\\NumericRange' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/NumericRange.php',
+ 'Elastica\\Query\\Percolate' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Percolate.php',
'Elastica\\Query\\Prefix' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Prefix.php',
'Elastica\\Query\\QueryString' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/QueryString.php',
'Elastica\\Query\\Range' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Range.php',
@@ -439,7 +400,6 @@
'Elastica\\Query\\SimpleQueryString' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/SimpleQueryString.php',
'Elastica\\Query\\Term' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Term.php',
'Elastica\\Query\\Terms' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Terms.php',
- 'Elastica\\Query\\TopChildren' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/TopChildren.php',
'Elastica\\Query\\Type' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Type.php',
'Elastica\\Query\\Wildcard' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Query/Wildcard.php',
'Elastica\\Request' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Request.php',
@@ -448,14 +408,16 @@
'Elastica\\Response' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Response.php',
'Elastica\\Result' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Result.php',
'Elastica\\ResultSet' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet.php',
- 'Elastica\\ScanAndScroll' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ScanAndScroll.php',
- 'Elastica\\Script' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script.php',
- 'Elastica\\ScriptFields' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ScriptFields.php',
- 'Elastica\\ScriptFile' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ScriptFile.php',
+ 'Elastica\\ResultSet\\BuilderInterface' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet/BuilderInterface.php',
+ 'Elastica\\ResultSet\\ChainProcessor' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet/ChainProcessor.php',
+ 'Elastica\\ResultSet\\DefaultBuilder' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet/DefaultBuilder.php',
+ 'Elastica\\ResultSet\\ProcessingBuilder' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet/ProcessingBuilder.php',
+ 'Elastica\\ResultSet\\ProcessorInterface' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/ResultSet/ProcessorInterface.php',
'Elastica\\Script\\AbstractScript' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script/AbstractScript.php',
'Elastica\\Script\\Script' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script/Script.php',
'Elastica\\Script\\ScriptFields' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script/ScriptFields.php',
'Elastica\\Script\\ScriptFile' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script/ScriptFile.php',
+ 'Elastica\\Script\\ScriptId' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Script/ScriptId.php',
'Elastica\\Scroll' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Scroll.php',
'Elastica\\Search' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/Search.php',
'Elastica\\SearchableInterface' => __DIR__ . '/..' .
'/ruflin/elastica/lib/Elastica/SearchableInterface.php',
diff --git a/composer/installed.json b/composer/installed.json
index c46e538..b833da4 100644
--- a/composer/installed.json
+++ b/composer/installed.json
@@ -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",
@@ -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",
@@ -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-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": "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-15T11:19:35+00:00",
+ "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-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": "wikimedia/timestamp",
"version": "v1.0.0",
"version_normalized": "1.0.0.0",
@@ -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/340770
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb1ef1cd2d0e7e01134a5f4dac62ee42f9dbfe36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vendor
Gerrit-Branch: es5
Gerrit-Owner: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
