use json type instead of removed array type

symfony-cmf · Apr 6, 2024 · 029308b · oleg-andreyev · Nov 26, 2024 · dbu
1 parent bf07405
commit 029308b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+3.1.0
+-----
+
+* Symfony 7 support
+* Doctrine ORM 3 support
+  If you use the ORM route entity, you need to migrate your database configuration as the array fields needed to be changed to the `json` type (because `array` has been removed)
+
 3.0.2
 -----
 

diff --git a/composer.json b/composer.json
@@ -23,8 +23,8 @@
         "doctrine/data-fixtures": "^1.0.0",
         "doctrine/doctrine-bundle": "^2.0",
         "doctrine/orm": "^2.9 || ^3.0",
-        "doctrine/phpcr-bundle": "^2.3 || ^3.0",
-        "doctrine/phpcr-odm": "^1.4 || ^2.0",
+        "doctrine/phpcr-bundle": "^2.5 || ^3.0",
+        "doctrine/phpcr-odm": "^1.8 || ^2.0",
         "jackalope/jackalope-doctrine-dbal": "^1.3 || ^2.0",
         "matthiasnoback/symfony-dependency-injection-test": "^4.1.0 || ^5.1.0",
         "matthiasnoback/symfony-config-test": "^4.1.0 || ^5.1.0",
@@ -45,10 +45,9 @@
         "doctrine/orm": "To enable support for the ORM entities (^2.5)"
     },
     "conflict": {
-        "doctrine/phpcr-odm": "<1.4",
         "doctrine/common": "<3.1.1",
         "doctrine/persistence": "<1.3.0",
-        "phpunit/phpunit": "<6"
+        "symfony/security-core": "<6.4.0"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Resources/config/doctrine-base/Symfony.Component.Routing.Route.orm.xml b/src/Resources/config/doctrine-base/Symfony.Component.Routing.Route.orm.xml
@@ -4,11 +4,11 @@
 
     <mapped-superclass name="Symfony\Component\Routing\Route">
         <field name="host" type="string"/>
-        <field name="schemes" type="array"/>
-        <field name="methods" type="array"/>
-        <field name="defaults" type="array"/>
-        <field name="requirements" type="array"/>
-        <field name="options" type="array"/>
+        <field name="schemes" type="json"/>
+        <field name="methods" type="json"/>
+        <field name="defaults" type="json"/>
+        <field name="requirements" type="json"/>
+        <field name="options" type="json"/>
         <field name="condition" column="`condition`" type="string"/>
     </mapped-superclass>