Skip to content

Added parameters for ES 6.6 + updated cpliakas/git-wrapper version #882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"psr/log": "~1.0"
},
"require-dev": {
"cpliakas/git-wrapper": "~1.0",
"cpliakas/git-wrapper": "^1.7 || ^2.1",
"doctrine/inflector": "^1.1",
"mockery/mockery": "^1.2",
"phpstan/phpstan-shim": "^0.9 || ^0.11",
Expand Down
32 changes: 22 additions & 10 deletions src/Elasticsearch/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,10 @@ public function ping($params = [])
* ['refresh'] = (boolean) Refresh the shard containing the document before performing the operation
* ['routing'] = (string) Specific routing value
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
*
* @param array $params Associative array of parameters
*
Expand Down Expand Up @@ -270,8 +272,10 @@ public function delete($params)
/**
*
* $params['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
* ['_source_exclude'] = (array) A list of fields to exclude from the returned _source field
* ['_source_include'] = (array) A list of fields to extract and return from the _source field
* ['_source_exclude'] = (array) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_include'] = (array) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
* ['_source_excludes'] = (array) A list of fields to exclude from the returned _source field
* ['_source_includes'] = (array) A list of fields to extract and return from the _source field
* ['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)
* ['analyze_wildcard'] = (bool) Specify whether wildcard and prefix queries should be analyzed (default: false)
* ['analyzer'] = (string) The analyzer to use for the query string
Expand Down Expand Up @@ -595,6 +599,8 @@ public function exists($params)
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
*
* @param array $params Associative array of parameters
*
Expand Down Expand Up @@ -836,8 +842,10 @@ public function reindex($params)
* ['routing'] = (string) Specific routing value
* ['source'] = (string) The URL-encoded query definition (instead of using the request body)
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
* ['body'] = (string) The URL-encoded query definition (instead of using the request body)
*
* @param array $params Associative array of parameters
Expand Down Expand Up @@ -890,8 +898,10 @@ public function explain($params)
* ['sort'] = (list) A comma-separated list of <field>:<direction> pairs
* ['source'] = (string) The URL-encoded request definition using the Query DSL (instead of using request body)
* ['_source'] = (list) True or false to return the _source field or not, or a list of fields to return
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
* ['stats'] = (list) Specific 'tag' of the request for logging and statistical purposes
* ['suggest_field'] = (string) Specify which field to use for suggestions
* ['suggest_mode'] = (enum) Specify suggest mode
Expand Down Expand Up @@ -1122,8 +1132,10 @@ public function update($params)
* ['sort'] = (list) A comma-separated list of <field>:<direction> pairs
* ['_source'] = (list) True or false to return the _source field or not, or a list of
* fields to return
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field
* ['_source_include'] = (list) A list of fields to extract and return from the _source field
* ['_source_exclude'] = (list) A list of fields to exclude from the returned _source field (deprecated in ES 6.6.0)
* ['_source_include'] = (list) A list of fields to extract and return from the _source field (deprecated in ES 6.6.0)
* ['_source_excludes'] = (list) A list of fields to exclude from the returned _source field
* ['_source_includes'] = (list) A list of fields to extract and return from the _source field
* ['terminate_after'] = (number) The maximum number of documents to collect for each shard, upon
* reaching which the query execution will terminate early.
* ['stats'] = (list) Specific 'tag' of the request for logging and statistical purposes
Expand Down
2 changes: 2 additions & 0 deletions src/Elasticsearch/Endpoints/Bulk.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ public function getParamWhitelist()
'pipeline',
'_source',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'pipeline'
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/DeleteByQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,10 @@ public function getParamWhitelist()
{
return array(
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'allow_no_indices',
'analyze_wildcard',
'analyzer',
Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/Explain.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,10 @@ public function getParamWhitelist()
'routing',
'source',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'stored_fields'
);
}
Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/Get.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,10 @@ public function getParamWhitelist()
'refresh',
'routing',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'version',
'version_type',
'stored_fields'
Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/Index.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ public function getParamWhitelist()
'ttl',
'version',
'version_type',
'pipeline'
'pipeline',
'if_primary_term',
'if_seq_no'
);
}

Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/Mget.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,10 @@ public function getParamWhitelist()
'realtime',
'refresh',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'routing',
'stored_fields'
);
Expand Down
3 changes: 2 additions & 1 deletion src/Elasticsearch/Endpoints/Msearch.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ public function getParamWhitelist()
'search_type',
'typed_keys',
'max_concurrent_shard_requests',
'max_concurrent_searches'
'max_concurrent_searches',
'rest_total_hits_as_int'
);
}

Expand Down
1 change: 1 addition & 0 deletions src/Elasticsearch/Endpoints/Scroll.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public function getParamWhitelist()
{
return array(
'scroll',
'rest_total_hits_as_int'
);
}

Expand Down
7 changes: 5 additions & 2 deletions src/Elasticsearch/Endpoints/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ public function getParamWhitelist()
'sort',
'source',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'stats',
'suggest_field',
'suggest_mode',
Expand All @@ -101,7 +103,8 @@ public function getParamWhitelist()
'stored_fields',
'batched_reduce_size',
'typed_keys',
'pre_filter_shard_size'
'pre_filter_shard_size',
'rest_total_hits_as_int'
);
}

Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/Source/Get.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,10 @@ public function getParamWhitelist()
'refresh',
'routing',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'version',
'version_type',
);
Expand Down
4 changes: 3 additions & 1 deletion src/Elasticsearch/Endpoints/UpdateByQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ public function getParamWhitelist()
'size',
'sort',
'_source',
'_source_exclude',
'_source_include',
'_source_includes',
'_source_exclude',
'_source_excludes',
'terminate_after',
'stats',
'suggest_field',
Expand Down