Skip to content

Commit 81fbecb

Browse files
committed
Merge branch 'release/7.5.0'
2 parents 94aa242 + ec0e0aa commit 81fbecb

File tree

138 files changed

+160
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

138 files changed

+160
-145
lines changed

.travis.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ matrix:
1717
fast_finish: true
1818
include:
1919
- php: 7.1
20-
env: ES_VERSION="7.4.2"
20+
env: ES_VERSION="7.5.1"
2121
- php: 7.2
22-
env: ES_VERSION="7.4.2"
22+
env: ES_VERSION="7.5.1"
2323
- php: 7.3
24-
env: ES_VERSION="7.4.2"
24+
env: ES_VERSION="7.5.1"
2525
- php: 7.4
26-
env: ES_VERSION="7.4.2"
26+
env: ES_VERSION="7.5.1"
2727
- php: 7.4
2828
env: ES_VERSION="8.0.0-SNAPSHOT"
2929
allow_failures:
@@ -41,20 +41,21 @@ install:
4141
- composer install --prefer-dist
4242

4343
before_script:
44-
- if [ $TRAVIS_PHP_VERSION = '7.3' ]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; fi
44+
- if [ $TRAVIS_PHP_VERSION = '7.4' ]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; fi
4545
- php util/RestSpecRunner.php
4646
- php util/EnsureClusterAlive.php
4747

4848
script:
49-
- if [ $TRAVIS_PHP_VERSION != '7.3' ]; then composer run-script phpcs; fi
49+
- if [ $TRAVIS_PHP_VERSION != '7.4' ]; then composer run-script phpcs; fi
5050
- if [ $TRAVIS_PHP_VERSION = '7.1' ]; then composer run-script phpstan7.1; fi
5151
- if [ $TRAVIS_PHP_VERSION = '7.2' ]; then composer run-script phpstan7.1; fi
5252
- if [ $TRAVIS_PHP_VERSION = '7.3' ]; then composer run-script phpstan; fi
53+
- if [ $TRAVIS_PHP_VERSION = '7.4' ]; then composer run-script phpstan; fi
5354
- vendor/bin/phpunit $PHPUNIT_FLAGS
5455
- vendor/bin/phpunit -c phpunit-integration.xml --group sync $PHPUNIT_FLAGS
5556

5657
after_script:
57-
- if [ $TRAVIS_PHP_VERSION = '7.3' ]; then php vendor/bin/coveralls; fi
58+
- if [ $TRAVIS_PHP_VERSION = '7.4' ]; then php vendor/bin/coveralls; fi
5859

