Update composer.json files:

stloyd · stloyd · commit a1c0ff5df657 · 2013-01-12T13:40:08.000+01:00
- to allow versions ~2.2 (&gt;=2.2,&lt;3.0) of Doctrine DBAL, ORM &amp; Common
- fixed Propel1 versions difference between main and bridge files
- fixed Twig versions difference between main and bridge files
- to allow versions ~1.11 (&gt;=1.11,&lt;2.0) of Twig
- fixed Locale ext-intl version to accept all, not non-existing version
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.*"
     },
