Skip to content

Commit 1d8bd92

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: updated VENDORS for 2.5.10 updated distribution bundle added back composer.lock updated composer.json Prevent doctrine/dbal 2.5 from installing Conflicts: composer.json
2 parents 7a8a4fb + ca31083 commit 1d8bd92

File tree

2 files changed

+1673
-2
lines changed

2 files changed

+1673
-2
lines changed

composer.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
"require": {
1010
"php": ">=5.3.3",
1111
"symfony/symfony": "2.6.*",
12-
"doctrine/orm": "~2.2,>=2.2.3",
12+
"doctrine/orm": "~2.2,>=2.2.3,<2.5",
13+
"doctrine/dbal": "<2.5",
1314
"doctrine/doctrine-bundle": "~1.2",
1415
"twig/extensions": "~1.0",
1516
"symfony/assetic-bundle": "~2.3",
1617
"symfony/swiftmailer-bundle": "~2.3",
1718
"symfony/monolog-bundle": "~2.4",
1819
"sensio/distribution-bundle": "~3.0,>=3.0.12",
19-
"sensio/framework-extra-bundle": "~3.0",
20+
"sensio/framework-extra-bundle": "~3.0,>=3.0.2",
2021
"incenteev/composer-parameter-handler": "~2.0"
2122
},
2223
"require-dev": {

0 commit comments

Comments
 (0)