diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01b6730..1c91b6f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,7 @@ jobs: '8.3', '8.4' ] + orm: ['2.19.*', '^3.0'] # must be working on both container: image: ghcr.io/${{ github.repository_owner }}/symfony-docker:php${{ matrix.php }} credentials: @@ -34,6 +35,10 @@ jobs: - name: Validate composer.json and composer.lock run: composer validate + # Dynamically update composer.json dependencies before running make install + - name: "Restrict Doctrine ORM version" + run: composer require "doctrine/orm:${{ matrix.orm }}" --no-update --no-interaction + - name: Install run: make install diff --git a/CHANGELOG.md b/CHANGELOG.md index e3fa9f9..4162d66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ CHANGELOG =================== +## v2.12.0 - (2026-04-15) +### Added +- Allow orm v3 +- Add composer require dev `symfony/var-exporter` to fix orm v3 qualimetry +- Add orm v2.19 like new `smartbooster/core-bundle` minimum orm version and v3 matrix to github actions + +### Changed +- `HealthCheckController` Use `MYSQL_VERSION` or `MYSQL_ADDON_VERSION` env variable for mysql version + +### Fixed +- `SecuritySubscriber` Use `$event->getRequest()->query->get()` instead of `$event->getRequest()->get(` to remove deprecated method + ## v2.11.0 - (2026-02-25) ### Added - Allow Symfony 7.4 diff --git a/composer.json b/composer.json index f5860ae..7fa5f4a 100644 --- a/composer.json +++ b/composer.json @@ -38,7 +38,8 @@ "symfony/phpunit-bridge": "^5.4|^6.2|^7.0", "symfony/runtime": "^5.4|^6.22|^7.4", "symfony/twig-bundle": "^5.4|^6.22|^7.4", - "symfony/browser-kit": "^5.4|^6.2|^7.4" + "symfony/browser-kit": "^5.4|^6.2|^7.4", + "symfony/var-exporter": "^5.4|^6.2|^7.4" }, "autoload": { "psr-4": { diff --git a/config/services.yaml b/config/services.yaml index 19852d3..0b4b0fd 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -1,3 +1,6 @@ +parameters: + mysql_addon_version: '%env(MYSQL_ADDON_VERSION)%' + services: # Admin admin.batch_log: @@ -96,7 +99,11 @@ services: Smart\SonataBundle\Controller\Admin\Monitoring\HealthCheckController: calls: - setContainer: [ '@service_container' ] - - setCurrentVersions: [ {php: '%env(PHP_VERSION)%', node: '%env(NODE_VERSION)%', mysql: '%env(MYSQL_ADDON_VERSION)%'} ] + - setCurrentVersions: + - php: '%env(PHP_VERSION)%' + node: '%env(NODE_VERSION)%' + # fallback to MYSQL_ADDON_VERSION if MYSQL_VERSION is not set, for backward compatibility + mysql: '%env(default:mysql_addon_version:MYSQL_VERSION)%' - setProjectDir: [ '%kernel.project_dir%' ] - setSecurity: [ '@Symfony\Bundle\SecurityBundle\Security' ] - setTranslator: [ '@translator' ] diff --git a/src/Security/EventSubscriber/SecuritySubscriber.php b/src/Security/EventSubscriber/SecuritySubscriber.php index a3315b8..c8e9244 100644 --- a/src/Security/EventSubscriber/SecuritySubscriber.php +++ b/src/Security/EventSubscriber/SecuritySubscriber.php @@ -66,7 +66,7 @@ public function onInteractiveLogin(InteractiveLoginEvent $event) } // Impersonnate user must not update last_login date - if ($event->getRequest()->get('switch_user') !== null) { + if ($event->getRequest()->query->get('switch_user') !== null) { return; }