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

Fix: Bring back support for PHP 7.1
ergebnis · Dec 19, 2019 · 0279214 · 0279214
2 parents 76494d9 + 427d6c3
commit 0279214
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 192 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, 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)"

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
 
         dependencies:
           - locked
@@ -152,6 +152,7 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - 7.1
           - 7.2
           - 7.3
           - 7.4
@@ -221,7 +222,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/[email protected]
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -236,8 +237,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:
@@ -264,7 +268,7 @@ jobs:
       - name: "Install PHP with extensions"
         uses: shivammathur/[email protected]
         with:
-          coverage: pcov
+          coverage: xdebug
           extensions: "mbstring"
           php-version: ${{ matrix.php-version }}
 
@@ -279,5 +283,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"
-        run: vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=96 --min-msi=92
+      - name: "Run mutation tests with Xdebug and infection/infection"
+        run: vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=94 --min-msi=94
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 [`2.0.0...master`][2.0.0...master].
+For a full diff see [`2.0.1...master`][2.0.1...master].
+
+## [`2.0.1`][2.0.1]
+
+For a full diff see [`2.0.0...2.0.1`][2.0.0...2.0.1].
+
+### Fixed
+
+* Brought back support for PHP 7.1 ([#53]), by [@localheinz]
 
 ## [`2.0.0`][2.0.0]
 
@@ -83,12 +91,14 @@ For a full diff see [`149a393...1.0.0`][149a393...1.0.0].
 [1.0.1]: https://github.com/ergebnis/composer-json-normalizer/releases/tag/1.0.1
 [1.0.2]: https://github.com/ergebnis/composer-json-normalizer/releases/tag/1.0.2
 [2.0.0]: https://github.com/ergebnis/composer-json-normalizer/releases/tag/2.0.0
+[2.0.1]: https://github.com/ergebnis/composer-json-normalizer/releases/tag/2.0.1
 
 [149a393...1.0.0]: https://github.com/ergebnis/composer-json-normalizer/compare/149a393...1.0.0
 [1.0.0...1.0.1]: https://github.com/ergebnis/composer-json-normalizer/compare/1.0.0...1.0.1
 [1.0.1...1.0.2]: https://github.com/ergebnis/composer-json-normalizer/compare/1.0.1...1.0.2
 [1.0.2...2.0.0]: https://github.com/ergebnis/composer-json-normalizer/compare/1.0.2...2.0.0
-[2.0.0...master]: https://github.com/ergebnis/composer-json-normalizer/compare/2.0.0...master
+[2.0.0...2.0.1]: https://github.com/ergebnis/composer-json-normalizer/compare/2.0.0...2.0.1
+[2.0.1...master]: https://github.com/ergebnis/composer-json-normalizer/compare/2.0.1...master
 
 [#1]: https://github.com/ergebnis/composer-json-normalizer/pull/1
 [#2]: https://github.com/ergebnis/composer-json-normalizer/pull/2
@@ -98,6 +108,7 @@ For a full diff see [`149a393...1.0.0`][149a393...1.0.0].
 [#44]: https://github.com/ergebnis/composer-json-normalizer/pull/44
 [#45]: https://github.com/ergebnis/composer-json-normalizer/pull/45
 [#47]: https://github.com/ergebnis/composer-json-normalizer/pull/47
+[#53]: https://github.com/ergebnis/composer-json-normalizer/pull/53
 
 [@ergebnis]: https://github.com/ergebnis
 [@localheinz]: https://github.com/localheinz
diff --git a/Makefile b/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 unit tests with phpunit/phpunit
-	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --coverage-text
+	mkdir -p .build/phpunit
+	vendor/bin/phpunit --configuration=test/Unit/phpunit.xml --dump-xdebug-filter=.build/phpunit/xdebug-filter.php
+	vendor/bin/phpunit --configuration=test/Unit/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
@@ -21,7 +23,7 @@ help: ## Displays this list of targets with descriptions
 .PHONY: mutation-tests
 mutation-tests: vendor ## Runs mutation tests with infection/infection
 	mkdir -p .build/infection
-	vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=96 --min-msi=92
+	vendor/bin/infection --ignore-msi-with-no-mutations --min-covered-msi=94 --min-msi=94
 
 .PHONY: static-code-analysis
 static-code-analysis: vendor ## Runs a static code analysis with phpstan/phpstan

diff --git a/composer.json b/composer.json
@@ -16,9 +16,9 @@
     }
   ],
   "require": {
-    "php": "^7.2",
+    "php": "^7.1",
     "ext-json": "*",
-    "ergebnis/json-normalizer": "~0.10.0",
+    "ergebnis/json-normalizer": "~0.10.1",
     "justinrainbow/json-schema": "^4.0.0 || ^5.0.0"
   },
   "require-dev": {
@@ -31,7 +31,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"
   },
   "config": {
     "preferred-install": "dist",