Skip to content

Commit 349159f

Browse files
committed
Merge branch '8.3'
2 parents ce46edd + ecb1790 commit 349159f

40 files changed

+1395
-573
lines changed

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
STACK_VERSION:
3-
- 8.2.0-SNAPSHOT
3+
- 8.3.0-SNAPSHOT
44

55
PHP_VERSION:
66
- 8.1-cli

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
matrix:
1212
php-version: [7.4, 8.0, 8.1]
1313
os: [ubuntu-latest]
14-
es-version: [8.2.0-SNAPSHOT]
14+
es-version: [8.3.0-SNAPSHOT]
1515

1616
steps:
1717
- name: Checkout

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"license": "MIT",
1212
"require": {
1313
"php": "^7.4 || ^8.0",
14-
"elastic/transport": "^8.0",
14+
"elastic/transport": "^8.3",
1515
"psr/http-client": "^1.0",
1616
"psr/http-message": "^1.0",
1717
"psr/log": "^1|^2|^3",

phpstan.neon

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
parameters:
22
ignoreErrors:
33
- '#PHPDoc tag @param has invalid value#'
4-
- '#PHPDoc tag @throws with type#'

src/Client.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
final class Client
2929
{
3030
const CLIENT_NAME = 'es';
31-
const VERSION = '8.x';
31+
const VERSION = '8.3.0';
3232

3333
use ClientEndpointsTrait;
3434
use EndpointTrait;

src/Endpoints/AsyncSearch.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Elastic\Elasticsearch\Exception\MissingParameterException;
2121
use Elastic\Elasticsearch\Exception\ServerResponseException;
2222
use Elastic\Elasticsearch\Response\Elasticsearch;
23-
use Elastic\Transport\Exception\NoAliveException;
23+
use Elastic\Transport\Exception\NoNodeAvailableException;
2424
use Http\Promise\Promise;
2525

2626
/**
@@ -43,7 +43,7 @@ class AsyncSearch extends AbstractEndpoint
4343
* } $params
4444
*
4545
* @throws MissingParameterException if a required parameter is missing
46-
* @throws NoAliveException if all the hosts are offline
46+
* @throws NoNodeAvailableException if all the hosts are offline
4747
* @throws ClientResponseException if the status code of response is 4xx
4848
* @throws ServerResponseException if the status code of response is 5xx
4949
*
@@ -81,7 +81,7 @@ public function delete(array $params = [])
8181
* } $params
8282
*
8383
* @throws MissingParameterException if a required parameter is missing
84-
* @throws NoAliveException if all the hosts are offline
84+
* @throws NoNodeAvailableException if all the hosts are offline
8585
* @throws ClientResponseException if the status code of response is 4xx
8686
* @throws ServerResponseException if the status code of response is 5xx
8787
*
@@ -116,7 +116,7 @@ public function get(array $params = [])
116116
* } $params
117117
*
118118
* @throws MissingParameterException if a required parameter is missing
119-
* @throws NoAliveException if all the hosts are offline
119+
* @throws NoNodeAvailableException if all the hosts are offline
120120
* @throws ClientResponseException if the status code of response is 4xx
121121
* @throws ServerResponseException if the status code of response is 5xx
122122
*
@@ -192,8 +192,7 @@ public function status(array $params = [])
192192
* body: array, // The search definition using the Query DSL
193193
* } $params
194194
*
195-
* @throws MissingParameterException if a required parameter is missing
196-
* @throws NoAliveException if all the hosts are offline
195+
* @throws NoNodeAvailableException if all the hosts are offline
197196
* @throws ClientResponseException if the status code of response is 4xx
198197
* @throws ServerResponseException if the status code of response is 5xx
199198
*

src/Endpoints/Autoscaling.php

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
use Elastic\Elasticsearch\Exception\MissingParameterException;
2121
use Elastic\Elasticsearch\Exception\ServerResponseException;
2222
use Elastic\Elasticsearch\Response\Elasticsearch;
23-
use Elastic\Transport\Exception\NoAliveException;
23+
use Elastic\Transport\Exception\NoNodeAvailableException;
2424
use Http\Promise\Promise;
2525

2626
/**
@@ -43,7 +43,7 @@ class Autoscaling extends AbstractEndpoint
4343
* } $params
4444
*
4545
* @throws MissingParameterException if a required parameter is missing
46-
* @throws NoAliveException if all the hosts are offline
46+
* @throws NoNodeAvailableException if all the hosts are offline
4747
* @throws ClientResponseException if the status code of response is 4xx
4848
* @throws ServerResponseException if the status code of response is 5xx
4949
*
@@ -67,6 +67,20 @@ public function deleteAutoscalingPolicy(array $params = [])
6767
* Gets the current autoscaling capacity based on the configured autoscaling policy. Designed for indirect use by ECE/ESS and ECK. Direct use is not supported.
6868
*
6969
* @see https://www.elastic.co/guide/en/elasticsearch/reference/current/autoscaling-get-autoscaling-capacity.html
70+
*
71+
* @param array{
72+
* pretty: boolean, // Pretty format the returned JSON response. (DEFAULT: false)
73+
* human: boolean, // Return human readable values for statistics. (DEFAULT: true)
74+
* error_trace: boolean, // Include the stack trace of returned errors. (DEFAULT: false)
75+
* source: string, // The URL-encoded request definition. Useful for libraries that do not accept a request body for non-POST requests.
76+
* filter_path: list, // A comma-separated list of filters used to reduce the response.
77+
* } $params
78+
*
79+
* @throws NoNodeAvailableException if all the hosts are offline
80+
* @throws ClientResponseException if the status code of response is 4xx
81+
* @throws ServerResponseException if the status code of response is 5xx
82+
*
83+
* @return Elasticsearch|Promise
7084
*/
7185
public function getAutoscalingCapacity(array $params = [])
7286
{
@@ -96,7 +110,7 @@ public function getAutoscalingCapacity(array $params = [])
96110
* } $params
97111
*
98112
* @throws MissingParameterException if a required parameter is missing
99-
* @throws NoAliveException if all the hosts are offline
113+
* @throws NoNodeAvailableException if all the hosts are offline
100114
* @throws ClientResponseException if the status code of response is 4xx
101115
* @throws ServerResponseException if the status code of response is 5xx
102116
*
@@ -132,7 +146,7 @@ public function getAutoscalingPolicy(array $params = [])
132146
* } $params
133147
*
134148
* @throws MissingParameterException if a required parameter is missing
135-
* @throws NoAliveException if all the hosts are offline
149+
* @throws NoNodeAvailableException if all the hosts are offline
136150
* @throws ClientResponseException if the status code of response is 4xx
137151
* @throws ServerResponseException if the status code of response is 5xx
138152
*

0 commit comments

Comments
 (0)