Skip to content
This repository was archived by the owner on Nov 27, 2020. It is now read-only.

Commit 14d34a9

Browse files
committed
minor #800 Update ORM requirements to allow DBAL 2.5 again (Tobion)
This PR was merged into the 2.3 branch. Discussion ---------- Update ORM requirements to allow DBAL 2.5 again @Ocramius could doctrine release ORM 2.4.8 so doctrine/orm@e05930e is tagged? I think orm <2.4.8 is incompatible with DBAL 2.5. Commits ------- f92af02 allow semantic twig extension versions 49b8620 orm 2.2 and 2.3 are end of life 2f523d8 Update ORM requirements to allow DBAL 2.5 again
2 parents ab91fc5 + f92af02 commit 14d34a9

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@
99
"require": {
1010
"php": ">=5.3.3",
1111
"symfony/symfony": "2.3.*",
12-
"doctrine/orm": "~2.2,>=2.2.3,<2.5",
13-
"doctrine/dbal": "<2.5",
12+
"doctrine/orm": "^2.4.8",
1413
"doctrine/doctrine-bundle": "~1.2",
15-
"twig/extensions": "1.0.*",
14+
"twig/extensions": "~1.0",
1615
"symfony/assetic-bundle": "~2.3",
1716
"symfony/swiftmailer-bundle": "~2.3",
1817
"symfony/monolog-bundle": "~2.4",
1918
"sensio/distribution-bundle": "~2.3",
20-
"sensio/framework-extra-bundle": "~3.0,>=3.0.2",
19+
"sensio/framework-extra-bundle": "^3.0.2",
2120
"sensio/generator-bundle": "~2.3",
2221
"incenteev/composer-parameter-handler": "~2.0"
2322
},

0 commit comments

Comments
 (0)