From 318e30b99fdf4382a20f367a51b1da9647cb1ed3 Mon Sep 17 00:00:00 2001
From: Dev <dev@dev.com>
Date: Mon, 4 May 2026 16:31:48 +0100
Subject: [PATCH] Allow Doctrine ORM 4 on the 4.0.x branch

The 4.0.x branch already requires `doctrine/dbal: ^4.0` and
`doctrine/persistence: ^4`, signalling that this branch tracks the ORM 4
release line. However the `conflict` entry still blocks
`doctrine/orm >=4.0`, which prevents installing this branch alongside
`doctrine/orm: ^4.0@dev`.

Lower the conflict's upper bound so the branch can be installed with
ORM 4-dev. The lower bound `<3.0` is preserved.
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 346012623..b4bc6d858 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
         "twig/twig": "^3.21.1"
     },
     "conflict": {
-        "doctrine/orm": "<3.0 || >=4.0",
+        "doctrine/orm": "<3.0",
         "twig/twig": "<3.0.4"
     },
     "suggest": {