diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index a2137aa09a..e859baace9 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -11,7 +11,7 @@ jobs: - name: 'Setup PHP' uses: 'shivammathur/setup-php@v2' with: - php-version: '7.4' + php-version: '8.0' coverage: 'none' extensions: 'json, mbstring, tokenizer' tools: 'composer-normalize:2.28.0, php-cs-fixer:3.9.5' @@ -31,9 +31,6 @@ jobs: strategy: matrix: php: - - '7.2' - - '7.3' - - '7.4' - '8.0' - '8.1' dependencies: @@ -43,7 +40,7 @@ jobs: include: # Test with the lowest set of dependencies - dependencies: 'lowest' - php: '7.2' + php: '8.0' elasticsearch: '7.15.2' fail-fast: false steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0dd75ebd06..d6760d1ca2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/ruflin/Elastica/compare/7.3.0...master) ### Backward Compatibility Breaks +* Dropped support for PHP <8.0 [#2131](https://github.com/ruflin/Elastica/pull/2131) ### Added ### Changed ### Deprecated diff --git a/composer.json b/composer.json index b6f59cff15..009423bc15 100644 --- a/composer.json +++ b/composer.json @@ -15,20 +15,19 @@ ], "homepage": "http://elastica.io/", "require": { - "php": "^7.2 || ^8.0", + "php": "~8.0.0 || ~8.1.0", "ext-json": "*", "elasticsearch/elasticsearch": "^7.10", "nyholm/dsn": "^2.0.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "symfony/deprecation-contracts": "^2.2 || ^3.0", - "symfony/polyfill-php73": "^1.19" + "symfony/deprecation-contracts": "^3.0" }, "require-dev": { "aws/aws-sdk-php": "^3.155", - "guzzlehttp/guzzle": "^6.3 || ^7.2", + "guzzlehttp/guzzle": "^7.2", "phpstan/phpstan": "^1.5", "phpstan/phpstan-phpunit": "^1.1", - "phpunit/phpunit": "^8.5.8 || ^9.4", + "phpunit/phpunit": "^9.5", "symfony/phpunit-bridge": "^6.0" }, "suggest": { diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d038053d76..3509ed09e1 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine +FROM php:8.0-fpm-alpine COPY --from=composer /usr/bin/composer /usr/bin/composer diff --git a/src/Query/Match.php b/src/Query/Match.php deleted file mode 100644 index 5e76eabc99..0000000000 --- a/src/Query/Match.php +++ /dev/null @@ -1,18 +0,0 @@ - - * - * @deprecated since version 7.1.0, use the MatchQuery class instead. - */ -class Match extends MatchQuery -{ -}