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

Commit 3315eb0

Browse files
committed
merged branch vicb/doctrine_deps (PR #380)
Commits ------- 793a21a Updated the lock file 59fdaeb Bumped Doctrine to 2.2.3 Discussion ---------- Doctrine deps based on #373 from @stof integrating the feedback --------------------------------------------------------------------------- by stof at 2012-07-31T14:53:00Z :+1: And the requirement on 2.2.3+ should be changed in symfony too instead of >=2.2 --------------------------------------------------------------------------- by vicb at 2012-07-31T15:00:23Z @stof that's symfony/symfony#5127. Thanks for your help.
2 parents 98623b3 + 793a21a commit 3315eb0

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"php": ">=5.3.3",
99
"symfony/symfony": "2.1.*",
10-
"doctrine/orm": "2.2.*",
10+
"doctrine/orm": ">=2.2.3,<2.4-dev",
1111
"doctrine/doctrine-bundle": "dev-master",
1212
"twig/extensions": "dev-master",
1313
"symfony/assetic-bundle": "dev-master",

composer.lock

Lines changed: 12 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)