Skip to content

Commit

Permalink
Merge pull request #816 from greg0ire/allow-common-3
Browse files Browse the repository at this point in the history
Allow doctrine/common 3 doctrine/persistence 2
  • Loading branch information
dbu authored Jul 1, 2020
2 parents 99603b2 + 54edde8 commit b329855
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@
"prefer-stable": true,
"require": {
"php": "^7.1",
"doctrine/common": "^2.4",
"doctrine/collections": "^1.0",
"doctrine/common": "^2.4 || ^3.0",
"doctrine/annotations": "^1.2",
"doctrine/data-fixtures": "^1.0",
"doctrine/persistence": "^1.3.7",
"doctrine/event-manager": "^1.0",
"doctrine/persistence": "^1.3.7 || ^2.0",
"phpcr/phpcr": "^2.1.1",
"phpcr/phpcr-implementation": "^2.1",
"phpcr/phpcr-utils": "^1.3.0",
Expand Down

0 comments on commit b329855

Please sign in to comment.