Merge pull request #6 from paweb88/patch-1

Update composer.json to support doctrine 2.4
sroze · Jun 12, 2014 · ab271e5 · ab271e5
2 parents fa1f8eb + 8537c1b
commit ab271e5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         "php": ">=5.3.3",
         "symfony/symfony": ">=2.3.0",
         "sensio/framework-extra-bundle": ">=2.3.0",
-        "doctrine/orm": ">=2.2.3,<2.4-dev",
+        "doctrine/orm": "~2.2,>=2.2.3",
         "doctrine/doctrine-bundle": ">=1.2.0",
         "incenteev/composer-parameter-handler": "~2.0"
     },
@@ -26,4 +26,4 @@
         "psr-0": { "SRIO\\RestUploadBundle": "" }
     },
     "target-dir": "SRIO/RestUploadBundle"
-}
+}