Merge tag 'v2.1.50' into develop

v2.1.50
roadiz · Nov 16, 2023 · 3d123ff · 3d123ff
2 parents e10fdd5 + 0ab294d
commit 3d123ff
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [v2.1.50](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.49...v2.1.50) (2023-11-16)
+
+
+### Bug Fixes
+
+* Prevent doctrine/orm to upgrade to 2.17.0: Associations with fetch-mode=EAGER may not be using WITH conditions ([9ef566c](https://github.com/roadiz/core-bundle-dev-app/commit/9ef566cad69d256af5fbd37f20fbde9463e18a6f))
+
 ## [v2.1.49](https://github.com/roadiz/core-bundle-dev-app/compare/v2.1.48...v2.1.49) (2023-10-20)
 
 

diff --git a/composer.json b/composer.json
@@ -42,8 +42,8 @@
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
         "doctrine/migrations": "^3.1.1",
-        "doctrine/orm": "^2.14.1",
         "endroid/qr-code": "^4.0",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "enshrined/svg-sanitize": "^0.15",
         "gedmo/doctrine-extensions": "^3.10.0",
         "guzzlehttp/guzzle": "^7.2.0",

diff --git a/lib/Documents/composer.json b/lib/Documents/composer.json
@@ -25,7 +25,7 @@
         "ext-zip": "*",
         "ext-simplexml": "*",
         "ext-fileinfo": "*",
-        "doctrine/orm": "^2.14.1",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "enshrined/svg-sanitize": "^0.15",
         "guzzlehttp/guzzle": "^7.2.0",
         "guzzlehttp/psr7": "^2.0",

diff --git a/lib/Models/composer.json b/lib/Models/composer.json
@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": ">=8.0",
-        "doctrine/orm": "^2.14.1",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "jms/serializer": "^3.9.0",
         "symfony/string": "5.4.*",
         "symfony/translation-contracts": "^2.3",

diff --git a/lib/RoadizCoreBundle/composer.json b/lib/RoadizCoreBundle/composer.json
@@ -28,7 +28,7 @@
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "^2.14.1",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "gedmo/doctrine-extensions": "^3.10.0",
         "inlinestyle/inlinestyle": "~1.2.7",
         "james-heinrich/getid3": "^1.9",

diff --git a/lib/RoadizFontBundle/composer.json b/lib/RoadizFontBundle/composer.json
@@ -24,7 +24,7 @@
         "doctrine/annotations": "^1.0",
         "doctrine/doctrine-bundle": "^2.8.1",
         "doctrine/doctrine-migrations-bundle": "^3.1",
-        "doctrine/orm": "^2.14.1",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",
         "roadiz/models": "2.2.x-dev",

diff --git a/lib/RoadizUserBundle/composer.json b/lib/RoadizUserBundle/composer.json
@@ -24,7 +24,7 @@
         "api-platform/core": "~2.7.0",
         "symfony/framework-bundle": "5.4.*",
         "symfony/rate-limiter": "5.4.*",
-        "doctrine/orm": "^2.14.1"
+        "doctrine/orm": "^2.14.1 < 2.17"
     },
     "require-dev": {
         "roadiz/core-bundle": "2.2.x-dev",

diff --git a/lib/Rozier/composer.json b/lib/Rozier/composer.json
@@ -33,7 +33,7 @@
     "require": {
         "php": ">=8.0",
         "ext-zip": "*",
-        "doctrine/orm": "^2.14.1",
+        "doctrine/orm": "^2.14.1 < 2.17",
         "guzzlehttp/guzzle": "^7.2.0",
         "jms/serializer": "^3.9.0",
         "league/flysystem": "^3.0",