Merge 1.x into 2.x

sonata-project · Dec 5, 2023 · ad851af · ad851af
2 parents d1c2016 + d7ed85b
commit ad851af
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 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/).
 
+## [1.16.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.15.0...1.16.0) - 2023-12-04
+### Added
+- [[#592](https://github.com/sonata-project/EntityAuditBundle/pull/592)] Support for Symfony 7 ([@VincentLanglet](https://github.com/VincentLanglet))
+
 ## [1.15.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.14.1...1.15.0) - 2023-09-28
 ### Added
 - [[#587](https://github.com/sonata-project/EntityAuditBundle/pull/587)] Added the `disable_foreign_keys` parameter, which disables the creation of foreign keys. ([@SavageDays](https://github.com/SavageDays))

diff --git a/composer.json b/composer.json
@@ -16,18 +16,18 @@
         "doctrine/orm": "^2.14",
         "doctrine/persistence": "^3.0",
         "psr/clock": "^1.0",
-        "symfony/config": "^5.4 || ^6.2",
-        "symfony/dependency-injection": "^5.4 || ^6.2",
-        "symfony/http-kernel": "^5.4 || ^6.2",
-        "symfony/security-core": "^5.4 || ^6.2",
+        "symfony/config": "^5.4 || ^6.2 || ^7.0",
+        "symfony/dependency-injection": "^5.4 || ^6.2 || ^7.0",
+        "symfony/http-kernel": "^5.4 || ^6.2 || ^7.0",
+        "symfony/security-core": "^5.4 || ^6.2 || ^7.0",
         "twig/twig": "^3.0"
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.7",
         "doctrine/doctrine-fixtures-bundle": "^3.4",
         "friendsofphp/php-cs-fixer": "^3.4",
         "gedmo/doctrine-extensions": "^3.7",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2.1",
+        "matthiasnoback/symfony-dependency-injection-test": "^4.2.1 || ^5.0",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.0",
         "phpstan/phpstan-doctrine": "^1.3.12",
@@ -38,15 +38,15 @@
         "psalm/plugin-phpunit": "^0.18",
         "psalm/plugin-symfony": "^5.0",
         "rector/rector": "^0.18",
-        "symfony/browser-kit": "^5.4 || ^6.2",
-        "symfony/cache": "^5.4 || ^6.2",
-        "symfony/filesystem": "^5.4 || ^6.2",
-        "symfony/framework-bundle": "^5.4 || ^6.2",
-        "symfony/http-foundation": "^5.4 || ^6.2",
+        "symfony/browser-kit": "^5.4 || ^6.2 || ^7.0",
+        "symfony/cache": "^5.4 || ^6.2 || ^7.0",
+        "symfony/filesystem": "^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/phpunit-bridge": "^6.2",
-        "symfony/security-bundle": "^5.4 || ^6.2",
-        "symfony/twig-bundle": "^5.4 || ^6.2",
-        "symfony/var-dumper": "^5.4 || ^6.2",
+        "symfony/security-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.0",
+        "symfony/var-dumper": "^5.4 || ^6.2 || ^7.0",
         "vimeo/psalm": "^5.7",
         "weirdan/doctrine-psalm-plugin": "^2.8"
     },

diff --git a/src/Action/CompareAction.php b/src/Action/CompareAction.php
@@ -32,13 +32,11 @@ public function __construct(
     public function __invoke(Request $request, string $className, string $id, ?int $oldRev = null, ?int $newRev = null): Response
     {
         if (null === $oldRev) {
-            $oldRev = $request->query->get('oldRev');
-            \assert(null !== $oldRev);
+            $oldRev = $request->query->getInt('oldRev');
         }
 
         if (null === $newRev) {
-            $newRev = $request->query->get('newRev');
-            \assert(null !== $newRev);
+            $newRev = $request->query->getInt('newRev');
         }
 
         $diff = $this->auditReader->diff($className, $id, $oldRev, $newRev);

diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
@@ -28,13 +28,11 @@ class Configuration implements ConfigurationInterface
     ];
 
     /**
-     * @psalm-suppress PossiblyNullReference, UndefinedInterfaceMethod
+     * @psalm-suppress UndefinedInterfaceMethod
      *
      * @see https://github.com/psalm/psalm-plugin-symfony/issues/174
-     *
-     * @return TreeBuilder
      */
-    public function getConfigTreeBuilder()
+    public function getConfigTreeBuilder(): TreeBuilder
     {
         $builder = new TreeBuilder('simple_things_entity_audit');
         $rootNode = $builder->getRootNode();