diff --git a/.travis.yml b/.travis.yml index 0f7c06a802..54fc23a561 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ env: - DOCKER_VERSION=17.09.0 - DOCKER_COMPOSE_VERSION=1.17.1 matrix: - - TARGET="71" - TARGET="72" - TARGET="73" - TARGET="Lint" diff --git a/CHANGELOG.md b/CHANGELOG.md index ceefb7a099..4340994d63 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file based on the ### Backward Compatibility Breaks * The class `\Elastica\QueryBuilder\Version\Version240` has been moved to `\Elastica\QueryBuilder\Version\Version700` [#1693](https://github.com/ruflin/Elastica/pull/1693) +* Dropped support for PHP 7.1 ### Bugfixes diff --git a/README.md b/README.md index 08f916148d..7905e19e9d 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ This project tries to follow Elasticsearch in terms of [End of Life](https://www | Elastica | ElasticSearch | elasticsearch-php | PHP | | --------------------------------------------------------------------------------------- | ------------- | ----------------- | -------- | -| [7.x](https://github.com/ruflin/Elastica/tree/master) | 7.x | ^7.0 | ^7.1 | +| [7.x](https://github.com/ruflin/Elastica/tree/master) | 7.x | ^7.0 | ^7.2 | | [6.x](https://github.com/ruflin/Elastica/tree/6.x) | 6.x | ^6.0 | ^7.0 | | [5.x](https://github.com/ruflin/Elastica/tree/5.x) | 5.x | ^5.0 | \>=5.6 | | [3.2.3](https://github.com/ruflin/Elastica/tree/3.2.3) (unmaintained) | 2.4.0 | no | \>=5.4 | diff --git a/composer.json b/composer.json index d02237ee4e..a830113284 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "ext-json": "*", "psr/log": "~1.0", "elasticsearch/elasticsearch": "^7.0" diff --git a/env/elastica/Docker71 b/env/elastica/Docker71 deleted file mode 100644 index 26f282cd49..0000000000 --- a/env/elastica/Docker71 +++ /dev/null @@ -1,38 +0,0 @@ -# This image is the base image for the Elastica development and includes all parts which rarely change -# PHP 7 Docker file with Composer installed -FROM php:7.1 -MAINTAINER Nicolas Ruflin - -RUN apt-get update && apt-get install -y \ - cloc \ - git \ - graphviz \ - libxslt-dev \ - nano \ - zip unzip \ - wget - # XSL and Graphviz for PhpDocumentor - -RUN docker-php-ext-install sockets xsl - -RUN rm -r /var/lib/apt/lists/* - -# Xdebug for coverage report -RUN pecl install xdebug-2.7.2 - -## PHP Configuration - -RUN echo "memory_limit=1024M" >> /usr/local/etc/php/conf.d/memory-limit.ini -RUN echo "date.timezone=UTC" >> /usr/local/etc/php/conf.d/timezone.ini - -# Install and setup composer -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer -ENV COMPOSER_HOME /root/composer - -# Add composer bin to the environment -ENV PATH=/root/composer/vendor/bin:$PATH - -COPY composer.json /root/composer/ - -# Install development tools, prefer source removed as automatic fallback now -RUN composer global install diff --git a/env/elastica/composer.json b/env/elastica/composer.json index a3ef208929..4c1e306c13 100644 --- a/env/elastica/composer.json +++ b/env/elastica/composer.json @@ -12,7 +12,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "phpdocumentor/phpdocumentor": "^2.9", "mayflower/php-codebrowser": "~1.1", "pdepend/pdepend": "^2.5",