diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ff50f97..f54c7871 100644 --- 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 index 617a0275..06d722d8 100644 --- 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 index f7fac5fe..09c2fe67 100644 --- 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 @@ - - - - - + + + + +