Merge 4.x into 5.x

sonata-project · Dec 5, 2023 · cf27647 · cf27647
2 parents 6515b58 + c40d82d
commit cf27647
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -57,6 +57,11 @@ jobs:
                       allowed-to-fail: false
                       symfony-require: 6.3.*
                       variant: symfony/symfony:"6.3.*"
+                    - php-version: '8.2'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 7.0.*
+                      variant: symfony/symfony:"7.0.*"
 
         steps:
             - name: Checkout

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.15.0](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.14.1...4.15.0) - 2023-12-04
+### Added
+- [[#1780](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1780)] Support for Symfony 7. ([@jordisala1991](https://github.com/jordisala1991))
+
 ## [4.14.1](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/compare/4.14.0...4.14.1) - 2023-11-20
 ### Fixed
 - [[#1767](https://github.com/sonata-project/SonataDoctrineORMAdminBundle/pull/1767)] DateTimeRangeFilter exception occurs when either the `start` or `end` field is empty. ([@tonyaxo](https://github.com/tonyaxo))

diff --git a/composer.json b/composer.json
@@ -33,24 +33,24 @@
         "sonata-project/admin-bundle": "^4.18",
         "sonata-project/exporter": "^2.0 || ^3.0",
         "sonata-project/form-extensions": "^1.19 || ^2.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/console": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/doctrine-bridge": "^5.4 || ^6.2",
-        "symfony/form": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/options-resolver": "^5.4 || ^6.2",
-        "symfony/property-access": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/console": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/doctrine-bridge": "^5.4 || ^6.2 || ^7.0",
+        "symfony/form": "^5.4 || ^6.2 || ^7.0",
+        "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-foundation": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/options-resolver": "^5.4 || ^6.2 || ^7.0",
+        "symfony/property-access": "^5.4 || ^6.2 || ^7.0",
         "symfony/security-acl": "^3.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^7.0",
+        "dama/doctrine-test-bundle": "^8.0",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "friendsofphp/php-cs-fixer": "^3.4",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.2 || ^5.0",
         "phpstan/extension-installer": "^1.0",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
@@ -62,13 +62,13 @@
         "rector/rector": "^0.18",
         "sonata-project/block-bundle": "^5.0",
         "sonata-project/entity-audit-bundle": "^1.1",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/css-selector": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
+        "symfony/css-selector": "^5.4 || ^6.2 || ^7.0",
         "symfony/panther": "^2.0.1",
-        "symfony/phpunit-bridge": "^6.2",
-        "symfony/templating": "^5.4 || ^6.2",
-        "symfony/uid": "^5.4 || ^6.2",
-        "symfony/yaml": "^5.4 || ^6.2",
+        "symfony/phpunit-bridge": "^6.2 || ^7.0",
+        "symfony/templating": "^5.4 || ^6.2 || ^7.0",
+        "symfony/uid": "^5.4 || ^6.2 || ^7.0",
+        "symfony/yaml": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "^5.7",
         "weirdan/doctrine-psalm-plugin": "^2.0"
     },

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -27,7 +27,7 @@
 final class Configuration implements ConfigurationInterface
 {
     /**
-     * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
+     * @psalm-suppress UndefinedInterfaceMethod
      *
      * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
      */

diff --git a/tests/App/config/config.yml b/tests/App/config/config.yml
@@ -28,6 +28,7 @@ parameters:
 doctrine:
     dbal:
         url: "%env(resolve:DATABASE_URL)%"
+        use_savepoints: true
     orm:
         auto_generate_proxy_classes: true
         auto_mapping: true