Skip to content

Commit 65df44c

Browse files
localheinzlocalheinz
authored
Merge pull request #499 from ergebnis/fix/php7.4
Fix: Drop support for PHP 7.4
2 parents 0e8a6f5 + 06d4ace commit 65df44c

12 files changed

Lines changed: 19 additions & 188 deletions

‎.github/settings.yml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ branches:
1414
required_approving_review_count: 1
1515
required_status_checks:
1616
contexts:
17-
- "Code Coverage (7.4, locked)"
18-
- "Coding Standards (7.4, locked)"
19-
- "Dependency Analysis (7.4, locked)"
20-
- "Static Code Analysis (7.4, locked)"
21-
- "Tests (7.4, highest)"
22-
- "Tests (7.4, locked)"
23-
- "Tests (7.4, lowest)"
17+
- "Code Coverage (8.0, locked)"
18+
- "Coding Standards (8.0, locked)"
19+
- "Dependency Analysis (8.0, locked)"
20+
- "Static Code Analysis (8.0, locked)"
2421
- "Tests (8.0, highest)"
2522
- "Tests (8.0, locked)"
2623
- "Tests (8.0, lowest)"

‎.github/workflows/integrate.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
php-version:
25-
- "7.4"
25+
- "8.0"
2626

2727
dependencies:
2828
- "locked"
@@ -90,7 +90,7 @@ jobs:
9090
strategy:
9191
matrix:
9292
php-version:
93-
- "7.4"
93+
- "8.0"
9494

9595
dependencies:
9696
- "locked"
@@ -132,7 +132,7 @@ jobs:
132132
strategy:
133133
matrix:
134134
php-version:
135-
- "7.4"
135+
- "8.0"
136136

137137
dependencies:
138138
- "locked"
@@ -183,7 +183,7 @@ jobs:
183183
strategy:
184184
matrix:
185185
php-version:
186-
- "7.4"
186+
- "8.0"
187187
- "8.0"
188188
- "8.1"
189189

@@ -232,7 +232,7 @@ jobs:
232232
strategy:
233233
matrix:
234234
php-version:
235-
- "7.4"
235+
- "8.0"
236236

237237
dependencies:
238238
- "locked"

‎.github/workflows/renew.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
strategy:
1919
matrix:
2020
php-version:
21-
- "7.4"
21+
- "8.0"
2222

2323
dependencies:
2424
- "locked"

‎.phive/composer-require-checker‎

160 KB
Binary file not shown.

‎.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="^2.1.0" installed="2.1.0" location="./.phive/composer-require-checker" copy="true"/>
3+
<phar name="composer-require-checker" version="^3.8.0" installed="3.8.0" location="./.phive/composer-require-checker" copy="true"/>
44
</phive>

‎CHANGELOG.md‎

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

1313
- Dropped support for PHP 7.2 ([#496]), by [@localheinz]
1414
- Dropped support for PHP 7.3 ([#498]), by [@localheinz]
15+
- Dropped support for PHP 7.4 ([#499]), by [@localheinz]
1516

1617
## [`1.0.0`][1.0.0]
1718

@@ -454,6 +455,7 @@ For a full diff see [`362c7ea...0.1.0`][362c7ea...0.1.0].
454455
[#395]: https://github.com/ergebnis/phpstan-rules/pull/395
455456
[#496]: https://github.com/ergebnis/phpstan-rules/pull/496
456457
[#498]: https://github.com/ergebnis/phpstan-rules/pull/498
458+
[#499]: https://github.com/ergebnis/phpstan-rules/pull/498
457459

458460
[@ergebnis]: https://github.com/ergebnis
459461
[@Great-Antique]: https://github.com/Great-Antique

‎composer.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"source": "https://github.com/ergebnis/phpstan-rules"
2121
},
2222
"require": {
23-
"php": "~7.4.0 || ~8.0.0 || ~8.1.0",
23+
"php": "~8.0.0 || ~8.1.0",
2424
"ext-mbstring": "*",
2525
"nikic/php-parser": "^4.2.3",
2626
"phpstan/phpstan": "^1.0.0"
@@ -37,8 +37,7 @@
3737
"phpunit/phpunit": "^8.5.26",
3838
"psalm/plugin-phpunit": "~0.16.1",
3939
"psr/container": "^1.0.0",
40-
"vimeo/psalm": "^4.22",
41-
"zendframework/zend-servicemanager": "^2.0.0"
40+
"vimeo/psalm": "^4.22"
4241
},
4342
"autoload": {
4443
"psr-4": {
@@ -56,7 +55,7 @@
5655
"infection/extension-installer": true
5756
},
5857
"platform": {
59-
"php": "7.4.29"
58+
"php": "8.0.27"
6059
},
6160
"preferred-install": "dist",
6261
"sort-packages": true

‎composer.lock‎

Lines changed: 3 additions & 96 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎test/Fixture/Methods/NoParameterWithContainerTypeDeclarationRule/Failure/ClassWithMethodWithParameterWithServiceLocatorInterfaceAsTypeDeclaration.php‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎test/Fixture/Methods/NoParameterWithContainerTypeDeclarationRule/Failure/InterfaceWithMethodWithParameterWithServiceLocatorInterfaceAsTypeDeclaration.php‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)