Skip to content

Commit d4eac2e

Browse files
authored
Allow Symfony 8.0 (#119)
1 parent ab1cb0c commit d4eac2e

4 files changed

Lines changed: 35 additions & 27 deletions

File tree

.github/workflows/tests.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,17 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
php: [ '8.1', '8.2', '8.3', '8.4', '8.5' ]
22-
symfony: [ '5.4', '6.4', '7.4' ]
22+
symfony: [ '5.4', '6.4', '7.4', '8.0' ]
2323
dependencies: [ 'highest', 'lowest' ]
2424
exclude:
2525
- php: '8.1'
2626
symfony: '7.4'
27+
- php: '8.1'
28+
symfony: '8.0'
29+
- php: '8.2'
30+
symfony: '8.0'
31+
- php: '8.3'
32+
symfony: '8.0'
2733
services:
2834
postgres:
2935
image: postgres:17

composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,29 +34,29 @@
3434
"doctrine/dbal": "^3.8 || ^4.0",
3535
"doctrine/doctrine-bundle": "^2.12 || ^3.0",
3636
"doctrine/orm": "^2.19 || ^3.1",
37-
"symfony/config": "^5.4 || ^6.4 || ^7.0",
38-
"symfony/console": "^5.4 || ^6.4 || ^7.0",
39-
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.0",
40-
"symfony/finder": "^5.4 || ^6.4 || ^7.0",
41-
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.0",
42-
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.0",
37+
"symfony/config": "^5.4 || ^6.4 || ^7.4 || ^8.0",
38+
"symfony/console": "^5.4 || ^6.4 || ^7.4 || ^8.0",
39+
"symfony/dependency-injection": "^5.4 || ^6.4 || ^7.4 || ^8.0",
40+
"symfony/finder": "^5.4 || ^6.4 || ^7.4 || ^8.0",
41+
"symfony/framework-bundle": "^5.4 || ^6.4 || ^7.4 || ^8.0",
42+
"symfony/http-kernel": "^5.4 || ^6.4 || ^7.4 || ^8.0",
4343
"symfony/polyfill-php84": "^1.30",
44-
"symfony/property-access": "^5.4 || ^6.4 || ^7.0",
45-
"symfony/property-info": "^5.4 || ^6.4 || ^7.0",
46-
"symfony/routing": "^5.4 || ^6.4 || ^7.0"
44+
"symfony/property-access": "^5.4 || ^6.4 || ^7.4 || ^8.0",
45+
"symfony/property-info": "^5.4 || ^6.4 || ^7.4 || ^8.0",
46+
"symfony/routing": "^5.4 || ^6.4 || ^7.4 || ^8.0"
4747
},
4848
"require-dev": {
4949
"doctrine/common": "^3.2",
5050
"phpunit/phpunit": "^11.5",
51-
"symfony/cache": "^5.4 || ^6.4 || ^7.0",
52-
"symfony/doctrine-messenger": "^5.4 || ^6.4 || ^7.0",
53-
"symfony/expression-language": "^5.4 || ^6.4 || ^7.0",
54-
"symfony/filesystem": "^5.4 || ^6.4 || ^7.0",
55-
"symfony/http-client": "^5.4 || ^6.4 || ^7.0",
56-
"symfony/messenger": "^5.4 || ^6.4 || ^7.0",
57-
"symfony/process": "^5.4 || ^6.4 || ^7.0",
58-
"symfony/serializer": "^5.4 || ^6.4 || ^7.0",
59-
"symfony/yaml": "^5.4 || ^6.4 || ^7.0"
51+
"symfony/cache": "^5.4 || ^6.4 || ^7.4 || ^8.0",
52+
"symfony/doctrine-messenger": "^5.4 || ^6.4 || ^7.4 || ^8.0",
53+
"symfony/expression-language": "^5.4 || ^6.4 || ^7.4 || ^8.0",
54+
"symfony/filesystem": "^5.4 || ^6.4 || ^7.4 || ^8.0",
55+
"symfony/http-client": "^5.4 || ^6.4 || ^7.4 || ^8.0",
56+
"symfony/messenger": "^5.4 || ^6.4 || ^7.4 || ^8.0",
57+
"symfony/process": "^5.4 || ^6.4 || ^7.4 || ^8.0",
58+
"symfony/serializer": "^5.4 || ^6.4 || ^7.4 || ^8.0",
59+
"symfony/yaml": "^5.4 || ^6.4 || ^7.4 || ^8.0"
6060
},
6161
"conflict": {
6262
"symfony/cache": "<5.4",

phpstan-baseline.neon

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
parameters:
22
ignoreErrors:
33
-
4-
message: '#^Comparison operation "\>" between 7 and 5 is always true\.$#'
4+
message: '#^Comparison operation "\>" between 8 and 5 is always true\.$#'
55
identifier: greater.alwaysTrue
66
count: 1
77
path: src/Attribute/RouteParamValue/DynamicValues.php
@@ -13,7 +13,7 @@ parameters:
1313
path: src/Attribute/RouteParamValue/EnumValues.php
1414

1515
-
16-
message: '#^Comparison operation "\>" between 7 and 5 is always true\.$#'
16+
message: '#^Comparison operation "\>" between 8 and 5 is always true\.$#'
1717
identifier: greater.alwaysTrue
1818
count: 1
1919
path: src/Attribute/RouteParamValue/PropertyValues.php
@@ -73,13 +73,13 @@ parameters:
7373
path: src/Cache/RouteMetadata/YamlMetadataProvider.php
7474

7575
-
76-
message: '#^Comparison operation "\>\=" between 4 and 1 is always true\.$#'
77-
identifier: greaterOrEqual.alwaysTrue
76+
message: '#^Comparison operation "\>\=" between 0 and 1 is always false\.$#'
77+
identifier: greaterOrEqual.alwaysFalse
7878
count: 1
7979
path: src/Command/DebugCommand.php
8080

8181
-
82-
message: '#^Comparison operation "\>\=" between 7 and 7 is always true\.$#'
82+
message: '#^Comparison operation "\>\=" between 8 and 7 is always true\.$#'
8383
identifier: greaterOrEqual.alwaysTrue
8484
count: 1
8585
path: src/Command/DebugCommand.php
@@ -103,19 +103,19 @@ parameters:
103103
path: src/Command/DebugCommand.php
104104

105105
-
106-
message: '#^Strict comparison using \=\=\= between 7 and 6 will always evaluate to false\.$#'
106+
message: '#^Strict comparison using \=\=\= between 8 and 6 will always evaluate to false\.$#'
107107
identifier: identical.alwaysFalse
108108
count: 1
109109
path: src/Command/DebugCommand.php
110110

111111
-
112-
message: '#^Comparison operation "\<\=" between 7 and 5 is always false\.$#'
112+
message: '#^Comparison operation "\<\=" between 8 and 5 is always false\.$#'
113113
identifier: smallerOrEqual.alwaysFalse
114114
count: 1
115115
path: src/DependencyInjection/CompilerPass/RegisterExpressionLanguageProvidersPass.php
116116

117117
-
118-
message: '#^Comparison operation "\<\=" between 7 and 5 is always false\.$#'
118+
message: '#^Comparison operation "\<\=" between 8 and 5 is always false\.$#'
119119
identifier: smallerOrEqual.alwaysFalse
120120
count: 1
121121
path: src/DependencyInjection/CompilerPass/RegisterRouteParamServicesPass.php

tests/DependencyInjection/ConfigurationTest.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
use PHPUnit\Framework\Attributes\CoversClass;
88
use PHPUnit\Framework\Attributes\DataProvider;
9+
use PHPUnit\Framework\Attributes\RequiresMethod;
910
use PHPUnit\Framework\Attributes\TestWith;
1011
use PHPUnit\Framework\TestCase;
1112
use Sofascore\PurgatoryBundle\DependencyInjection\Configuration;
@@ -129,6 +130,7 @@ public function testDoctrineListenerPrioritiesConifgurationForSingleValue(): voi
129130
}
130131

131132
#[DataProvider('provideXMLCases')]
133+
#[RequiresMethod(XmlFileLoader::class, 'load')]
132134
public function testXMLConfiguration(string $file, array $expectedConfig): void
133135
{
134136
$container = new ContainerBuilder();

0 commit comments

Comments
 (0)