Skip to content
This repository has been archived by the owner on Jan 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #155 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 9eb1c33 + 7b9d63c commit caf0682
Show file tree
Hide file tree
Showing 9 changed files with 458 additions and 715 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
10 changes: 0 additions & 10 deletions .github/stale.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .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 @@ -146,6 +146,7 @@ jobs:
strategy:
matrix:
php-version:
- 7.1
- 7.2
- 7.3
- 7.4
Expand Down
2 changes: 1 addition & 1 deletion .php_cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare(strict_types=1);
* @see https://github.com/ergebnis/test-util
*/

use Ergebnis\PhpCsFixer\Config;
use Localheinz\PhpCsFixer\Config;

$header = <<<'EOF'
Copyright (c) 2017 Andreas Möller
Expand Down
2 changes: 1 addition & 1 deletion .php_cs.fixture
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ declare(strict_types=1);
* @see https://github.com/ergebnis/test-util
*/

use Ergebnis\PhpCsFixer\Config;
use Localheinz\PhpCsFixer\Config;

$config = Config\Factory::fromRuleSet(new Config\RuleSet\Php71(''), [
'final_class' => false,
Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
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 [`0.9.0...master`][0.9.0...master].
For a full diff see [`0.9.1...master`][0.9.1...master].

## [`0.9.1`][0.9.1]

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

### Fixed

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

## [`0.9.0`][0.9.0]

Expand Down Expand Up @@ -59,16 +67,19 @@ For a full diff see [`0.7.0...0.8.0`][0.7.0...0.8.0].

[0.8.0]: https://github.com/ergebnis/test-util/releases/tag/0.8.0
[0.9.0]: https://github.com/ergebnis/test-util/releases/tag/0.9.0
[0.9.1]: https://github.com/ergebnis/test-util/releases/tag/0.9.1

[0.7.0...0.8.0]: https://github.com/ergebnis/test-util/compare/0.7.0...0.8.0
[0.8.0...0.9.0]: https://github.com/ergebnis/test-util/compare/0.8.0...0.9.0
[0.9.0...master]: https://github.com/ergebnis/test-util/compare/0.9.0...master
[0.9.0...0.9.1]: https://github.com/ergebnis/test-util/compare/0.9.0...0.9.1
[0.9.1...master]: https://github.com/ergebnis/test-util/compare/0.9.1...master

[#118]: https://github.com/ergebnis/test-util/pull/118
[#119]: https://github.com/ergebnis/test-util/pull/119
[#120]: https://github.com/ergebnis/test-util/pull/120
[#122]: https://github.com/ergebnis/test-util/pull/122
[#147]: https://github.com/ergebnis/test-util/pull/147
[#155]: https://github.com/ergebnis/test-util/pull/155

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@
}
],
"require": {
"php": "^7.2",
"ergebnis/classy": "~0.5.0",
"php": "^7.1",
"ergebnis/classy": "~0.5.1",
"fzaninotto/faker": "^1.9.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.0.0",
"ergebnis/php-cs-fixer-config": "~1.1.0",
"ergebnis/phpstan-rules": "~0.14.0",
"infection/infection": "~0.15.0",
"ergebnis/composer-normalize": "^1.3.1",
"ergebnis/phpstan-rules": "~0.13.0",
"infection/infection": "~0.13.6",
"localheinz/php-cs-fixer-config": "~1.24.0",
"phpstan/extension-installer": "^1.0.3",
"phpstan/phpstan": "~0.11.6",
"phpstan/phpstan": "~0.11.19",
"phpstan/phpstan-phpunit": "~0.11.2",
"phpstan/phpstan-strict-rules": "~0.11.1",
"phpunit/phpunit": "^7.5.16 || ^8.0.0"
"phpunit/phpunit": "^7.5.18"
},
"config": {
"preferred-install": "dist",
Expand Down
Loading

0 comments on commit caf0682

Please sign in to comment.