Skip to content

Commit 5f1bbba

Browse files
localheinzlocalheinz
authored
Merge pull request #757 from ergebnis/feature/php74
Enhancement: Add support for PHP 7.4
2 parents b085041 + 0d464d3 commit 5f1bbba

11 files changed

Lines changed: 436 additions & 316 deletions

File tree

‎.github/settings.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ branches:
1414
required_approving_review_count: 1
1515
required_status_checks:
1616
checks:
17-
- context: "Code Coverage (8.0, locked)"
18-
- context: "Coding Standards (8.0, locked)"
19-
- context: "Dependency Analysis (8.0, locked)"
20-
- context: "Mutation Tests (8.0, locked)"
21-
- context: "Refactoring (8.0, locked)"
22-
- context: "Security Analysis (8.0, locked)"
23-
- context: "Static Code Analysis (8.0, locked)"
17+
- context: "Code Coverage (7.4, locked)"
18+
- context: "Coding Standards (7.4, locked)"
19+
- context: "Dependency Analysis (7.4, locked)"
20+
- context: "Mutation Tests (7.4, locked)"
21+
- context: "Refactoring (7.4, locked)"
22+
- context: "Security Analysis (7.4, locked)"
23+
- context: "Static Code Analysis (7.4, locked)"
24+
- context: "Tests (7.4, highest)"
25+
- context: "Tests (7.4, locked)"
26+
- context: "Tests (7.4, lowest)"
2427
- context: "Tests (8.0, highest)"
2528
- context: "Tests (8.0, locked)"
2629
- context: "Tests (8.0, lowest)"

‎.github/workflows/integrate.yaml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
php-version:
22-
- "8.0"
22+
- "7.4"
2323

2424
dependencies:
2525
- "locked"
@@ -80,7 +80,7 @@ jobs:
8080
strategy:
8181
matrix:
8282
php-version:
83-
- "8.0"
83+
- "7.4"
8484

8585
dependencies:
8686
- "locked"
@@ -149,7 +149,7 @@ jobs:
149149
strategy:
150150
matrix:
151151
php-version:
152-
- "8.0"
152+
- "7.4"
153153

154154
dependencies:
155155
- "locked"
@@ -205,7 +205,7 @@ jobs:
205205
strategy:
206206
matrix:
207207
php-version:
208-
- "8.0"
208+
- "7.4"
209209

210210
dependencies:
211211
- "locked"
@@ -257,7 +257,7 @@ jobs:
257257
strategy:
258258
matrix:
259259
php-version:
260-
- "8.0"
260+
- "7.4"
261261

262262
dependencies:
263263
- "locked"
@@ -316,7 +316,7 @@ jobs:
316316
strategy:
317317
matrix:
318318
php-version:
319-
- "8.0"
319+
- "7.4"
320320

321321
dependencies:
322322
- "locked"
@@ -366,7 +366,7 @@ jobs:
366366
strategy:
367367
matrix:
368368
php-version:
369-
- "8.0"
369+
- "7.4"
370370

371371
dependencies:
372372
- "locked"
@@ -417,6 +417,7 @@ jobs:
417417
fail-fast: false
418418
matrix:
419419
php-version:
420+
- "7.4"
420421
- "8.0"
421422
- "8.1"
422423
- "8.2"

‎.github/workflows/renew.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
matrix:
1919
php-version:
20-
- "8.0"
20+
- "7.4"
2121

2222
dependencies:
2323
- "locked"

‎.phive/phars.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="composer-require-checker" version="~4.4.0" installed="4.4.0" location="./.phive/composer-require-checker" copy="false"/>
3+
<phar name="composer-require-checker" version="~3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" copy="false"/>
44
</phive>

‎.php-cs-fixer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
$license->save();
2828

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

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

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ For a full diff see [`2.7.0...main`][2.7.0...main].
1111
### Changed
1212

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

1516
## [`2.7.0`][2.7.0]
1617

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

172174
[@ergebnis]: https://github.com/ergebnis
173175
[@localheinz]: https://github.com/localheinz

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
"source": "https://github.com/ergebnis/clock"
2222
},
2323
"require": {
24-
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
24+
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
2525
"psr/clock": "^1.0.0"
2626
},
2727
"require-dev": {
2828
"ergebnis/composer-normalize": "^2.42.0",
2929
"ergebnis/license": "^2.4.0",
3030
"ergebnis/php-cs-fixer-config": "^6.22.0",
3131
"ergebnis/phpunit-slow-test-detector": "^2.10.0",
32-
"infection/infection": "~0.26.19",
32+
"infection/infection": "~0.26.6",
3333
"phpunit/phpunit": "^9.6.16",
3434
"psalm/plugin-phpunit": "~0.18.4",
3535
"rector/rector": "^1.0.1",
@@ -57,7 +57,7 @@
5757
"abandoned": "report"
5858
},
5959
"platform": {
60-
"php": "8.0.30"
60+
"php": "7.4.33"
6161
},
6262
"preferred-install": "dist",
6363
"sort-packages": true

0 commit comments

Comments
 (0)