From 66f33678561a436ed043a633d87ab9d4c400d91f Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Wed, 3 Apr 2024 08:55:36 +0200 Subject: [PATCH] prepare release --- CHANGELOG.md | 9 ++++++--- composer.json | 8 ++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b0d78e..f5171ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,13 +1,16 @@ Changelog ========= -3.0.0 (unreleased) ------------------- +Version 3 +========= + +3.0.0 +----- * Upgrade to PHPCR-ODM 2.0 * Support Jackalope 2.0 * Drop support for PHP 7 -* Replace doctrine cache with PSR-6 cache with the `symfony/cache` implementation. +* Replace Doctrine cache with PSR-6 cache with the `symfony/cache` implementation. The configuration of metadata_cache_driver changed. By default, it creates an `array` cache. To configure a service, specify `type: service` and specify your service in the `id` property. To use a cache pool, specify the service id of that pool. diff --git a/composer.json b/composer.json index 2f61ca2..dd7805e 100644 --- a/composer.json +++ b/composer.json @@ -29,18 +29,16 @@ "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" }, "conflict": { - "doctrine/annotations": "< 1.7.0", "doctrine/doctrine-bundle": "< 2.0.3", "jackalope/jackalope-jackrabbit": "<2", "jackalope/jackalope": "< 1.3.1", - "phpcr/phpcr-shell": "< 1.0.0-beta1", "symfony/dependency-injection": "< 3", "symfony/console": "< 4" }, "require-dev": { "ext-libxml": "*", "doctrine/doctrine-bundle": "^2.0.3", - "doctrine/phpcr-odm": "2.x-dev", + "doctrine/phpcr-odm": "^2.0", "doctrine/orm": "^2.0 || ^3.0", "jackalope/jackalope-doctrine-dbal": "^2.0", "matthiasnoback/symfony-dependency-injection-test": "^4.3.1 || ^5.0", @@ -89,7 +87,5 @@ "psr-4": { "Doctrine\\Bundle\\PHPCRBundle\\Tests\\": "tests/" } - }, - "prefer-stable": true, - "minimum-stability": "beta" + } }