From a1c0ff5df65788763d7cd49097e1eea30a11706d Mon Sep 17 00:00:00 2001 From: Joseph Bielawski Date: Wed, 9 Jan 2013 10:50:44 +0100 Subject: [PATCH] Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version --- composer.json | 10 +++++----- src/Symfony/Bridge/Doctrine/composer.json | 10 +++++----- src/Symfony/Bridge/Twig/composer.json | 2 +- src/Symfony/Bundle/FrameworkBundle/composer.json | 2 +- src/Symfony/Component/Locale/composer.json | 2 +- src/Symfony/Component/Routing/composer.json | 4 ++-- src/Symfony/Component/Security/composer.json | 4 ++-- src/Symfony/Component/Validator/composer.json | 3 ++- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 85d7cc2ef32f9..4fea2741de98f 100644 --- a/composer.json +++ b/composer.json @@ -17,8 +17,8 @@ ], "require": { "php": ">=5.3.3", - "doctrine/common": ">2.2,<2.4-dev", - "twig/twig": ">=1.11.0,<2.0-dev", + "doctrine/common": "~2.2", + "twig/twig": "~1.11", "psr/log": "~1.0" }, "replace": { @@ -58,10 +58,10 @@ }, "require-dev": { "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": ">=2.2,<2.4-dev", - "doctrine/orm": ">=2.2.3,<2.4-dev", + "doctrine/dbal": "~2.2", + "doctrine/orm": "~2.2,>=2.2.3", "monolog/monolog": "~1.3", - "propel/propel1": "dev-master" + "propel/propel1": "1.6.*" }, "autoload": { "psr-0": { "Symfony\\": "src/" }, diff --git a/src/Symfony/Bridge/Doctrine/composer.json b/src/Symfony/Bridge/Doctrine/composer.json index 0ba9f1e93b608..33f233495b210 100644 --- a/src/Symfony/Bridge/Doctrine/composer.json +++ b/src/Symfony/Bridge/Doctrine/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "doctrine/common": ">=2.2,<2.4-dev" + "doctrine/common": "~2.2" }, "require-dev": { "symfony/stopwatch": "2.2.*", @@ -27,15 +27,15 @@ "symfony/security": "2.2.*", "symfony/validator": "2.2.*", "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": ">=2.2,<2.4-dev", - "doctrine/orm": ">=2.2.3,<2.4-dev" + "doctrine/dbal": "~2.2", + "doctrine/orm": "~2.2,>=2.2.3" }, "suggest": { "symfony/form": "2.2.*", "symfony/validator": "2.2.*", "doctrine/data-fixtures": "1.0.*", - "doctrine/dbal": ">=2.2,<2.4-dev", - "doctrine/orm": ">=2.2.3,<2.4-dev" + "doctrine/dbal": "~2.2", + "doctrine/orm": "~2.2,>=2.2.3" }, "autoload": { "psr-0": { "Symfony\\Bridge\\Doctrine\\": "" } diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json index 885718c506353..41aef640074a9 100644 --- a/src/Symfony/Bridge/Twig/composer.json +++ b/src/Symfony/Bridge/Twig/composer.json @@ -17,7 +17,7 @@ ], "require": { "php": ">=5.3.3", - "twig/twig": ">=1.9.1,<2.0-dev" + "twig/twig": "~1.11" }, "require-dev": { "symfony/form": "2.2.*", diff --git a/src/Symfony/Bundle/FrameworkBundle/composer.json b/src/Symfony/Bundle/FrameworkBundle/composer.json index 12bc33d882443..0e4b2b7e4e89a 100644 --- a/src/Symfony/Bundle/FrameworkBundle/composer.json +++ b/src/Symfony/Bundle/FrameworkBundle/composer.json @@ -26,7 +26,7 @@ "symfony/stopwatch": "2.2.*", "symfony/templating": "2.2.*", "symfony/translation": "2.2.*", - "doctrine/common": ">=2.2,<2.4-dev" + "doctrine/common": "~2.2" }, "require-dev": { "symfony/finder": "2.2.*", diff --git a/src/Symfony/Component/Locale/composer.json b/src/Symfony/Component/Locale/composer.json index 1e977cb9e8bc4..dfe25a9b27ccf 100644 --- a/src/Symfony/Component/Locale/composer.json +++ b/src/Symfony/Component/Locale/composer.json @@ -19,7 +19,7 @@ "php": ">=5.3.3" }, "suggest": { - "ext-intl": ">=5.3.3" + "ext-intl": "to use other locales than built-in `en`" }, "autoload": { "psr-0": { "Symfony\\Component\\Locale\\": "" }, diff --git a/src/Symfony/Component/Routing/composer.json b/src/Symfony/Component/Routing/composer.json index d29f645424d3e..0bfc5e8c67bcb 100644 --- a/src/Symfony/Component/Routing/composer.json +++ b/src/Symfony/Component/Routing/composer.json @@ -22,13 +22,13 @@ "symfony/config": "2.2.*", "symfony/yaml": "2.2.*", "symfony/http-kernel": "2.2.*", - "doctrine/common": ">=2.2,<2.4-dev", + "doctrine/common": "~2.2", "psr/log": "~1.0" }, "suggest": { "symfony/config": "2.2.*", "symfony/yaml": "2.2.*", - "doctrine/common": ">=2.2,<2.4-dev" + "doctrine/common": "~2.2" }, "autoload": { "psr-0": { "Symfony\\Component\\Routing\\": "" } diff --git a/src/Symfony/Component/Security/composer.json b/src/Symfony/Component/Security/composer.json index 7192d5720293d..3b4c93b7b0c13 100644 --- a/src/Symfony/Component/Security/composer.json +++ b/src/Symfony/Component/Security/composer.json @@ -25,8 +25,8 @@ "symfony/form": "2.2.*", "symfony/routing": "2.2.*", "symfony/validator": "2.2.*", - "doctrine/common": ">=2.2,<2.4-dev", - "doctrine/dbal": ">=2.2,<2.4-dev", + "doctrine/common": "~2.2", + "doctrine/dbal": "~2.2", "psr/log": "~1.0" }, "suggest": { diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json index 9c65253c8e56d..deecd17dc48f8 100644 --- a/src/Symfony/Component/Validator/composer.json +++ b/src/Symfony/Component/Validator/composer.json @@ -26,8 +26,9 @@ "symfony/config": "2.2.*" }, "suggest": { - "doctrine/common": ">=2.1,<2.4-dev", + "doctrine/common": "~2.2", "symfony/http-foundation": "2.2.*", + "symfony/locale": "2.2.*", "symfony/yaml": "2.2.*", "symfony/config": "2.2.*" },