Skip to content

Commit 06dfbd7

Browse files
authored
Allow packages from "symfony/*" ^7 (#952)
1 parent 02528b5 commit 06dfbd7

4 files changed

Lines changed: 30 additions & 25 deletions

File tree

.github/workflows/test.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ jobs:
6363
allowed-to-fail: false
6464
symfony-require: 6.4.*
6565
variant: symfony/symfony:"6.4.*"
66+
- php-version: '8.2'
67+
dependencies: highest
68+
allowed-to-fail: false
69+
symfony-require: 7.0.*
70+
variant: symfony/symfony:"7.0.*"
6671

6772
steps:
6873
- name: Checkout

composer.json

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,30 +27,30 @@
2727
"doctrine/persistence": "^3.0.2",
2828
"sonata-project/doctrine-extensions": "^1.13 || ^2.0",
2929
"sonata-project/form-extensions": "^1.4 || ^2.0",
30-
"symfony/config": "^5.4 || ^6.2",
31-
"symfony/console": "^5.4 || ^6.2",
32-
"symfony/dependency-injection": "^5.4 || ^6.2",
33-
"symfony/form": "^5.4 || ^6.2",
34-
"symfony/framework-bundle": "^5.4 || ^6.2",
35-
"symfony/http-foundation": "^5.4 || ^6.2",
36-
"symfony/http-kernel": "^5.4 || ^6.2",
37-
"symfony/options-resolver": "^5.4 || ^6.2",
38-
"symfony/routing": "^5.4 || ^6.2",
39-
"symfony/translation": "^5.4 || ^6.2",
40-
"symfony/validator": "^5.4 || ^6.2",
30+
"symfony/config": "^5.4 || ^6.2 || ^7.0",
31+
"symfony/console": "^5.4 || ^6.2 || ^7.0",
32+
"symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
33+
"symfony/form": "^5.4 || ^6.2 || ^7.0",
34+
"symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
35+
"symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
36+
"symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
37+
"symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
38+
"symfony/routing": "^5.4 || ^6.2 || ^7.0",
39+
"symfony/translation": "^5.4 || ^6.2 || ^7.0",
40+
"symfony/validator": "^5.4 || ^6.2 || ^7.0",
4141
"twig/twig": "^3.0"
4242
},
4343
"require-dev": {
44-
"dama/doctrine-test-bundle": "^7.0",
44+
"dama/doctrine-test-bundle": "^8.0.1",
4545
"doctrine/doctrine-bundle": "^2.7",
4646
"doctrine/mongodb-odm": "^2.4",
4747
"doctrine/orm": "^2.14",
4848
"friendsofphp/php-cs-fixer": "^3.4",
4949
"knplabs/knp-menu": "^3.0",
5050
"knplabs/knp-menu-bundle": "^3.0",
5151
"masterminds/html5": "^2.7",
52-
"matthiasnoback/symfony-config-test": "^4.2",
53-
"matthiasnoback/symfony-dependency-injection-test": "^4.0",
52+
"matthiasnoback/symfony-config-test": "^4.2 || ^5.1",
53+
"matthiasnoback/symfony-dependency-injection-test": "^4.0 || ^5.0",
5454
"phpstan/extension-installer": "^1.0",
5555
"phpstan/phpstan": "^1.0",
5656
"phpstan/phpstan-phpunit": "^1.0",
@@ -63,14 +63,14 @@
6363
"sonata-project/admin-bundle": "^4.28",
6464
"sonata-project/block-bundle": "^4.11 || ^5.0",
6565
"sonata-project/doctrine-orm-admin-bundle": "^4.0",
66-
"symfony/asset": "^5.4 || ^6.2",
67-
"symfony/browser-kit": "^5.4 || ^6.2",
68-
"symfony/filesystem": "^5.4 || ^6.2",
69-
"symfony/phpunit-bridge": "^6.2",
70-
"symfony/security-bundle": "^5.4 || ^6.2",
71-
"symfony/security-csrf": "^5.4 || ^6.2",
72-
"symfony/twig-bundle": "^5.4 || ^6.2",
73-
"symfony/yaml": "^5.4 || ^6.2",
66+
"symfony/asset": "^5.4 || ^6.2 || ^7.0",
67+
"symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
68+
"symfony/filesystem": "^5.4 || ^6.2 || ^7.0",
69+
"symfony/phpunit-bridge": "^6.2 || ^7.0",
70+
"symfony/security-bundle": "^5.4 || ^6.2 || ^7.0",
71+
"symfony/security-csrf": "^5.4 || ^6.2 || ^7.0",
72+
"symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
73+
"symfony/yaml": "^5.4 || ^6.2 || ^7.0",
7474
"vimeo/psalm": "^5.0"
7575
},
7676
"conflict": {

src/DependencyInjection/Configuration.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
final class Configuration implements ConfigurationInterface
4444
{
4545
/**
46-
* @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
46+
* @psalm-suppress UndefinedInterfaceMethod
4747
*
4848
* @see https://github.com/psalm/psalm-plugin-symfony/issues/174
4949
*/

tests/App/config/config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ framework:
77
enabled: true
88
translator:
99
enabled: true
10-
validation:
11-
enable_annotations: false
1210
router:
1311
utf8: true
1412
http_method_override: false
@@ -39,6 +37,8 @@ doctrine:
3937
dbal:
4038
driver: pdo_sqlite
4139
path: "%app.base_dir%sonata_classification_test.db3"
40+
# "dama/doctrine-test-bundle" relies on savepoints.
41+
use_savepoints: true
4242
orm:
4343
entity_managers:
4444
default:

0 commit comments

Comments
 (0)