Skip to content

Commit

Permalink
explicitly require doctrine/annotations, as its not automatically inc…
Browse files Browse the repository at this point in the history
…luded in new doctrine versions
  • Loading branch information
dbu committed Jul 3, 2024
1 parent fccf7e3 commit 30356fa
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test-application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-----

Expand Down
5 changes: 3 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 30356fa

Please sign in to comment.