Fix composer.json dependencies

nicolas-grekas · nicolas-grekas · commit aa82fb065d97 · 2015-04-06T19:55:01.000+02:00
diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
@@ -32,7 +32,7 @@
         "symfony/yaml": "~2.0,>=2.0.5|~3.0.0",
         "symfony/security": "~2.6|~3.0.0",
         "symfony/stopwatch": "~2.2|~3.0.0",
-        "symfony/console": "~2.4|~3.0.0",
+        "symfony/console": "~2.7|~3.0.0",
         "symfony/var-dumper": "~2.6|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0"
     },
diff --git a/src/Symfony/Bundle/SecurityBundle/composer.json b/src/Symfony/Bundle/SecurityBundle/composer.json
@@ -25,7 +25,7 @@
         "symfony/browser-kit": "~2.4|~3.0.0",
         "symfony/console": "~2.5|~3.0.0",
         "symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
-        "symfony/dependency-injection": "~2.3|~3.0.0",
+        "symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0",
         "symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
         "symfony/form": "~2.7|~3.0.0",
         "symfony/framework-bundle": "~2.7|~3.0.0",
diff --git a/src/Symfony/Bundle/TwigBundle/composer.json b/src/Symfony/Bundle/TwigBundle/composer.json
@@ -25,7 +25,7 @@
     "require-dev": {
         "symfony/phpunit-bridge": "~2.7|~3.0.0",
         "symfony/stopwatch": "~2.2|~3.0.0",
-        "symfony/dependency-injection": "~2.2|~3.0.0",
+        "symfony/dependency-injection": "~2.6,>=2.6.6|~3.0.0",
         "symfony/expression-language": "~2.4|~3.0.0",
         "symfony/config": "~2.2|~3.0.0",
         "symfony/routing": "~2.1|~3.0.0",
diff --git a/src/Symfony/Component/Form/composer.json b/src/Symfony/Component/Form/composer.json
@@ -33,8 +33,8 @@
     },
     "conflict": {
         "symfony/doctrine-bridge": "<2.7",
-        "symfony/twig-bridge": "<2.7",
-        "symfony/doctrine-bridge": "<2.7"
+        "symfony/framework-bundle": "<2.7",
+        "symfony/twig-bridge": "<2.7"
     },
     "suggest": {
         "symfony/validator": "For form validation.",
