merged branch vicb/doctrine_deps (PR #5127)

Commits ------- 4ae54e3 [Composer] Bumped doctrine/orm to 2.2.3 Discussion ---------- [Composer] Bumped doctrine/orm to 2.2.3 fix #4966 --------------------------------------------------------------------------- by stloyd at 2012-07-31T15:01:41Z You should also _bump_ Security component [deps](https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Security/composer.json#L28). --------------------------------------------------------------------------- by vicb at 2012-07-31T15:05:03Z The security does not depend on `doctrine/orm`
symfony · Jul 31, 2012 · b1618d2 · b1618d2
2 parents ee2b8c4 + 4ae54e3
commit b1618d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -56,7 +56,7 @@
     },
     "require-dev": {
         "doctrine/dbal": ">=2.2,<2.4-dev",
-        "doctrine/orm": ">=2.2,<2.4-dev",
+        "doctrine/orm": ">=2.2.3,<2.4-dev",
         "doctrine/data-fixtures": "1.0.*",
         "propel/propel1": "dev-master",
         "monolog/monolog": "dev-master"

diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json
@@ -24,7 +24,7 @@
         "symfony/validator": "self.version",
         "doctrine/data-fixtures": "1.0.*",
         "doctrine/dbal": ">=2.2,<2.4-dev",
-        "doctrine/orm": ">=2.2,<2.4-dev"
+        "doctrine/orm": ">=2.2.3,<2.4-dev"
     },
     "autoload": {
         "psr-0": { "Symfony\\Bridge\\Doctrine": "" }