Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 81fbecb

Browse files
committedDec 19, 2019
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()`.

0 commit comments

Comments
 (0)
Please sign in to comment.