diff --git a/composer.json b/composer.json index cef5e7035d..e41b52243d 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=5.3.3", + "doctrine/common": ">2.2,<2.4-dev", "twig/twig": ">=1.8,<2.0-dev" }, "replace": { @@ -53,8 +54,8 @@ "symfony/yaml": "self.version" }, "require-dev": { - "doctrine/dbal": "2.2.*", - "doctrine/orm": "2.2.*", + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2,<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 index 7da7adfc4a..df69458e6c 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -17,14 +17,14 @@ ], "require": { "php": ">=5.3.3", - "doctrine/common": "2.2.*" + "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { "symfony/form": "self.version", "symfony/validator": "self.version", "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": ">=2.1,<2.3", - "doctrine/orm": ">=2.1,<2.3" + "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/orm": ">=2.2,<2.4-dev" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Doctrine": "" } diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index cd8cf21cfd..55c4366544 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -25,7 +25,7 @@ "symfony/routing": "self.version", "symfony/templating": "self.version", "symfony/translation": "self.version", - "doctrine/common": ">=2.1,<2.3-dev" + "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { "symfony/console": "self.version", diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index 9b07a5a6b1..388a0c643d 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -21,12 +21,12 @@ "require-dev": { "symfony/config": "2.1.*", "symfony/yaml": "2.1.*", - "doctrine/common": ">=2.1,<2.3-dev" + "doctrine/common": ">=2.2,<2.4-dev" }, "suggest": { "symfony/config": "self.version", "symfony/yaml": "self.version", - "doctrine/common": ">=2.1,<2.3-dev" + "doctrine/common": ">=2.2,<2.4-dev" }, "autoload": { "psr-0": { "Symfony\\Component\\Routing": "" } diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 915ccbf4cf..20308a0f00 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -24,14 +24,15 @@ "require-dev": { "symfony/form": "2.1.*", "symfony/routing": "2.1.*", - "doctrine/common": ">=2.1,<2.3-dev", - "doctrine/dbal": ">=2.1,<2.3-dev" + "doctrine/common": ">=2.2,<2.4-dev", + "doctrine/dbal": ">=2.2,<2.4-dev" }, "suggest": { "symfony/class-loader": "self.version", "symfony/finder": "self.version", "symfony/form": "self.version", - "symfony/routing": "self.version" + "symfony/routing": "self.version", + "doctrine/dbal": "to use the built-in ACL implementation" }, "autoload": { "psr-0": { "Symfony\\Component\\Security": "" } diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 73572c4a10..10569e366f 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -24,7 +24,7 @@ "symfony/yaml": "2.1.*" }, "suggest": { - "doctrine/common": ">=2.1,<2.3", + "doctrine/common": ">=2.1,<2.4-dev", "symfony/http-foundation": "self.version", "symfony/yaml": "self.version" },