doctrine/orm 2.16.0 and higher are now marked as conflicting

- order item creation depends on the order of autoincrement ids - the way in which order the inserts are executed changed in 2.16.0 - see doctrine/orm#10547 and doctrine/orm#10864
shopsys · Aug 2, 2023 · adc3cbc · adc3cbc
1 parent da7f7e8
commit adc3cbc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -196,7 +196,7 @@
     },
     "conflict": {
         "symfony/symfony": "*",
-        "doctrine/orm": "2.12.0",
+        "doctrine/orm": "2.12.0 || >=2.16.0",
         "friendsofphp/php-cs-fixer": "2.19.0",
         "guzzlehttp/psr7": "<=1.8.3, >=2.0.0, <=2.1.0"
     },

diff --git a/packages/framework/composer.json b/packages/framework/composer.json
@@ -118,7 +118,7 @@
         }
     },
     "conflict": {
-        "doctrine/orm": "2.12.0"
+        "doctrine/orm": "2.12.0 || >=2.16.0"
     },
     "suggest": {
         "ext-pgsql": "Required for dumping the Postgres database in shopsys:database:dump command"