Skip to content

Commit

Permalink
Merge pull request #103 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 committed Dec 19, 2019
2 parents 3477e5c + f235b9a commit f70a22f
Show file tree
Hide file tree
Showing 7 changed files with 697 additions and 675 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
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 @@ -141,6 +141,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/classy
*/

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

$header = <<<'EOF'
Copyright (c) 2017 Andreas M枚ller
Expand Down
17 changes: 14 additions & 3 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.5.1...master`][0.5.1...master].
For a full diff see [`0.5.2...master`][0.5.2...master].

## [`0.5.2`][0.5.2]

For a full diff see [`0.5.1...0.5.2`][0.5.1...0.5.2].

### Fixed

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

## [`0.5.1`][0.5.1]

Expand Down Expand Up @@ -59,15 +67,18 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
* Dropped support for PHP 7.1 ([#77]), by [@localheinz]

[0.5.0]: https://github.com/localheinz/ergebnis/classy/releases/tag/0.5.0
[0.5.1]: https://github.com/localheinz/ergebnis/classy/releases/tag/0.5.0
[0.5.1]: https://github.com/localheinz/ergebnis/classy/releases/tag/0.5.1
[0.5.2]: https://github.com/localheinz/ergebnis/classy/releases/tag/0.5.2

[0.4.0...0.5.0]: https://github.com/ergebnis/classy/compare/0.4.0...0.5.0
[0.5.0...0.5.1]: https://github.com/ergebnis/classy/compare/0.5.0...0.5.1
[0.5.1...master]: https://github.com/ergebnis/classy/compare/0.5.1...master
[0.5.1...0.5.2]: https://github.com/ergebnis/classy/compare/0.5.1...0.5.2
[0.5.2...master]: https://github.com/ergebnis/classy/compare/0.5.2...master

[#77]: https://github.com/ergebnis/classy/pull/77
[#88]: https://github.com/ergebnis/classy/pull/88
[#100]: https://github.com/ergebnis/classy/pull/100
[#103]: https://github.com/ergebnis/classy/pull/103

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@
}
],
"require": {
"php": "^7.2",
"php": "^7.1",
"ext-tokenizer": "*"
},
"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",
"localheinz/test-util": "0.2.2",
"ergebnis/composer-normalize": "^1.3.1",
"ergebnis/phpstan-rules": "~0.13.0",
"ergebnis/test-util": "~0.7.0",
"infection/infection": "~0.13.6",
"localheinz/php-cs-fixer-config": "~1.24.0",
"phpbench/phpbench": "~0.16.10",
"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",
"zendframework/zend-file": "^2.8.3"
},
"config": {
Expand Down
Loading

0 comments on commit f70a22f

Please sign in to comment.