From 4cccf8eadec681314a62d2684299aafb52b6a609 Mon Sep 17 00:00:00 2001
From: core23 <mail@core23.de>
Date: Mon, 4 Mar 2024 20:33:46 +0100
Subject: [PATCH 1/2] Revert "Fix roles doctrine type mapping"

This reverts commit fbe6b241063f7d19a2fb807cab07a41acee4e82f.
---
 src/Resources/config/doctrine-mapping/Group.orm.xml | 2 +-
 src/Resources/config/doctrine-mapping/User.orm.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Resources/config/doctrine-mapping/Group.orm.xml b/src/Resources/config/doctrine-mapping/Group.orm.xml
index f3b4b650..2e36c930 100644
--- a/src/Resources/config/doctrine-mapping/Group.orm.xml
+++ b/src/Resources/config/doctrine-mapping/Group.orm.xml
@@ -2,6 +2,6 @@
 <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping                   http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd">
   <mapped-superclass name="Nucleos\UserBundle\Model\Group">
     <field name="name" column="name" type="string" length="180" unique="true"/>
-    <field name="roles" column="roles" type="json"/>
+    <field name="roles" column="roles" type="array"/>
   </mapped-superclass>
 </doctrine-mapping>
diff --git a/src/Resources/config/doctrine-mapping/User.orm.xml b/src/Resources/config/doctrine-mapping/User.orm.xml
index 88fcdb5f..dd9db689 100644
--- a/src/Resources/config/doctrine-mapping/User.orm.xml
+++ b/src/Resources/config/doctrine-mapping/User.orm.xml
@@ -10,6 +10,6 @@
     <field name="passwordRequestedAt" column="password_requested_at" type="datetime" nullable="true"/>
     <field name="locale" type="string" column="locale" length="8" nullable="true"/>
     <field name="timezone" type="string" column="timezone" length="64" nullable="true"/>
-    <field name="roles" column="roles" type="json"/>
+    <field name="roles" column="roles" type="array"/>
   </mapped-superclass>
 </doctrine-mapping>

From 0d39ca18ac1977d5a40789c86ef3e47ef21be87a Mon Sep 17 00:00:00 2001
From: core23 <mail@core23.de>
Date: Mon, 4 Mar 2024 20:34:51 +0100
Subject: [PATCH 2/2] Add conflict for doctrine/dbal 4.x

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index 7b1e14f8..f54d7556 100644
--- a/composer.json
+++ b/composer.json
@@ -79,6 +79,7 @@
         "symfony/yaml": "^6.4 || ^7.0"
     },
     "conflict": {
+        "doctrine/dbal": ">=4",
         "doctrine/doctrine-bundle": "<1.12",
         "doctrine/mongodb": "<1.6",
         "doctrine/mongodb-odm": "<1.1",