Skip to content

Commit 0661e83

Browse files
ezimuelezimuel
committed
Merge branch 'ezimuel-fix/6.6'
2 parents b9314a5 + 5dccf63 commit 0661e83

13 files changed

+54
-21
lines changed

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"psr/log": "~1.0"
2020
},
2121
"require-dev": {
22-
"cpliakas/git-wrapper": "~1.0",
22+
"cpliakas/git-wrapper": "^1.7 || ^2.1",
2323
"doctrine/inflector": "^1.1",
2424
"mockery/mockery": "^1.2",
2525
"phpstan/phpstan-shim": "^0.9 || ^0.11",

‎src/Elasticsearch/Client.php

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,10 @@ public function ping($params = [])
167167
* ['refresh'] = (boolean) Refresh the shard containing the document before performing the operation
168168
* ['routing'] = (string) Specific routing value
169169
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
170-
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
171-
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
170+
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
171+
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
172+
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
173+
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
172174
*
173175
* @param array $params Associative array of parameters
174176
*
@@ -270,8 +272,10 @@ public function delete($params)
270272
/**
271273
*
272274
* $params['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
273-
* ['_source_exclude'] = (array) A list of fields to exclude from the returned _source field
274-
* ['_source_include'] = (array) A list of fields to extract and return from the _source field
275+
* ['_source_exclude'] = (array) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
276+
* ['_source_include'] = (array) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
277+
* ['_source_excludes'] = (array) A list of fields to exclude from the returned _source field
278+
* ['_source_includes'] = (array) A list of fields to extract and return from the _source field
275279
* ['allow_no_indices'] = (bool) Whether to ignore if a wildcard indices expression resolves into no concrete indices. (This includes `_all` string or when no indices have been specified)
276280
* ['analyze_wildcard'] = (bool) Specify whether wildcard and prefix queries should be analyzed (default: false)
277281
* ['analyzer'] = (string) The analyzer to use for the query string
@@ -595,6 +599,8 @@ public function exists($params)
595599
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
596600
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
597601
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
602+
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
603+
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
598604
*
599605
* @param array $params Associative array of parameters
600606
*
@@ -836,8 +842,10 @@ public function reindex($params)
836842
* ['routing'] = (string) Specific routing value
837843
* ['source'] = (string) The URL-encoded query definition (instead of using the request body)
838844
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
839-
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
840-
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
845+
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
846+
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
847+
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
848+
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
841849
* ['body'] = (string) The URL-encoded query definition (instead of using the request body)
842850
*
843851
* @param array $params Associative array of parameters
@@ -890,8 +898,10 @@ public function explain($params)
890898
* ['sort'] = (list) A comma-separated list of <field>:<direction> pairs
891899
* ['source'] = (string) The URL-encoded request definition using the Query DSL (instead of using request body)
892900
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
893-
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
894-
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
901+
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
902+
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
903+
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
904+
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
895905
* ['stats'] = (list) Specific 'tag' of the request for logging and statistical purposes
896906
* ['suggest_field'] = (string) Specify which field to use for suggestions
897907
* ['suggest_mode'] = (enum) Specify suggest mode
@@ -1122,8 +1132,10 @@ public function update($params)
11221132
* ['sort'] = (list) A comma-separated list of <field>:<direction> pairs
11231133
* ['_source'] = (list) True or false to return the _source field or not, or a list of
11241134
* fields to return
1125-
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
1126-
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
1135+
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
1136+
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
1137+
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
1138+
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
11271139
* ['terminate_after'] = (number) The maximum number of documents to collect for each shard, upon
11281140
* reaching which the query execution will terminate early.
11291141
* ['stats'] = (list) Specific 'tag' of the request for logging and statistical purposes

‎src/Elasticsearch/Endpoints/Bulk.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ public function getParamWhitelist()
7575
'pipeline',
7676
'_source',
7777
'_source_include',
78+
'_source_includes',
7879
'_source_exclude',
80+
'_source_excludes',
7981
'pipeline'
8082
);
8183
}

‎src/Elasticsearch/Endpoints/DeleteByQuery.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,10 @@ public function getParamWhitelist()
6161
{
6262
return array(
6363
'_source',
64-
'_source_exclude',
6564
'_source_include',
65+
'_source_includes',
66+
'_source_exclude',
67+
'_source_excludes',
6668
'allow_no_indices',
6769
'analyze_wildcard',
6870
'analyzer',

‎src/Elasticsearch/Endpoints/Explain.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,10 @@ public function getParamWhitelist()
8686
'routing',
8787
'source',
8888
'_source',
89-
'_source_exclude',
9089
'_source_include',
90+
'_source_includes',
91+
'_source_exclude',
92+
'_source_excludes',
9193
'stored_fields'
9294
);
9395
}

‎src/Elasticsearch/Endpoints/Get.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,10 @@ public function getParamWhitelist()
9393
'refresh',
9494
'routing',
9595
'_source',
96-
'_source_exclude',
9796
'_source_include',
97+
'_source_includes',
98+
'_source_exclude',
99+
'_source_excludes',
98100
'version',
99101
'version_type',
100102
'stored_fields'

‎src/Elasticsearch/Endpoints/Index.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@ public function getParamWhitelist()
9494
'ttl',
9595
'version',
9696
'version_type',
97-
'pipeline'
97+
'pipeline',
98+
'if_primary_term',
99+
'if_seq_no'
98100
);
99101
}
100102

‎src/Elasticsearch/Endpoints/Mget.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ public function getParamWhitelist()
6565
'realtime',
6666
'refresh',
6767
'_source',
68-
'_source_exclude',
6968
'_source_include',
69+
'_source_includes',
70+
'_source_exclude',
71+
'_source_excludes',
7072
'routing',
7173
'stored_fields'
7274
);

‎src/Elasticsearch/Endpoints/Msearch.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ public function getParamWhitelist()
8181
'search_type',
8282
'typed_keys',
8383
'max_concurrent_shard_requests',
84-
'max_concurrent_searches'
84+
'max_concurrent_searches',
85+
'rest_total_hits_as_int'
8586
);
8687
}
8788

‎src/Elasticsearch/Endpoints/Scroll.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ public function getParamWhitelist()
9191
{
9292
return array(
9393
'scroll',
94+
'rest_total_hits_as_int'
9495
);
9596
}
9697

‎src/Elasticsearch/Endpoints/Search.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,10 @@ public function getParamWhitelist()
8585
'sort',
8686
'source',
8787
'_source',
88-
'_source_exclude',
8988
'_source_include',
89+
'_source_includes',
90+
'_source_exclude',
91+
'_source_excludes',
9092
'stats',
9193
'suggest_field',
9294
'suggest_mode',
@@ -101,7 +103,8 @@ public function getParamWhitelist()
101103
'stored_fields',
102104
'batched_reduce_size',
103105
'typed_keys',
104-
'pre_filter_shard_size'
106+
'pre_filter_shard_size',
107+
'rest_total_hits_as_int'
105108
);
106109
}
107110

‎src/Elasticsearch/Endpoints/Source/Get.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,10 @@ public function getParamWhitelist()
6363
'refresh',
6464
'routing',
6565
'_source',
66-
'_source_exclude',
6766
'_source_include',
67+
'_source_includes',
68+
'_source_exclude',
69+
'_source_excludes',
6870
'version',
6971
'version_type',
7072
);

‎src/Elasticsearch/Endpoints/UpdateByQuery.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,10 @@ public function getParamWhitelist()
9090
'size',
9191
'sort',
9292
'_source',
93-
'_source_exclude',
9493
'_source_include',
94+
'_source_includes',
95+
'_source_exclude',
96+
'_source_excludes',
9597
'terminate_after',
9698
'stats',
9799
'suggest_field',

0 commit comments

Comments
 (0)