Merge branch '3.4' into 4.4
* 3.4: Force doctrine/dbal <=2.10.2 when testing
This commit is contained in:
commit
f8bedf4e79
|
@ -103,7 +103,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4,<=2.10.2",
|
||||||
"doctrine/orm": "~2.4,>=2.4.5",
|
"doctrine/orm": "~2.4,>=2.4.5",
|
||||||
"doctrine/reflection": "~1.0",
|
"doctrine/reflection": "~1.0",
|
||||||
"doctrine/doctrine-bundle": "^1.5|^2.0",
|
"doctrine/doctrine-bundle": "^1.5|^2.0",
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
"doctrine/cache": "~1.6",
|
"doctrine/cache": "~1.6",
|
||||||
"doctrine/collections": "~1.0",
|
"doctrine/collections": "~1.0",
|
||||||
"doctrine/data-fixtures": "1.0.*",
|
"doctrine/data-fixtures": "1.0.*",
|
||||||
"doctrine/dbal": "~2.4",
|
"doctrine/dbal": "~2.4,<=2.10.2",
|
||||||
"doctrine/orm": "^2.6.3",
|
"doctrine/orm": "^2.6.3",
|
||||||
"doctrine/reflection": "~1.0"
|
"doctrine/reflection": "~1.0"
|
||||||
},
|
},
|
||||||
|
|
Reference in New Issue