Fix: Bring back support for PHP 7.1

ergebnis · Dec 19, 2019 · d4733e3 · d4733e3
1 parent 92410e1
commit d4733e3
Show file tree

Hide file tree

Showing 6 changed files with 606 additions and 659 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -10,9 +10,12 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         contexts:
-          - "Coding Standards (7.2)"
+          - "Coding Standards (7.1)"
           - "Dependency Analysis (7.4)"
           - "Static Code Analysis (7.4)"
+          - "Tests (7.1, lowest)"
+          - "Tests (7.1, locked)"
+          - "Tests (7.1, highest)"
           - "Tests (7.2, lowest)"
           - "Tests (7.2, locked)"
           - "Tests (7.2, highest)"

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.2
+          - 7.1
 
     steps:
       - name: "Checkout"
@@ -141,6 +141,7 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - 7.1
           - 7.2
           - 7.3
           - 7.4
@@ -207,7 +208,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/setup-php@v1
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -222,8 +223,11 @@ jobs:
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
 
-      - name: "Collect code coverage with pcov and phpunit/phpunit"
-        run: vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-clover=build/logs/clover.xml
+      - name: "Dump Xdebug filter with phpunit/phpunit"
+        run: vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
+
+      - name: "Collect code coverage with Xdebug and phpunit/phpunit"
+        run: vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-clover=build/logs/clover.xml --prepend=.build/phpunit/xdebug-filter.php
 
       - name: "Send code coverage report to Codecov.io"
         env:
@@ -247,7 +251,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/setup-php@v1
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -262,5 +266,5 @@ jobs:
       - name: "Install locked dependencies with composer"
         run: composer install --no-interaction --no-progress --no-suggest
 
-      - name: "Run mutation tests with pcov and infection/infection"
+      - name: "Run mutation tests with Xdebug and infection/infection"
         run: vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=100 --min-msi=100
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`1.1.1...master`][1.1.1...master].
+For a full diff see [`1.1.2...master`][1.1.2...master].
+
+## [`1.1.2`][1.1.2]
+
+For a full diff see [`1.1.1...1.1.2`][1.1.1...1.1.2].
+
+### Fixed
+
+* Brought back support for PHP 7.1 ([#17]), by [@localheinz]
 
 ## [`1.1.1`][1.1.1]
 
@@ -31,14 +39,17 @@ For a full diff see [`d899e77...1.0.0`][d899e77...1.0.0].
 [1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.0.0
 [1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.0
 [1.1.1]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.1
+[1.1.2]: https://github.com/ergebnis/php-cs-fixer-config/releases/tag/1.1.2
 
 [d899e77...1.0.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/d899e77...1.0.0
 [1.0.0...1.1.0]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.0.0...1.1.0
 [1.1.0...1.1.1]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.0...1.1.1
-[1.1.1...master]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.1...master
+[1.1.1...1.1.2]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.1...1.1.2
+[1.1.2...master]: https://github.com/ergebnis/php-cs-fixer-config/compare/1.1.2...master
 
 [#3]: https://github.com/ergebnis/php-cs-fixer-config/pull/3
 [#14]: https://github.com/ergebnis/php-cs-fixer-config/pull/14
+[#17]: https://github.com/ergebnis/php-cs-fixer-config/pull/17
 
 [@linuxjuggler]: https://github.com/linuxjuggler
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
@@ -11,20 +11,20 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.1",
     "friendsofphp/php-cs-fixer": "~2.16.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.0.0",
-    "ergebnis/phpstan-rules": "~0.14.0",
-    "ergebnis/test-util": "~0.9.0",
-    "infection/infection": "~0.14.2",
+    "ergebnis/composer-normalize": "^1.3.1",
+    "ergebnis/phpstan-rules": "~0.13.0",
+    "ergebnis/test-util": "~0.9.1",
+    "infection/infection": "~0.13.6",
     "jangregor/phpstan-prophecy": "~0.4.2",
     "phpstan/extension-installer": "^1.0.3",
     "phpstan/phpstan": "~0.11.19",
     "phpstan/phpstan-deprecation-rules": "~0.11.2",
     "phpstan/phpstan-strict-rules": "~0.11.1",
-    "phpunit/phpunit": "^8.4.3"
+    "phpunit/phpunit": "^7.5.18"
   },
   "config": {
     "preferred-install": "dist",