From d67fe8258ebd935f2932a3675a2bd192039ad0cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Sun, 17 Nov 2019 14:31:46 +0100 Subject: [PATCH] Fix: Drop support for PHP 7.1 --- .github/workflows/continuous-integration.yml | 13 +++--- CHANGELOG.md | 4 ++ composer.json | 2 +- composer.lock | 48 ++++++++++---------- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 8cf5b144..b7b18e3a 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,21 +22,21 @@ jobs: uses: actions/checkout@v1.1.0 - name: "Disable Xdebug" - run: php7.1 --ini | grep xdebug | sed 's/,$//' | xargs sudo rm + run: php7.2 --ini | grep xdebug | sed 's/,$//' | xargs sudo rm - name: "Validate composer.json and composer.lock" - run: php7.1 $(which composer) validate --strict + run: php7.2 $(which composer) validate --strict - name: "Cache dependencies installed with composer" uses: actions/cache@v1.0.0 with: path: ~/.composer/cache - key: php7.1-composer-locked-${{ hashFiles('**/composer.lock') }} + key: php7.2-composer-locked-${{ hashFiles('**/composer.lock') }} restore-keys: | - php7.1-composer-locked- + php7.2-composer-locked- - name: "Install locked dependencies with composer" - run: php7.1 $(which composer) install --no-interaction --no-progress --no-suggest + run: php7.2 $(which composer) install --no-interaction --no-progress --no-suggest - name: "Run localheinz/composer-normalize" uses: docker://localheinz/composer-normalize-action:0.5.2 @@ -44,7 +44,7 @@ jobs: args: --dry-run - name: "Run friendsofphp/php-cs-fixer" - run: php7.1 vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --using-cache=no --verbose + run: php7.2 vendor/bin/php-cs-fixer fix --config=.php_cs --diff --diff-format=udiff --using-cache=no --verbose static-code-analysis: name: "Static Code Analysis" @@ -80,7 +80,6 @@ jobs: strategy: matrix: php-binary: - - php7.1 - php7.2 - php7.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3adcab35..5153775f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 For a full diff see [`1.3.1...1.x`](https://github.com/localheinz/composer-normalize/compare/1.3.1...1.x). +### Fixed + +* Dropped support for PHP 7.1 ([#235](https://github.com/localheinz/composer-normalize/pull/235)), by [@localheinz](https://github.com/localheinz) + ## [`1.3.1`](https://github.com/localheinz/composer-normalize/releases/tag/1.3.1) #### Fixed diff --git a/composer.json b/composer.json index 037db307..096431d2 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "composer-plugin-api": "^1.1.0", "localheinz/composer-json-normalizer": "^1.0.2", "localheinz/diff": "^1.0.0", diff --git a/composer.lock b/composer.lock index d8d72060..f69ef899 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "08328de2431963cdcdcdcf563b51aabe", + "content-hash": "efd78db24f408c7d7a0e03648790f7d9", "packages": [ { "name": "justinrainbow/json-schema", @@ -1968,18 +1968,18 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" }, { "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpeople.de" }, { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpunit.de" } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", @@ -2015,18 +2015,18 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" }, { "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpeople.de" }, { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "role": "Developer", + "email": "sebastian@phpunit.de" } ], "description": "Library for handling version information and constraints", @@ -2570,8 +2570,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", @@ -2621,8 +2621,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "FilterIterator implementation that filters files based on a list of suffixes.", @@ -2663,8 +2663,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Simple template engine.", @@ -3510,8 +3510,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", @@ -4494,8 +4494,8 @@ "authors": [ { "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "role": "Developer", + "email": "arne@blankerts.de" } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", @@ -4558,7 +4558,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.1", + "php": "^7.2", "composer-plugin-api": "^1.1.0" }, "platform-dev": []