Skip to content

Commit b928c57

Browse files
localheinzlocalheinz
authored
Merge pull request #929 from ergebnis/feature/php74
Enhancement: Add support for PHP 7.4
2 parents e44afce + be2587e commit b928c57

28 files changed

Lines changed: 741 additions & 308 deletions

File tree

‎.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 [`1.6.0...main`][1.6.0...main].
1111
### Added
1212

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

1516
## [`1.6.0`][1.6.0]
1617

@@ -185,6 +186,7 @@ For a full diff see [`0.4.0...0.5.0`][0.4.0...0.5.0].
185186
[#702]: https://github.com/ergebnis/classy/pull/702
186187
[#795]: https://github.com/ergebnis/classy/pull/795
187188
[#926]: https://github.com/ergebnis/classy/pull/926
189+
[#929]: https://github.com/ergebnis/classy/pull/929
188190

189191
[@ergebnis]: https://github.com/ergebnis
190192
[@localheinz]: https://github.com/localheinz

‎composer-require-checker.json‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
{
22
"symbol-whitelist": [
3-
"T_ENUM"
3+
"array",
4+
"int",
5+
"self",
6+
"string",
7+
"T_ENUM",
8+
"T_NAME_QUALIFIED",
9+
"true"
410
]
511
}

‎composer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"source": "https://github.com/ergebnis/classy"
2525
},
2626
"require": {
27-
"php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
27+
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
2828
"ext-tokenizer": "*"
2929
},
3030
"require-dev": {
@@ -33,7 +33,7 @@
3333
"ergebnis/php-cs-fixer-config": "^6.31.0",
3434
"ergebnis/phpunit-slow-test-detector": "^2.15.0",
3535
"fakerphp/faker": "^1.23.1",
36-
"infection/infection": "~0.26.16",
36+
"infection/infection": "~0.26.6",
3737
"phpunit/phpunit": "^9.6.19",
3838
"psalm/plugin-phpunit": "~0.19.0",
3939
"rector/rector": "^1.1.0",
@@ -62,7 +62,7 @@
6262
"abandoned": "report"
6363
},
6464
"platform": {
65-
"php": "8.0.30"
65+
"php": "7.4.33"
6666
},
6767
"preferred-install": "dist",
6868
"sort-packages": true

0 commit comments

Comments
 (0)