diff --git a/.github/settings.yml b/.github/settings.yml index 50a9ba1..508bad1 100644 --- a/.github/settings.yml +++ b/.github/settings.yml @@ -11,9 +11,6 @@ branches: required_status_checks: contexts: - "Coding Standards" - - "Tests (php7.1, lowest)" - - "Tests (php7.1, locked)" - - "Tests (php7.1, highest)" - "Tests (php7.2, lowest)" - "Tests (php7.2, locked)" - "Tests (php7.2, highest)" diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index d1ce15a..ec01298 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -21,27 +21,27 @@ 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" - run: php7.1 $(which composer) normalize --dry-run + run: php7.2 $(which composer) normalize --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 tests: name: "Tests" @@ -51,7 +51,6 @@ jobs: strategy: matrix: php-binary: - - php7.1 - php7.2 - php7.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index bf04163..698eca2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,4 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ## Unreleased -For a full diff see [`1.23.0...master`](https://github.com/localheinz/php-cs-fixer-config/compare/1.23.0...master). +For a full diff see [`1.24.0...master`](https://github.com/localheinz/php-cs-fixer-config/compare/1.24.0...master). + +### Fixed + +* Dropped support for PHP 7.1 ([#221](https://github.com/localheinz/php-cs-fixer-config/pull/221)), by [@localheinz](https://github.com/localheinz) diff --git a/composer.json b/composer.json index dc1e748..2cf982a 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "friendsofphp/php-cs-fixer": "~2.16.0" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 6ae773a..5a162f5 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": "271397eab91ecf945aa1980e20ab168a", + "content-hash": "afc59c14dfff5356db71ae2b52e909cf", "packages": [ { "name": "composer/semver", @@ -3090,7 +3090,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^7.1" + "php": "^7.2" }, "platform-dev": [] }