summaryrefslogtreecommitdiffstats
path: root/src/Symfony/Component/Lock/composer.json
diff options
context:
space:
mode:
Diffstat (limited to 'src/Symfony/Component/Lock/composer.json')
-rw-r--r--src/Symfony/Component/Lock/composer.json7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/Symfony/Component/Lock/composer.json b/src/Symfony/Component/Lock/composer.json
index 3e8e77e..8e82285 100644
--- a/src/Symfony/Component/Lock/composer.json
+++ b/src/Symfony/Component/Lock/composer.json
@@ -20,10 +20,13 @@
"psr/log": "~1.0"
},
"require-dev": {
- "doctrine/dbal": "~2.4",
+ "doctrine/dbal": "~2.5",
"mongodb/mongodb": "~1.1",
"predis/predis": "~1.0"
},
+ "conflict": {
+ "doctrine/dbal": "<2.5"
+ },
"autoload": {
"psr-4": { "Symfony\\Component\\Lock\\": "" },
"exclude-from-classmap": [
@@ -33,7 +36,7 @@
"minimum-stability": "dev",
"extra": {
"branch-alias": {
- "dev-master": "4.3-dev"
+ "dev-master": "4.4-dev"
}
}
}