From 3896804ea77249bd5820a44dfd37f8a6ce6dc06c Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Tue, 19 May 2026 15:48:41 +0200 Subject: [PATCH 1/4] Allow `doctrine/doctrine-fixtures-bundle` v4 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1d05f43..94a3f4b 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ ], "require": { "php": "^8.1", - "doctrine/doctrine-fixtures-bundle": "^3.4", + "doctrine/doctrine-fixtures-bundle": "^3.4 || ^4.0", "doctrine/orm": "^2.19|^3.0", "egulias/email-validator": "^3.0|^4.0", "nelmio/security-bundle": "^2.8 || ^3.0", From 25fe73fd93e3ea902a9b9e3184e162230d52d743 Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Tue, 19 May 2026 16:55:30 +0200 Subject: [PATCH 2/4] Change composer logical OR syntax to `||` to follow composer doc --- CHANGELOG.md | 6 ++++++ composer.json | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index af7b2b6..fc878f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ CHANGELOG for 1.x =================== +## v1.18.1 - (2026-05-19) +### Added +- Allow `doctrine/doctrine-fixtures-bundle` v4 + +### Changed +- Change composer logical OR syntax to `||` to follow composer doc ## v1.18.0 - (2026-05-15) ### Added diff --git a/composer.json b/composer.json index 94a3f4b..912f51f 100644 --- a/composer.json +++ b/composer.json @@ -14,25 +14,25 @@ "require": { "php": "^8.1", "doctrine/doctrine-fixtures-bundle": "^3.4 || ^4.0", - "doctrine/orm": "^2.19|^3.0", - "egulias/email-validator": "^3.0|^4.0", + "doctrine/orm": "^2.19 || ^3.0", + "egulias/email-validator": "^3.0 || ^4.0", "nelmio/security-bundle": "^2.8 || ^3.0", "sentry/sentry-symfony": "^4.9 || ^5.1", "symfony/apache-pack": "^1.0", - "symfony/form": "^5.4|^6.2|^7.4", - "symfony/framework-bundle": "^5.4|^6.2|^7.4", - "symfony/security-bundle": "^5.4|^6.2|^7.4", - "symfony/translation": "^5.4|^6.2|^7.4", - "symfony/http-client": "^5.4|^6.2|^7.4", + "symfony/form": "^5.4 || ^6.2 || ^7.4", + "symfony/framework-bundle": "^5.4 || ^6.2 || ^7.4", + "symfony/security-bundle": "^5.4 || ^6.2 || ^7.4", + "symfony/translation": "^5.4 || ^6.2 || ^7.4", + "symfony/http-client": "^5.4 || ^6.2 || ^7.4", "theofidry/alice-data-fixtures": "^1.5" }, "require-dev": { "smartbooster/standard-bundle": "^1.0", "symfony/flex": "^2", - "symfony/phpunit-bridge": "^5.4|^6.2|^7.0", - "symfony/runtime": "^5.4|^6.2|^7.4", - "symfony/twig-bundle": "^5.4|^6.2|^7.4", - "symfony/var-exporter": "^5.4|^6.2|^7.4" + "symfony/phpunit-bridge": "^5.4 || ^6.2 || ^7.0", + "symfony/runtime": "^5.4 || ^6.2 || ^7.4", + "symfony/twig-bundle": "^5.4 || ^6.2 || ^7.4", + "symfony/var-exporter": "^5.4 || ^6.2 || ^7.4" }, "autoload": { "psr-4": { From ece60d8545fcacd86209b3166aad0c267f018738 Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Tue, 19 May 2026 17:06:07 +0200 Subject: [PATCH 3/4] Remove doctrine dbal option `use_savepoints` witch is deleted with option true by default --- CHANGELOG.md | 3 +++ config/packages/doctrine.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc878f4..dc7385d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ CHANGELOG for 1.x ### Changed - Change composer logical OR syntax to `||` to follow composer doc +### Fixed +- Remove doctrine dbal option `use_savepoints` witch is deleted with option true by default + ## v1.18.0 - (2026-05-15) ### Added - Allow orm 3 diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index 0a1a61c..ef19c72 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -2,7 +2,6 @@ doctrine: dbal: driver: pdo_sqlite - use_savepoints: true orm: auto_generate_proxy_classes: true auto_mapping: true From 002ce92f5ab0f87803e234b0a7e1ad6769f2a83c Mon Sep 17 00:00:00 2001 From: Louis Fortunier Date: Tue, 19 May 2026 17:11:31 +0200 Subject: [PATCH 4/4] Remove doctrine orm option `auto_generate_proxy_classes` witch is deleted with option true by default --- CHANGELOG.md | 1 + config/packages/doctrine.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc7385d..281f66d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ CHANGELOG for 1.x ### Fixed - Remove doctrine dbal option `use_savepoints` witch is deleted with option true by default +- Remove doctrine orm option `auto_generate_proxy_classes` witch is deleted with option true by default ## v1.18.0 - (2026-05-15) ### Added diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml index ef19c72..11d6a7c 100644 --- a/config/packages/doctrine.yaml +++ b/config/packages/doctrine.yaml @@ -3,5 +3,4 @@ doctrine: dbal: driver: pdo_sqlite orm: - auto_generate_proxy_classes: true auto_mapping: true