Merge pull request #280 from ergebnis/fix/php7.1

Fix: Bring back support for PHP 7.1

.github/settings.yml

@@ -10,9 +10,12 @@ branches:
         required_approving_review_count: 1
       required_status_checks:
         contexts:
-          - "Coding Standards (7.2, locked)"
+          - "Coding Standards (7.1, locked)"
           - "Dependency Analysis (7.4, locked)"
           - "Static Code Analysis (7.4, locked)"
+          - "Tests (7.1, lowest)"
+          - "Tests (7.1, locked)"
+          - "Tests (7.1, highest)"
           - "Tests (7.2, lowest)"
           - "Tests (7.2, locked)"
           - "Tests (7.2, highest)"

.github/workflows/continuous-integration.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         php-version:
-          - 7.2
+          - 7.1
 
         dependencies:
           - locked
@@ -154,6 +154,7 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - 7.1
           - 7.2
           - 7.3
           - 7.4
@@ -223,7 +224,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/[email protected]
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -238,8 +239,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:

CHANGELOG.md

@@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-For a full diff see [`2.0.1...master`][2.0.1...master]
+For a full diff see [`2.0.2...master`][2.0.2...master]
+
+## [`2.0.2`][2.0.2]
+
+For a full diff see [`2.0.1...2.0.2`][2.0.1...2.0.2]
+
+### Fixed
+
+* Brought back support for PHP 7.1 ([#280]), by [@localheinz]
 
 ## [`2.0.1`][2.0.1]
 
@@ -248,6 +256,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [1.3.1]: https://github.com/ergebnis/composer-normalize/releases/tag/1.3.1
 [2.0.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.0.0
 [2.0.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.0.1
+[2.0.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.0.2
 
 [81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
 [0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -269,7 +278,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [1.3.0...1.3.1]: https://github.com/ergebnis/composer-normalize/compare/1.3.0...1.3.1
 [1.3.1...2.0.0]: https://github.com/ergebnis/composer-normalize/compare/1.3.1...2.0.0
 [2.0.0...2.0.1]: https://github.com/ergebnis/composer-normalize/compare/2.0.0...2.0.1
-[2.0.1...master]: https://github.com/ergebnis/composer-normalize/compare/2.0.1...master
+[2.0.1...2.0.2]: https://github.com/ergebnis/composer-normalize/compare/2.0.1...2.0.2
+[2.0.2...master]: https://github.com/ergebnis/composer-normalize/compare/2.0.2...master
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -305,6 +315,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#267]: https://github.com/ergebnis/composer-normalize/pull/267
 [#270]: https://github.com/ergebnis/composer-normalize/pull/270
 [#273]: https://github.com/ergebnis/composer-normalize/pull/273
+[#280]: https://github.com/ergebnis/composer-normalize/pull/280
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz

Makefile

@@ -3,7 +3,9 @@ it: coding-standards dependency-analysis static-code-analysis tests ## Runs the
 
 .PHONY: code-coverage
 code-coverage: vendor ## Collects coverage from running integration tests with phpunit/phpunit
-	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text
+	mkdir -p .build/phpunit
+	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
+	vendor/bin/phpunit --configuration=test/Integration/phpunit.xml --coverage-text --prepend=.build/phpunit/xdebug-filter.php
 
 .PHONY: coding-standards
 coding-standards: vendor ## Fixes code style issues with friendsofphp/php-cs-fixer

composer.json

@@ -17,11 +17,11 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.1",
     "composer-plugin-api": "^1.1.0",
-    "ergebnis/composer-json-normalizer": "^2.0.0",
-    "ergebnis/json-normalizer": "~0.10.0",
-    "ergebnis/json-printer": "^3.0.1",
+    "ergebnis/composer-json-normalizer": "^2.0.1",
+    "ergebnis/json-normalizer": "~0.10.1",
+    "ergebnis/json-printer": "^3.0.2",
     "localheinz/diff": "^1.0.1"
   },
   "require-dev": {
@@ -34,7 +34,7 @@
     "phpstan/phpstan": "~0.11.19",
     "phpstan/phpstan-deprecation-rules": "~0.11.2",
     "phpstan/phpstan-strict-rules": "~0.11.1",
-    "phpunit/phpunit": "^8.5.0",
+    "phpunit/phpunit": "^7.5.18",
     "symfony/filesystem": "^4.4.1"
   },
   "config": {