Skip to content

Commit

Permalink
Merge 90aa9c6 into 9146c80
Browse files Browse the repository at this point in the history
  • Loading branch information
deguif committed Sep 15, 2020
2 parents 9146c80 + 90aa9c6 commit a3930ea
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Expand Up @@ -19,15 +19,15 @@ matrix:
- php: 7.4
env: RUN_TEST=true ES_VERSION=73
# Testing the library with different ES versions
- php: 7.2
- php: 7.3
env: RUN_TEST=true ES_VERSION=72
- php: 7.2
- php: 7.3
env: RUN_TEST=true ES_VERSION=71
# Running code-coverage on the lowest requirements for PHP 7.2
- php: 7.2
- php: 7.3
env: RUN_TEST=coverage COMPOSER_FLAGS="--prefer-stable --prefer-lowest" ES_VERSION=73
# Run coding-style checks on the lowest version of PHP
- php: 7.2
- php: 7.3
env: RUN_CS=true

before_install:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Expand Up @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Changed the return type of `AbstractUpdateAction::getRefresh` to `boolean|string` [#1791](https://github.com/ruflin/Elastica/pull/1791)
### Deprecated
### Removed
* Dropped support for PHP 7.2 [#1795](https://github.com/ruflin/Elastica/pull/1795)
### Fixed
* fixed issue [1789](https://github.com/ruflin/Elastica/issues/1789)
### Security
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -12,7 +12,7 @@
}
],
"require": {
"php": "^7.2",
"php": "^7.3",
"ext-json": "*",
"psr/log": "^1.0",
"elasticsearch/elasticsearch": "^7.1.1 !=7.4.0"
Expand Down
2 changes: 1 addition & 1 deletion docker/php/Dockerfile
@@ -1,4 +1,4 @@
FROM php:7.2-fpm-alpine
FROM php:7.3-fpm-alpine

COPY --from=composer /usr/bin/composer /usr/bin/composer

Expand Down

0 comments on commit a3930ea

Please sign in to comment.