From 30356fab3bcef9d38371e194295184d4c87d5e76 Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Wed, 3 Jul 2024 09:07:26 +0200 Subject: [PATCH 1/3] explicitly require doctrine/annotations, as its not automatically included in new doctrine versions --- .github/workflows/test-application.yaml | 1 + CHANGELOG.md | 6 ++++++ composer.json | 5 +++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-application.yaml b/.github/workflows/test-application.yaml index 846d2400..07560525 100644 --- a/.github/workflows/test-application.yaml +++ b/.github/workflows/test-application.yaml @@ -25,6 +25,7 @@ jobs: phpunit-version: "8.5" phpunit-flags: "-v --coverage-text" symfony-version: "^4.4" + composer-require: "'doctrine/annotations: 1.*'" - php-version: "7.4" phpunit-version: "8.5" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f24cfa1..a3da8f18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Changelog Version 2 ========= +2.5.1 +----- + +* Fix dependencies: phpcr-odm 2.0 has BC breaks not supported by this legacy version of the bundle. + To use phpcr-odm `2.*`, please use version 3 of this bundle. + 2.5.0 ----- diff --git a/composer.json b/composer.json index 91c10175..79a6231e 100644 --- a/composer.json +++ b/composer.json @@ -29,15 +29,16 @@ }, "conflict": { "doctrine/annotations": "< 1.7.0", - "doctrine/phpcr-odm": "< 1.5.2", + "doctrine/phpcr-odm": "< 1.5.2 || >= 2.0", "jackalope/jackalope": "< 1.3.1", "phpcr/phpcr-shell": "< 1.0.0-beta1", "symfony/dependency-injection": "4.0.0", "twig/twig": "< 1.42.3" }, "require-dev": { + "doctrine/annotations": "^1.0 || ^2.0", "doctrine/doctrine-bundle": "^1.8 || ^2.0", - "doctrine/phpcr-odm": "^1.5.2 || ^2.0", + "doctrine/phpcr-odm": "^1.5.2", "jackalope/jackalope-doctrine-dbal": "^1.3", "matthiasnoback/symfony-dependency-injection-test": "^4.1", "symfony/asset": "^4.3 || ^5.0 || ^6.0", From 89fac6ff6b2f9229dad909dffb2c17dcfbeacecb Mon Sep 17 00:00:00 2001 From: Alexander Schranz Date: Wed, 3 Jul 2024 15:39:57 +0200 Subject: [PATCH 2/3] Add supported range of jackalope packages to composer.json (#404) --- CHANGELOG.md | 1 + composer.json | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3da8f18..b6616d8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ Version 2 2.5.1 ----- + * Add supported range of jackalope packages to composer.json * Fix dependencies: phpcr-odm 2.0 has BC breaks not supported by this legacy version of the bundle. To use phpcr-odm `2.*`, please use version 3 of this bundle. diff --git a/composer.json b/composer.json index 79a6231e..085b4fae 100644 --- a/composer.json +++ b/composer.json @@ -30,7 +30,9 @@ "conflict": { "doctrine/annotations": "< 1.7.0", "doctrine/phpcr-odm": "< 1.5.2 || >= 2.0", - "jackalope/jackalope": "< 1.3.1", + "jackalope/jackalope": "< 1.3.1 || >= 2.0.0", + "jackalope/jackalope-doctrine-dbal": "< 1.3.0 || >= 2.0.0", + "jackalope/jackalope-jackrabbit": "< 1.3.0 || >= 2.0.0", "phpcr/phpcr-shell": "< 1.0.0-beta1", "symfony/dependency-injection": "4.0.0", "twig/twig": "< 1.42.3" From 50f6483ce72c94374e507dd6b5cb734b4187991d Mon Sep 17 00:00:00 2001 From: David Buchmann Date: Wed, 3 Jul 2024 15:41:47 +0200 Subject: [PATCH 3/3] prepare release --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6616d8e..fc25e3d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,10 @@ Version 2 2.5.1 ----- - * Add supported range of jackalope packages to composer.json +* Add conflicts for Jackalope `2.*` packages to composer.json as they have unsupported BC breaks. * Fix dependencies: phpcr-odm 2.0 has BC breaks not supported by this legacy version of the bundle. - To use phpcr-odm `2.*`, please use version 3 of this bundle. + +To use phpcr-odm 2 or Jackalope 2, please use version 3 of this bundle. 2.5.0 -----