Skip to content

Commit

Permalink
Merge pull request #757 from ergebnis/feature/php74
Browse files Browse the repository at this point in the history
Enhancement: Add support for PHP 7.4
  • Loading branch information
localheinz committed Feb 17, 2024
2 parents b085041 + 0d464d3 commit 5f1bbba
Show file tree
Hide file tree
Showing 11 changed files with 436 additions and 316 deletions.
17 changes: 10 additions & 7 deletions .github/settings.yml
Expand Up @@ -14,13 +14,16 @@ branches:
required_approving_review_count: 1
required_status_checks:
checks:
- context: "Code Coverage (8.0, locked)"
- context: "Coding Standards (8.0, locked)"
- context: "Dependency Analysis (8.0, locked)"
- context: "Mutation Tests (8.0, locked)"
- context: "Refactoring (8.0, locked)"
- context: "Security Analysis (8.0, locked)"
- context: "Static Code Analysis (8.0, locked)"
- context: "Code Coverage (7.4, locked)"
- context: "Coding Standards (7.4, locked)"
- context: "Dependency Analysis (7.4, locked)"
- context: "Mutation Tests (7.4, locked)"
- context: "Refactoring (7.4, locked)"
- context: "Security Analysis (7.4, locked)"
- context: "Static Code Analysis (7.4, locked)"
- context: "Tests (7.4, highest)"
- context: "Tests (7.4, locked)"
- context: "Tests (7.4, lowest)"
- context: "Tests (8.0, highest)"
- context: "Tests (8.0, locked)"
- context: "Tests (8.0, lowest)"
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/integrate.yaml
Expand Up @@ -19,7 +19,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -149,7 +149,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -316,7 +316,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -366,7 +366,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down Expand Up @@ -417,6 +417,7 @@ jobs:
fail-fast: false
matrix:
php-version:
- "7.4"
- "8.0"
- "8.1"
- "8.2"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renew.yaml
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
matrix:
php-version:
- "8.0"
- "7.4"

dependencies:
- "locked"
Expand Down
2 changes: 1 addition & 1 deletion .phive/phars.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phive xmlns="https://phar.io/phive">
<phar name="composer-require-checker" version="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
<phar name="composer-require-checker" version="~3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" copy="false"/>
</phive>
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Expand Up @@ -26,7 +26,7 @@

$license->save();

$ruleSet = PhpCsFixer\Config\RuleSet\Php80::create()->withHeader($license->header());
$ruleSet = PhpCsFixer\Config\RuleSet\Php74::create()->withHeader($license->header());

$config = PhpCsFixer\Config\Factory::fromRuleSet($ruleSet);

Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -11,6 +11,7 @@ For a full diff see [`2.7.0...main`][2.7.0...main].
### Changed

- Added support for PHP 8.0 ([#756]), by [@localheinz]
- Added support for PHP 7.4 ([#757]), by [@localheinz]

## [`2.7.0`][2.7.0]

Expand Down Expand Up @@ -168,6 +169,7 @@ For a full diff see [`36912f6...1.0.0`][36912f6...1.0.0].
[#604]: https://github.com/ergebnis/clock/pull/604
[#680]: https://github.com/ergebnis/clock/pull/680
[#756]: https://github.com/ergebnis/clock/pull/756
[#757]: https://github.com/ergebnis/clock/pull/757

[@ergebnis]: https://github.com/ergebnis
[@localheinz]: https://github.com/localheinz
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -21,15 +21,15 @@
"source": "https://github.com/ergebnis/clock"
},
"require": {
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
"psr/clock": "^1.0.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.42.0",
"ergebnis/license": "^2.4.0",
"ergebnis/php-cs-fixer-config": "^6.22.0",
"ergebnis/phpunit-slow-test-detector": "^2.10.0",
"infection/infection": "~0.26.19",
"infection/infection": "~0.26.6",
"phpunit/phpunit": "^9.6.16",
"psalm/plugin-phpunit": "~0.18.4",
"rector/rector": "^1.0.1",
Expand Down Expand Up @@ -57,7 +57,7 @@
"abandoned": "report"
},
"platform": {
"php": "8.0.30"
"php": "7.4.33"
},
"preferred-install": "dist",
"sort-packages": true
Expand Down

0 comments on commit 5f1bbba

Please sign in to comment.