5960
notifications:
6061
email: true

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
## Release 7.5.0
2+
3+
- Fixed `Client::extractArgument` iterable casting to array;
4+
this allows passing a `Traversable` body for some endpoints
5+
(e.g. Bulk, Msearch, MsearchTemplate)
6+
[#983](https://github.com/elastic/elasticsearch-php/pull/983)
7+
- Fixed the Response Exception if the `reason` field is null
8+
[#980](https://github.com/elastic/elasticsearch-php/pull/980)
9+
- Added support for PHP 7.4
10+
[#976](https://github.com/elastic/elasticsearch-php/pull/976)
11+
112
## Release 7.4.1
213

314
- We added the suppress operator `@` for the deprecation messages `@trigger_error()`.

src/Elasticsearch/Client.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
class Client
3434
{
35-
const VERSION = '7.4.1';
35+
const VERSION = '7.5.0';
3636

3737
/**
3838
* @var Transport
@@ -212,7 +212,7 @@ public function count(array $params = [])
212212
* $params['routing'] = (string) Specific routing value
213213
* $params['timeout'] = (time) Explicit operation timeout
214214
* $params['version'] = (number) Explicit version number for concurrency control
215-
* $params['version_type'] = (enum) Specific version type (Options = internal,external,external_gte,force)
215+
* $params['version_type'] = (enum) Specific version type (Options = internal,external,external_gte)
216216
* $params['pipeline'] = (string) The pipeline id to preprocess incoming documents with
217217
* $params['body'] = (array) The document (Required)
218218
*
@@ -590,12 +590,12 @@ public function getSource(array $params = [])
590590
* $params['index'] = (string) The name of the index (Required)
591591
* $params['type'] = DEPRECATED (string) The type of the document
592592
* $params['wait_for_active_shards'] = (string) Sets the number of shard copies that must be active before proceeding with the index operation. Defaults to 1, meaning the primary shard only. Set to `all` for all shard copies, otherwise set to any non-negative value less than or equal to the total number of copies for the shard (number of replicas + 1)
593-
* $params['op_type'] = (enum) Explicit operation type (Options = index,create) (Default = index)
593+
* $params['op_type'] = (enum) Explicit operation type. Defaults to `index` for requests with an explicit document ID, and to `create`for requests without an explicit document ID (Options = index,create)
594594
* $params['refresh'] = (enum) If `true` then refresh the affected shards to make this operation visible to search, if `wait_for` then wait for a refresh to make this operation visible to search, if `false` (the default) then do nothing with refreshes. (Options = true,false,wait_for)
595595
* $params['routing'] = (string) Specific routing value
596596
* $params['timeout'] = (time) Explicit operation timeout
597597
* $params['version'] = (number) Explicit version number for concurrency control
598-
* $params['version_type'] = (enum) Specific version type (Options = internal,external,external_gte,force)
598+
* $params['version_type'] = (enum) Specific version type (Options = internal,external,external_gte)
599599
* $params['if_seq_no'] = (number) only perform the index operation if the last operation that has changed the document has the specified sequence number
600600
* $params['if_primary_term'] = (number) only perform the index operation if the last operation that has changed the document has the specified primary term
601601
* $params['pipeline'] = (string) The pipeline id to preprocess incoming documents with

src/Elasticsearch/Endpoints/Bulk.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Class Bulk
1313
* Elasticsearch API name bulk
14-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
14+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1515
*
1616
* @category Elasticsearch
1717
* @package Elasticsearch\Endpoints

src/Elasticsearch/Endpoints/Cat/Aliases.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Aliases
1010
* Elasticsearch API name cat.aliases
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Allocation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Allocation
1010
* Elasticsearch API name cat.allocation
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Count.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Count
1010
* Elasticsearch API name cat.count
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Fielddata.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Fielddata
1010
* Elasticsearch API name cat.fielddata
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Health.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Health
1010
* Elasticsearch API name cat.health
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Help.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Help
1010
* Elasticsearch API name cat.help
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Indices.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Indices
1010
* Elasticsearch API name cat.indices
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Master.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Master
1010
* Elasticsearch API name cat.master
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/NodeAttrs.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class NodeAttrs
1010
* Elasticsearch API name cat.nodeattrs
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Nodes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Nodes
1010
* Elasticsearch API name cat.nodes
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/PendingTasks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class PendingTasks
1010
* Elasticsearch API name cat.pending_tasks
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Plugins.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Plugins
1010
* Elasticsearch API name cat.plugins
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Recovery.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Recovery
1010
* Elasticsearch API name cat.recovery
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Repositories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Repositories
1010
* Elasticsearch API name cat.repositories
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Segments.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Segments
1010
* Elasticsearch API name cat.segments
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Shards.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Shards
1010
* Elasticsearch API name cat.shards
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Snapshots.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Snapshots
1010
* Elasticsearch API name cat.snapshots
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Tasks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Tasks
1010
* Elasticsearch API name cat.tasks
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/Templates.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Templates
1010
* Elasticsearch API name cat.templates
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/Cat/ThreadPool.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class ThreadPool
1010
* Elasticsearch API name cat.thread_pool
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cat

src/Elasticsearch/Endpoints/ClearScroll.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class ClearScroll
1010
* Elasticsearch API name clear_scroll
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints

src/Elasticsearch/Endpoints/Cluster/AllocationExplain.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class AllocationExplain
1010
* Elasticsearch API name cluster.allocation_explain
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/GetSettings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class GetSettings
1010
* Elasticsearch API name cluster.get_settings
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/Health.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Health
1010
* Elasticsearch API name cluster.health
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/PendingTasks.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class PendingTasks
1010
* Elasticsearch API name cluster.pending_tasks
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/PutSettings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class PutSettings
1010
* Elasticsearch API name cluster.put_settings
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/RemoteInfo.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class RemoteInfo
1010
* Elasticsearch API name cluster.remote_info
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/Reroute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Reroute
1010
* Elasticsearch API name cluster.reroute
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/State.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class State
1010
* Elasticsearch API name cluster.state
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Cluster/Stats.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Stats
1010
* Elasticsearch API name cluster.stats
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints\Cluster

src/Elasticsearch/Endpoints/Count.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Class Count
1010
* Elasticsearch API name count
11-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
11+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1212
*
1313
* @category Elasticsearch
1414
* @package Elasticsearch\Endpoints

src/Elasticsearch/Endpoints/Create.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Class Create
1111
* Elasticsearch API name create
12-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
12+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1313
*
1414
* @category Elasticsearch
1515
* @package Elasticsearch\Endpoints

src/Elasticsearch/Endpoints/Delete.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/**
1010
* Class Delete
1111
* Elasticsearch API name delete
12-
* Generated running $ php util/GenerateEndpoints.php 7.4.2
12+
* Generated running $ php util/GenerateEndpoints.php 7.5.0
1313
*
1414
* @category Elasticsearch
1515
* @package Elasticsearch\Endpoints

0 commit comments

Comments
 (0)