diff --git a/CHANGELOG.md b/CHANGELOG.md index f0a26b3b..8d1bc2ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 4.6.0 (2024-??-??) + +- Add support for `ruflin/elastica` 8.x + ## 4.5.0 (2024-04-10) - Add support for `doctrine/phpcr-odm` 2.x diff --git a/composer.json b/composer.json index 52ef47bf..a460e62f 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,7 @@ "phpstan/phpstan-phpunit": "1.4.0", "phpunit/phpunit": "10.5.20", "rector/rector": "1.1.0", - "ruflin/elastica": "^7.3", + "ruflin/elastica": "^7.3 || ^8.0", "solarium/solarium": "^6.2", "symfony/cache": "^5.4 || ^6.3 || ^7.0", "twig/twig": "^2.13 || ^3.0" @@ -69,7 +69,8 @@ "config": { "allow-plugins": { "composer/package-versions-deprecated": true, - "phpstan/extension-installer": true + "phpstan/extension-installer": true, + "php-http/discovery": false } }, "minimum-stability": "dev" diff --git a/lib/Adapter/Elastica/composer.json b/lib/Adapter/Elastica/composer.json index 971132ce..fa11d67b 100644 --- a/lib/Adapter/Elastica/composer.json +++ b/lib/Adapter/Elastica/composer.json @@ -7,7 +7,7 @@ "require": { "php": "^8.1", "pagerfanta/core": "^4.0", - "ruflin/elastica": "^7.3" + "ruflin/elastica": "^7.3 || ^8.0" }, "require-dev": { "phpunit/phpunit": "^10.5" @@ -20,5 +20,10 @@ "Tests/" ] }, + "config": { + "allow-plugins": { + "php-http/discovery": false + } + }, "minimum-stability": "dev" }