Bump and bind dependencies of ORM 2.2

doctrine · Jan 29, 2012 · 7cf4337 · 7cf4337
1 parent 41cf2ce
commit 7cf4337
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/build.xml b/build.xml
@@ -92,8 +92,8 @@
            <dependencies>
                <php minimum_version="5.3.0" />
                <pear minimum_version="1.6.0" recommended_version="1.6.1" />
-               <package name="DoctrineCommon" channel="pear.doctrine-project.org" minimum_version="${dependencies.common}" />
-               <package name="DoctrineDBAL" channel="pear.doctrine-project.org" minimum_version="${dependencies.dbal}" />
+               <package name="DoctrineCommon" channel="pear.doctrine-project.org" minimum_version="${dependencies.common}" maximum_version="2.2.99" />
+               <package name="DoctrineDBAL" channel="pear.doctrine-project.org" minimum_version="${dependencies.dbal}" maximum_version="2.2.99" />
                <package name="Console" channel="pear.symfony.com" minimum_version="2.0.0" />
                <package name="Yaml" channel="pear.symfony.com" minimum_version="2.0.0" />
            </dependencies>

diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
     "require": {
         "php": ">=5.3.2",
         "ext-pdo": "*",
-        "doctrine/common": ">=2.2-dev,<2.3-dev",
-        "doctrine/dbal": ">=2.2-dev,<2.3-dev"
+        "doctrine/common": ">=2.2.0,<2.2.99",
+        "doctrine/dbal": ">=2.2.1,<2.2.99"
     },
     "autoload": {
         "psr-0": { "Doctrine\\ORM": "lib/" }

diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal