Skip to content

Commit ecdb703

Browse files
authored
[Maintenance] Add PHP 8.4/8.5, Symfony 7.4, drop Symfony 5.4 and PHP 8.1 (#115)
Bumps supported versions: - Symfony: `^6.4 || ^7.4` (dropped 5.4, bumped 7.0→7.4) - PHP: `^8.2` (dropped 8.1, added 8.4/8.5 to CI) - PHPStan: `^2.0` (required for Symfony 7.4 generics support) - Rector: `^2.0` (required by PHPStan 2.0) - Dev dependencies bumped for compatibility Symfony 8 support requires migrating XML service configuration to PHP (`XmlFileLoader` removed in Sf8). That will be a separate PR.
2 parents f0a64e1 + 9c2cdb8 commit ecdb703

File tree

4 files changed

+24
-26
lines changed

4 files changed

+24
-26
lines changed

.github/workflows/build.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,9 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
php: ["8.1", "8.2", "8.3"]
21-
symfony: ["^5.4", "^6.4", "^7.0"]
22-
dbal: ["^2.0", "^3.0"]
23-
exclude:
24-
-
25-
php: "8.1"
26-
symfony: "^7.0"
27-
-
28-
symfony: "^7.0"
29-
dbal: "^2.0"
20+
php: ["8.2", "8.3", "8.4", "8.5"]
21+
symfony: ["^6.4", "^7.4"]
22+
dbal: ["^3.0"]
3023

3124
steps:
3225
-

composer.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,28 @@
2424
}
2525
],
2626
"require": {
27-
"php": "^8.1",
28-
"doctrine/data-fixtures": "^1.2",
27+
"php": "^8.2",
28+
"doctrine/data-fixtures": "^1.2 || ^2.0",
2929
"monolog/monolog": "^1.25 || ^2.1 || ^3",
30-
"symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0",
31-
"symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0",
30+
"symfony/framework-bundle": "^6.4 || ^7.4",
31+
"symfony/monolog-bridge": "^6.4 || ^7.4",
3232
"webmozart/assert": "^1.9"
3333
},
3434
"require-dev": {
35-
"doctrine/doctrine-bundle": "^2.1",
35+
"doctrine/doctrine-bundle": "^2.1 || ^3.0",
36+
"doctrine/dbal": "^3.0 || ^4.0",
3637
"doctrine/orm": "^2.7 || ^3.0",
37-
"matthiasnoback/symfony-config-test": "^4.2 || ^5.0",
38-
"matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0",
39-
"phpspec/phpspec": "^7.0",
40-
"phpunit/phpunit": "^9.4",
38+
"matthiasnoback/symfony-config-test": "^4.2 || ^5.0 || ^6.0",
39+
"matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0 || ^6.0",
40+
"phpspec/phpspec": "^7.0 || ^8.0",
41+
"phpunit/phpunit": "^9.4 || ^10.0 || ^11.0",
4142
"sylius-labs/coding-standard": "^4.0",
42-
"rector/rector": "^1.2.3",
43-
"phpstan/phpstan": "^1.10",
44-
"phpstan/phpstan-doctrine": "^1.3",
45-
"phpstan/phpstan-webmozart-assert": "^1.2",
46-
"phpstan/phpstan-symfony": "^1.3",
47-
"phpstan/phpstan-phpunit": "^1.3"
43+
"rector/rector": "^2.0",
44+
"phpstan/phpstan": "^2.0",
45+
"phpstan/phpstan-doctrine": "^2.0",
46+
"phpstan/phpstan-webmozart-assert": "^2.0",
47+
"phpstan/phpstan-symfony": "^2.0",
48+
"phpstan/phpstan-phpunit": "^2.0"
4849
},
4950
"extra": {
5051
"branch-alias": {

phpstan.neon.dist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,7 @@ parameters:
2424
- '/Static property .*\:\:\$container \(.*\\Test\\TestContainer\) does not accept Symfony\\Component\\DependencyInjection\\ContainerInterface\./'
2525
- '/PHPDoc tag \@var for variable \$manager contains unknown class Doctrine\\ODM\\MongoDB\\DocumentManager\./'
2626
- '/PHPDoc tag \@var for variable \$manager contains unknown class Doctrine\\ODM\\PHPCR\\DocumentManagerInterface\./'
27+
- '/PHPDoc tag \@var with type Doctrine\\ODM\\MongoDB\\DocumentManager is not subtype of native type/'
28+
- '/PHPDoc tag \@var with type Doctrine\\ODM\\PHPCR\\DocumentManagerInterface is not subtype of native type/'
29+
- '/Call to static method Webmozart\\Assert\\Assert::\w+\(\) .* will always evaluate to true\./'
30+
- '/PHPDoc tag \@var with type .* is not subtype of native type .*MockObject\./'

src/Suite/LazySuiteRegistry.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ final class LazySuiteRegistry implements SuiteRegistryInterface
1818
/** @var array<string, array<mixed>> */
1919
private array $suiteDefinitions = [];
2020

21-
/** @var array<string, SuiteInterface>> */
21+
/** @var array<string, SuiteInterface> */
2222
private array $suites = [];
2323

2424
public function __construct(private SuiteFactoryInterface $suiteFactory)

0 commit comments

Comments
 (0)