From 4098dec8b8e61389905381aa7bfe82ebfcceed14 Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Wed, 15 Apr 2026 16:36:30 +0200 Subject: [PATCH 1/4] `HealthCheckController` Use `MYSQL_VERSION` or `MYSQL_ADDON_VERSION` env variable for mysql version --- CHANGELOG.md | 4 ++++ config/services.yaml | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e3fa9f9..44d5ccf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ CHANGELOG =================== +## v2.12.0 - (2026-04-15) +### Changed +- `HealthCheckController` Use `MYSQL_VERSION` or `MYSQL_ADDON_VERSION` env variable for mysql version + ## v2.11.0 - (2026-02-25) ### Added - Allow Symfony 7.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' ] From 59b3a666e6a82a39b5e2951a529d46d06f85561f Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Thu, 16 Apr 2026 10:06:57 +0200 Subject: [PATCH 2/4] `SecuritySubscriber` Use `$event->getRequest()->query->get()` instead of `$event->getRequest()->get(` to remove deprecated method --- CHANGELOG.md | 3 +++ src/Security/EventSubscriber/SecuritySubscriber.php | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44d5ccf..60bf6bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ CHANGELOG ### 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/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; } From a9235b370e4ac5f12bbb89f99549ec680c473a43 Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Thu, 16 Apr 2026 10:09:09 +0200 Subject: [PATCH 3/4] Add composer require `symfony/var-exporter` to fix orm v3 qualimetry --- CHANGELOG.md | 4 ++++ composer.json | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60bf6bc..efbbaae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ CHANGELOG =================== ## v2.12.0 - (2026-04-15) +### Added +- Allow orm v3 +- Add composer require `symfony/var-exporter` to fix orm v3 qualimetry + ### Changed - `HealthCheckController` Use `MYSQL_VERSION` or `MYSQL_ADDON_VERSION` env variable for mysql version 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": { From c137ba8f77a495e6a4396c91ef851d22e40578f6 Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Thu, 16 Apr 2026 11:07:41 +0200 Subject: [PATCH 4/4] Add orm v2.19 and v3 matrix to github actions --- .github/workflows/ci.yml | 5 +++++ CHANGELOG.md | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 efbbaae..4162d66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,8 @@ CHANGELOG ## v2.12.0 - (2026-04-15) ### Added - Allow orm v3 -- Add composer require `symfony/var-exporter` to fix orm v3 qualimetry +- 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