Fix: Bring back support for PHP 7.1

ergebnis · Dec 19, 2019 · fc47645 · fc47645
1 parent 3ed2f1c
commit fc47645
Show file tree

Hide file tree

Showing 6 changed files with 387 additions and 432 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/stale.yml b/.github/stale.yml
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"
@@ -144,6 +144,7 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - 7.1
           - 7.2
           - 7.3
           - 7.4
@@ -210,7 +211,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/setup-php@v1
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -225,8 +226,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/Integration/phpunit.xml --coverage-clover=build/logs/clover.xml
+      - name: "Dump Xdebug filter with phpunit/phpunit"
+        run: vendor/bin/phpunit --configuration=test/Integration/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/Integration/phpunit.xml --coverage-clover=build/logs/clover.xml --prepend=.build/phpunit/xdebug-filter.php
 
       - name: "Send code coverage report to Codecov.io"
         env:
@@ -250,7 +254,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/setup-php@v1
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -265,5 +269,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=93 --min-msi=83
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 [`0.14.1...master`][0.14.1...master].
+For a full diff see [`0.14.2...master`][0.14.2...master].
+
+## [`0.14.2`][0.14.2]
+
+For a full diff see [`0.14.1...0.14.2`][0.14.1...0.14.2].
+
+### Fixed
+
+* Brought back support for PHP 7.1 ([#166]), by [@localheinz]
 
 ## [`0.14.1`][0.14.1]
 
@@ -287,6 +295,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
 [0.13.0]: https://github.com/ergebnis/phpstan-rules/releases/tag/0.13.0
 [0.14.0]: https://github.com/ergebnis/phpstan-rules/releases/tag/0.14.0
 [0.14.1]: https://github.com/ergebnis/phpstan-rules/releases/tag/0.14.1
+[0.14.2]: https://github.com/ergebnis/phpstan-rules/releases/tag/0.14.2
 
 [362c7ea...0.1.0]: https://github.com/ergebnis/phpstan-rules/compare/362c7ea...0.1.0
 [0.1.0...0.2.0]: https://github.com/ergebnis/phpstan-rules/compare/0.1.0...0.2.0
@@ -308,7 +317,8 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
 [0.12.2...0.13.0]: https://github.com/ergebnis/phpstan-rules/compare/0.12.2...0.13.0
 [0.13.0...0.14.0]: https://github.com/ergebnis/phpstan-rules/compare/0.13.0...0.14.0
 [0.14.0...0.14.1]: https://github.com/ergebnis/phpstan-rules/compare/0.14.0...0.14.1
-[0.14.1...master]: https://github.com/ergebnis/phpstan-rules/compare/0.14.1...master
+[0.14.1...0.14.2]: https://github.com/ergebnis/phpstan-rules/compare/0.14.1...0.14.2
+[0.14.2...master]: https://github.com/ergebnis/phpstan-rules/compare/0.14.2...master
 
 [#1]: https://github.com/ergebnis/phpstan-rules/pull/1
 [#4]: https://github.com/ergebnis/phpstan-rules/pull/4
@@ -354,6 +364,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
 [#157]: https://github.com/ergebnis/phpstan-rules/pull/157
 [#158]: https://github.com/ergebnis/phpstan-rules/pull/158
 [#161]: https://github.com/ergebnis/phpstan-rules/pull/161
+[#166]: https://github.com/ergebnis/phpstan-rules/pull/166
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz
diff --git a/composer.json b/composer.json
@@ -16,20 +16,20 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.1",
     "ext-mbstring": "*",
     "nikic/php-parser": "^4.2.3",
     "phpstan/phpstan": "~0.11.15 || ~0.12.0"
   },
   "require-dev": {
-    "ergebnis/composer-normalize": "^2.0.1",
-    "ergebnis/php-cs-fixer-config": "~1.1.1",
-    "ergebnis/test-util": "~0.9.0",
+    "ergebnis/composer-normalize": "^1.3.1",
+    "ergebnis/php-cs-fixer-config": "~1.1.2",
+    "ergebnis/test-util": "~0.9.1",
     "infection/infection": "~0.13.6",
     "nette/di": "^3.0.1",
     "phpstan/phpstan-deprecation-rules": "~0.11.2",
     "phpstan/phpstan-strict-rules": "~0.11.1",
-    "phpunit/phpunit": "^8.5.0",
+    "phpunit/phpunit": "^7.5.18",
     "psr/container": "^1.0.0",
     "zendframework/zend-servicemanager": "^2.0.0"
   },