Skip to content

Commit

Permalink
Merge pull request #191 from ergebnis/fix/php7.1
Browse files Browse the repository at this point in the history
Fix: Bring back support for PHP 7.1
  • Loading branch information
localheinz authored Dec 19, 2019
2 parents 01abb96 + 60fafb4 commit e040c35
Show file tree
Hide file tree
Showing 5 changed files with 154 additions and 185 deletions.
5 changes: 4 additions & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-version:
- 7.2
- 7.1

steps:
- name: "Checkout"
Expand Down Expand Up @@ -143,6 +143,7 @@ jobs:
strategy:
matrix:
php-version:
- 7.1
- 7.2
- 7.3
- 7.4
Expand Down Expand Up @@ -209,7 +210,7 @@ jobs:
- name: "Install PHP with extensions"
uses: shivammathur/[email protected]
with:
coverage: pcov
coverage: xdebug
extensions: "mbstring"
php-version: ${{ matrix.php-version }}

Expand All @@ -224,8 +225,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:
Expand All @@ -249,7 +253,7 @@ jobs:
- name: "Install PHP with extensions"
uses: shivammathur/[email protected]
with:
coverage: pcov
coverage: xdebug
extensions: "mbstring"
php-version: ${{ matrix.php-version }}

Expand All @@ -264,7 +268,7 @@ 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=97 --min-msi=95

benchmarks:
Expand Down
18 changes: 14 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

For a full diff see [`0.10.0...master`][0.10.0...master].
For a full diff see [`0.10.1...master`][0.10.1...master].

## Unreleased
## [`0.10.1`][0.10.1]

For a full diff see [`0.10.0...0.10.1`][0.10.0...0.10.1].

### Fixed

* Brought back support for PHP 7.1 ([#191]), by [@localheinz]

## [`0.10.0`][0.10.0]

For a full diff see [`0.9.0...0.10.0`][0.9.0...0.10.0].

Expand Down Expand Up @@ -213,9 +221,9 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[0.8.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.8.0
[0.9.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.9.0
[0.10.0]: https://github.com/ergebnis/json-normalizer/releases/tag/0.10.0
[0.10.1]: https://github.com/ergebnis/json-normalizer/releases/tag/0.10.0

[5d8b3e2...0.1.0]: https://github.com/ergebnis/json-normalizer/compare/5d8b3e2...0.1.0

[0.1.0...0.2.0]: https://github.com/ergebnis/json-normalizer/compare/0.1.0...0.2.0
[0.2.0...0.3.0]: https://github.com/ergebnis/json-normalizer/compare/0.2.0...0.3.0
[0.3.0...0.4.0]: https://github.com/ergebnis/json-normalizer/compare/0.3.0...0.4.0
Expand All @@ -227,7 +235,8 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[0.7.0...0.8.0]: https://github.com/ergebnis/json-normalizer/compare/0.7.0...0.8.0
[0.8.0...0.9.0]: https://github.com/ergebnis/json-normalizer/compare/0.8.0...0.9.0
[0.9.0...0.10.0]: https://github.com/ergebnis/json-normalizer/compare/0.9.0...0.10.0
[0.10.0...master]: https://github.com/ergebnis/json-normalizer/compare/0.10.0...master
[0.10.0...0.10.1]: https://github.com/ergebnis/json-normalizer/compare/0.10.0...0.10.1
[0.10.1...master]: https://github.com/ergebnis/json-normalizer/compare/0.10.1...master

[#1]: https://github.com/ergebnis/json-normalizer/pull/1
[#2]: https://github.com/ergebnis/json-normalizer/pull/2
Expand Down Expand Up @@ -281,6 +290,7 @@ For a full diff see [`5d8b3e2...0.1.0`][5d8b3e2...0.1.0].
[#163]: https://github.com/ergebnis/json-normalizer/pull/163
[#176]: https://github.com/ergebnis/json-normalizer/pull/176
[#181]: https://github.com/ergebnis/json-normalizer/pull/181
[#191]: https://github.com/ergebnis/json-normalizer/pull/191

[@BackEndTea]: https://github.com/BackEndTea
[@ergebnis]: https://github.com/ergebnis
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
}
],
"require": {
"php": "^7.2",
"php": "^7.1",
"ext-json": "*",
"ergebnis/json-printer": "^3.0.1",
"ergebnis/json-printer": "^3.0.2",
"justinrainbow/json-schema": "^4.0.0 || ^5.0.0"
},
"require-dev": {
Expand All @@ -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",
Expand Down
Loading

0 comments on commit e040c35

Please sign in to comment.