Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Bring back support for PHP 7.1 #17

Merged
merged 1 commit into from
Dec 19, 2019
Merged

Fix: Bring back support for PHP 7.1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/settings.yml
View file
Open in desktop
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
View file
Open in desktop
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 @@ -141,6 +141,7 @@ jobs:
strategy:
matrix:
php-version:
- 7.1
- 7.2
- 7.3
- 7.4
Expand Down Expand Up @@ -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 }}

Expand All @@ -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:
Expand All @@ -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 }}

Expand All @@ -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
15 changes: 13 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand All @@ -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
12 changes: 6 additions & 6 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading