Skip to content

Commit

Permalink
Merge pull request #252 from ergebnis/feature/php80
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 8.0
  • Loading branch information
ergebnis-bot authored Nov 3, 2020
2 parents 6bd84bd + 9ca8302 commit 674b608
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ branches:
- "Tests (7.4, highest)"
- "Tests (7.4, locked)"
- "Tests (7.4, lowest)"
- "Tests (8.0, highest)"
- "Tests (8.0, locked)"
- "Tests (8.0, lowest)"
strict: false
restrictions:

Expand Down
1 change: 1 addition & 0 deletions .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ jobs:
- "7.2"
- "7.3"
- "7.4"
- "8.0"

dependencies:
- "lowest"
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 [`2.1.0...main`][2.1.0...main].
For a full diff see [`2.2.0...main`][2.2.0...main].

## [`2.2.0`][2.2.0]

For a full diff see [`2.1.0...2.2.0`][2.1.0...2.2.0].

### Added

* Added support for PHP 8.0 ([#252]), by [@localheinz]

## [`2.1.0`][2.1.0]

Expand Down Expand Up @@ -81,12 +89,14 @@ For a full diff see [`36912f6...1.0.0`][36912f6...1.0.0].
[2.0.0]: https://github.com/ergebnis/clock/releases/tag/2.0.0
[2.0.1]: https://github.com/ergebnis/clock/releases/tag/2.0.1
[2.1.0]: https://github.com/ergebnis/clock/releases/tag/2.1.0
[2.2.0]: https://github.com/ergebnis/clock/releases/tag/2.2.0

[36912f6...1.0.0]: https://github.com/ergebnis/clock/compare/36912f6...1.0.0
[1.0.0...2.0.0]: https://github.com/ergebnis/clock/compare/1.0.0...2.0.0
[2.0.0...2.0.1]: https://github.com/ergebnis/clock/compare/2.0.0...2.0.1
[2.0.1...2.1.0]: https://github.com/ergebnis/clock/compare/2.0.1...2.1.0
[2.1.0...main]: https://github.com/ergebnis/clock/compare/2.1.0...main
[2.1.0...2.2.0]: https://github.com/ergebnis/clock/compare/2.1.0...2.2.0
[2.2.0...main]: https://github.com/ergebnis/clock/compare/2.2.0...main

[#1]: https://github.com/ergebnis/clock/pull/1
[#2]: https://github.com/ergebnis/clock/pull/2
Expand All @@ -95,6 +105,7 @@ For a full diff see [`36912f6...1.0.0`][36912f6...1.0.0].
[#53]: https://github.com/ergebnis/clock/pull/53
[#57]: https://github.com/ergebnis/clock/pull/57
[#143]: https://github.com/ergebnis/clock/pull/143
[#252]: https://github.com/ergebnis/clock/pull/252

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
],
"require": {
"php": "^7.2"
"php": "^7.2 || ^8.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.10.0",
Expand Down
4 changes: 2 additions & 2 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 674b608

Please sign in to comment.