summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Symfony/Bridge/Doctrine/composer.json4
-rw-r--r--src/Symfony/Component/Cache/composer.json4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
index 0da7703..7996103 100644
--- a/src/Symfony/Bridge/Doctrine/composer.json
+++ b/src/Symfony/Bridge/Doctrine/composer.json
@@ -43,10 +43,12 @@
"doctrine/annotations": "^1.10.4",
"doctrine/collections": "~1.0",
"doctrine/data-fixtures": "^1.1",
- "doctrine/dbal": "^2.6|^3.0",
+ "doctrine/dbal": "^2.7|^3.0",
"doctrine/orm": "^2.6.3"
},
"conflict": {
+ "doctrine/dbal": "<2.7",
+ "doctrine/orm": "<2.6.3",
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
"symfony/dependency-injection": "<3.4",
"symfony/form": "<4.4",
diff --git a/src/Symfony/Component/Cache/composer.json b/src/Symfony/Component/Cache/composer.json
index d71f216..72bd68f 100644
--- a/src/Symfony/Component/Cache/composer.json
+++ b/src/Symfony/Component/Cache/composer.json
@@ -33,7 +33,7 @@
"require-dev": {
"cache/integration-tests": "dev-master",
"doctrine/cache": "^1.6|^2.0",
- "doctrine/dbal": "^2.6|^3.0",
+ "doctrine/dbal": "^2.7|^3.0",
"predis/predis": "^1.1",
"psr/simple-cache": "^1.0",
"symfony/config": "^4.2|^5.0",
@@ -43,7 +43,7 @@
"symfony/var-dumper": "^4.4|^5.0"
},
"conflict": {
- "doctrine/dbal": "<2.6",
+ "doctrine/dbal": "<2.7",
"symfony/dependency-injection": "<3.4",
"symfony/http-kernel": "<4.4|>=5.0",
"symfony/var-dumper": "<4.4"