From aa8e22007eff6d51a4b0cc3948faaf739f36dc09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20de=20Guillebon?= Date: Thu, 5 Nov 2020 14:28:15 +0100 Subject: [PATCH] Support previously unsupported elasticsearch library version 7.4.0 (#1864) * Remove unsupported elasticseach library version 7.4.0 * Add changelog --- CHANGELOG.md | 1 + composer.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be7a6bee05..160a4e933c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * Added `weighted_avg` to aggregations DSL [#1814](https://github.com/ruflin/Elastica/pull/1814) * Supported `guzzlehttp/guzzle` 7.x [#1816](https://github.com/ruflin/Elastica/pull/1816) * Supported PHP 8.0 [#1794](https://github.com/ruflin/Elastica/pull/1794) +* Supported BC break on `elasticsearch/elasticsearch` version `7.4.0` [#1864](https://github.com/ruflin/Elastica/pull/1864) * Added support for defining a connection pool with DSN. Example: `pool(http://127.0.0.1 http://127.0.0.2/bar?timeout=4)` [#1808](https://github.com/ruflin/Elastica/pull/1808) * Added `Elastica\Aggregation\Composite` aggregation [#1804](https://github.com/ruflin/Elastica/pull/1804) * Added `symfony/deprecation-contracts` package to handle deprecations [#1823](https://github.com/ruflin/Elastica/pull/1823) diff --git a/composer.json b/composer.json index 354dc47408..12cad6d4d5 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "php": "^7.2 || ^8.0", "ext-json": "*", "psr/log": "^1.0", - "elasticsearch/elasticsearch": "^7.1.1 !=7.4.0", + "elasticsearch/elasticsearch": "^7.1.1", "nyholm/dsn": "^2.0.0", "symfony/deprecation-contracts": "^2.2" },