Merge upstream 1.23.0 (#7)

* DevKit updates for 1.x branch (sonata-project#656)

Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>

* Better way to deal with deprecations (sonata-project#658)

* Add support for `doctrine/persistence` 4 (sonata-project#660)

* prepare release 1.21.0 (sonata-project#661)

* Provide PHP routing file and deprecate loading XML file (sonata-project#662)

* Update CHANGELOG for version 1.22.0 (sonata-project#664)

* DevKit updates

* run rector

* DevKit updates

* DevKit updates

* Add support for Symfony 8

* Update CHANGELOG for version 1.23.0

* Fix double semicolon syntax error in LogRevisionsListener

* Reorder and ensure `ext-pdo` is properly listed in `composer.json` dependencies

* Fix RelationTest assertions to reflect updated collection counts

* Fix PHPStan error: replace empty() with strict count comparison

---------

Co-authored-by: Sonata CI <thomas+ci@sonata-project.org>
Co-authored-by: Vincent Langlet <vincentlanglet@hotmail.fr>
Co-authored-by: Vincent Langlet <VincentLanglet@users.noreply.github.com>
Co-authored-by: David Maicher <mail@dmaicher.de>

Author: 4 people

.gitattributes

@@ -11,5 +11,3 @@ rector.php export-ignore
 phpstan.neon.dist export-ignore
 phpstan-baseline.neon export-ignore
 phpstan-console-application.php export-ignore
-psalm.xml export-ignore
-psalm-baseline.xml export-ignore

.github/workflows/lint.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -53,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2, composer-normalize:2
               env:

.github/workflows/qa.yaml

@@ -29,7 +29,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 
@@ -41,30 +41,6 @@ jobs:
             - name: PHPStan
               run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github
 
-    psalm:
-        name: Psalm
-
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v4
-
-            - name: Install PHP with extensions
-              uses: shivammathur/setup-php@v2
-              with:
-                  php-version: '8.4'
-                  coverage: none
-                  tools: composer:v2
-
-            - name: Install Composer dependencies (highest)
-              uses: ramsey/composer-install@v3
-              with:
-                  dependency-versions: highest
-
-            - name: Psalm
-              run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4
-
     rector:
         name: Rector
 
@@ -77,7 +53,7 @@ jobs:
             - name: Install PHP with extensions
               uses: shivammathur/setup-php@v2
               with:
-                  php-version: '8.4'
+                  php-version: '8.5'
                   coverage: none
                   tools: composer:v2
 

.github/workflows/test-platforms.yaml

@@ -37,10 +37,10 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '8.4'
+                    - '8.5'
                 mysql-version:
-                    - '5.7'
                     - '8.0'
+                    - '8.4'
                 dependencies: [highest]
                 allowed-to-fail: [false]
 
@@ -90,7 +90,7 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '8.4'
+                    - '8.5'
                 postgres-version:
                     - '13'
                     - '14'

.github/workflows/test.yaml

@@ -30,34 +30,39 @@ jobs:
         strategy:
             matrix:
                 php-version:
-                    - '8.1'
                     - '8.2'
                     - '8.3'
                     - '8.4'
+                    - '8.5'
                 dependencies: [highest]
                 allowed-to-fail: [false]
                 symfony-require: ['']
                 variant: [normal]
                 include:
-                    - php-version: '8.1'
+                    - php-version: '8.2'
                       dependencies: lowest
                       allowed-to-fail: false
                       variant: normal
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
                       symfony-require: 6.4.*
                       variant: symfony/symfony:"6.4.*"
-                    - php-version: '8.4'
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.1.*
-                      variant: symfony/symfony:"7.1.*"
-                    - php-version: '8.4'
+                      symfony-require: 7.3.*
+                      variant: symfony/symfony:"7.3.*"
+                    - php-version: '8.5'
                       dependencies: highest
                       allowed-to-fail: false
-                      symfony-require: 7.2.*
-                      variant: symfony/symfony:"7.2.*"
+                      symfony-require: 7.4.*
+                      variant: symfony/symfony:"7.4.*"
+                    - php-version: '8.5'
+                      dependencies: highest
+                      allowed-to-fail: false
+                      symfony-require: 8.0.*
+                      variant: symfony/symfony:"8.0.*"
 
         steps:
             - name: Checkout

.gitignore

@@ -10,3 +10,4 @@ composer.lock
 phpunit.xml
 phpstan.neon
 /.phpunit.result.cache
+tests/App/config/reference.php

CHANGELOG.md

@@ -2,6 +2,25 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.23.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.22.0...1.23.0) - 2025-12-01
+### Added
+- [[#663](https://github.com/sonata-project/EntityAuditBundle/pull/663)] Support for Symfony 8 ([@dmaicher](https://github.com/dmaicher))
+
+### Removed
+- [[#663](https://github.com/sonata-project/EntityAuditBundle/pull/663)] Support for PHP 8.1 ([@dmaicher](https://github.com/dmaicher))
+- [[#663](https://github.com/sonata-project/EntityAuditBundle/pull/663)] Support for Symfony 7.1 and 7.2 ([@dmaicher](https://github.com/dmaicher))
+
+## [1.22.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.21.0...1.22.0) - 2025-10-18
+### Added
+- [[#662](https://github.com/sonata-project/EntityAuditBundle/pull/662)] Added `audit.php` routing config ([@dmaicher](https://github.com/dmaicher))
+
+### Deprecated
+- [[#662](https://github.com/sonata-project/EntityAuditBundle/pull/662)] Deprecated `audit.xml` routing config ([@dmaicher](https://github.com/dmaicher))
+
+## [1.21.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.20.0...1.21.0) - 2025-10-12
+### Added
+- [[#660](https://github.com/sonata-project/EntityAuditBundle/pull/660)] - Add support for `doctrine/persistence` 4 ([@dmaicher](https://github.com/dmaicher))
+
 ## [1.20.0](https://github.com/sonata-project/EntityAuditBundle/compare/1.19.0...1.20.0) - 2025-08-06
 ### Added
 - [[#652](https://github.com/sonata-project/EntityAuditBundle/pull/652)] Support for doctrine/dbal 4 ([@valkars](https://github.com/valkars))

Makefile

@@ -93,10 +93,6 @@ phpstan:
 	vendor/bin/phpstan --memory-limit=1G analyse
 .PHONY: phpstan
 
-psalm:
-	vendor/bin/psalm --php-version=8.4
-.PHONY: psalm
-
 rector:
 	vendor/bin/rector
 .PHONY: rector

composer.json

@@ -9,51 +9,46 @@
         "Audit"
     ],
     "require": {
-        "php": "8.3.*",
+        "php": "^8.2",
+        "ext-pdo": "*",
         "doctrine/collections": "^1.8 || ^2.0",
         "doctrine/dbal": "^3.6 || ^4.0",
         "doctrine/event-manager": "^1.2 || ^2.0",
         "doctrine/orm": "^2.14 || ^3.0",
-        "doctrine/persistence": "^3.0",
+        "doctrine/persistence": "^3.0 || ^4.0",
         "psr/clock": "^1.0",
-        "symfony/config": "^6.4 || ^7.1",
-        "symfony/dependency-injection": "^6.4 || ^7.1",
-        "symfony/http-kernel": "^6.4 || ^7.1",
-        "symfony/security-core": "^6.4 || ^7.1",
-        "twig/twig": "^3.0",
-        "ext-pdo": "*"
+        "symfony/config": "^6.4 || ^7.3 || ^8.0",
+        "symfony/dependency-injection": "^6.4 || ^7.3 || ^8.0",
+        "symfony/http-kernel": "^6.4 || ^7.3 || ^8.0",
+        "symfony/security-core": "^6.4 || ^7.3 || ^8.0",
+        "twig/twig": "^3.0"
     },
     "require-dev": {
-        "doctrine/doctrine-bundle": "^2.7",
-        "doctrine/doctrine-fixtures-bundle": "^3.4",
+        "doctrine/doctrine-bundle": "^2.17 || ^3.0",
+        "doctrine/doctrine-fixtures-bundle": "^4.2",
         "friendsofphp/php-cs-fixer": "^3.4",
         "gedmo/doctrine-extensions": "^3.15",
-        "matthiasnoback/symfony-dependency-injection-test": "^4.2.1 || ^5.0",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan": "^1.0 || ^2.0",
         "phpstan/phpstan-doctrine": "^1.3.12 || ^2.0",
         "phpstan/phpstan-phpunit": "^1.0 || ^2.0",
         "phpstan/phpstan-strict-rules": "^1.0 || ^2.0",
         "phpstan/phpstan-symfony": "^1.0 || ^2.0",
-        "phpunit/phpunit": "^9.5.13",
-        "psalm/plugin-phpunit": "^0.18 || ^0.19",
-        "psalm/plugin-symfony": "^5.0",
+        "phpunit/phpunit": "^11.5.38 || ^12.3.10",
         "rector/rector": "^1.1 || ^2.0",
-        "symfony/browser-kit": "^6.4 || ^7.1",
-        "symfony/cache": "^6.4 || ^7.1",
-        "symfony/filesystem": "^6.4 || ^7.1",
-        "symfony/framework-bundle": "^6.4 || ^7.1",
-        "symfony/http-foundation": "^6.4 || ^7.1",
-        "symfony/phpunit-bridge": "^6.4 || ^7.1",
-        "symfony/security-bundle": "^6.4 || ^7.1",
-        "symfony/twig-bundle": "^6.4 || ^7.1",
-        "symfony/var-dumper": "^6.4 || ^7.1",
-        "vimeo/psalm": "^5.7 || ^6.10"
+        "symfony/browser-kit": "^6.4 || ^7.3 || ^8.0",
+        "symfony/cache": "^6.4 || ^7.3 || ^8.0",
+        "symfony/filesystem": "^6.4 || ^7.3 || ^8.0",
+        "symfony/framework-bundle": "^6.4 || ^7.3 || ^8.0",
+        "symfony/http-foundation": "^6.4 || ^7.3 || ^8.0",
+        "symfony/security-bundle": "^6.4 || ^7.3 || ^8.0",
+        "symfony/twig-bundle": "^6.4 || ^7.3 || ^8.0",
+        "symfony/var-dumper": "^6.4 || ^7.3 || ^8.0"
     },
     "conflict": {
         "doctrine/doctrine-bundle": "<2.7",
         "gedmo/doctrine-extensions": "<3.7",
-        "symfony/framework-bundle": "<5.4",
         "symfony/string": "5.4.0-BETA1 || 5.4.0-RC1"
     },
     "minimum-stability": "dev",

phpunit.xml.dist

@@ -6,33 +6,28 @@ DO NOT EDIT THIS FILE!
 It's auto-generated by sonata-project/dev-kit package.
 -->
 
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          colors="true"
          failOnWarning="true"
          failOnRisky="true"
-         stopOnFailure="false"
+         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+         displayDetailsOnAllIssues="true"
          bootstrap="tests/bootstrap.php"
 >
     <testsuites>
         <testsuite name="SonataEntityAuditBundle Test Suite">
-            <directory suffix="Test.php">./tests/</directory>
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
 
-    <coverage>
+    <source ignoreSuppressionOfDeprecations="true">
         <include>
-            <directory suffix=".php">./src/</directory>
+            <directory>src</directory>
         </include>
-    </coverage>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>
-    </listeners>
+    </source>
 
     <php>
         <ini name="precision" value="8" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0" />
         <env name="KERNEL_CLASS" value="\Sonata\EntityAuditBundle\Tests\App\AppKernel" />
         <server name="APP_ENV" value="test" force="true" />
         <server name="APP_DEBUG" value="false" />