Johannes Schmitt пре 13 година
родитељ
комит
44ba73ea74
1 измењених фајлова са 7 додато и 4 уклоњено
  1. 7 4
      composer.json

+ 7 - 4
composer.json

@@ -15,11 +15,14 @@
         "php": ">=5.3.2",
         "jms/metadata": ">=1.1.0,<1.3-dev"
     },
+    "conflicts": {
+        "symfony/framework-bundle": "<2.1-dev"
+    },
     "require-dev": {
-        "symfony/framework-bundle": ">=2.0,<2.2-dev",
-        "symfony/yaml": ">=2.0,<2.2-dev",
-        "symfony/form": ">=2.0,<2.2-dev",
-        "symfony/validator": ">=2.0,<2.2-dev",
+        "symfony/framework-bundle": ">=2.1,<2.2-dev",
+        "symfony/yaml": ">=2.1,<2.3-dev",
+        "symfony/form": ">=2.1,<2.3-dev",
+        "symfony/validator": ">=2.1,<2.3-dev",
         "twig/twig": ">=1.8,<2.0-dev",
         "doctrine/orm": ">=2.1,<2.4-dev"
     },