Skip to content

Commit

Permalink
Drop PHP support <8.0 (#2131)
Browse files Browse the repository at this point in the history
This PR drops support for PHP <8.0 as discussed in #1961
  • Loading branch information
sidz authored Dec 7, 2022
1 parent 2823702 commit 512f731
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 29 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -31,9 +31,6 @@ jobs:
strategy:
matrix:
php:
- '7.2'
- '7.3'
- '7.4'
- '8.0'
- '8.1'
dependencies:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 4 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
18 changes: 0 additions & 18 deletions src/Query/Match.php

This file was deleted.

0 comments on commit 512f731

Please sign in to comment.