瀏覽代碼

merged branch igorw/composer (PR #2402)

Commits
-------

a1bab83 [composer] make doctrine dbal and orm recommended by doctrine-bundle
225b512 [composer] make doctrine dbal and orm recommended by doctrine-bridge
03bdac0 [composer] make twig-bundle require twig-bridge
5757713 [composer] add doctrine and twig dependencies

Discussion
----------

Composer update

Add doctrine and twig dependencies (they are now on packagist.org), move doctrine requires to recommends, add twig-bridge require to twig-bundle.

Per @stof, symfony 2.1 (master) will need doctrine to be updated to 2.2-dev.

---------------------------------------------------------------------------

by Seldaek at 2011/10/15 09:13:35 -0700

Also @fabpot it'd be great if you would submit all the sub-tree packages to packagist.org, that way we could start using them individually.

By the way if you want the automatic versioning is now working so if you just delete the "version" from the json files, it should do the right thing. Up to you. See details on http://packagist.org/about
Fabien Potencier 13 年之前
父節點
當前提交
64302103f6

+ 4 - 0
src/Symfony/Bridge/Doctrine/composer.json

@@ -19,6 +19,10 @@
     "require": {
         "php": ">=5.3.2"
     },
+    "recommend": {
+        "doctrine/dbal": ">=2.1",
+        "doctrine/orm": ">=2.1"
+    },
     "suggest": {
         "symfony/form": ">=2.0",
         "symfony/validator": ">=2.0"

+ 2 - 1
src/Symfony/Bridge/Twig/composer.json

@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.3.2",
+        "twig/twig": ">=1.1"
     },
     "suggest": {
         "symfony/form": ">=2.0",

+ 4 - 0
src/Symfony/Bundle/DoctrineBundle/composer.json

@@ -20,5 +20,9 @@
         "php": ">=5.3.2",
         "symfony/doctrine-bridge": ">=2.0",
         "symfony/doctrine-abstract-bundle": ">=2.0"
+    },
+    "recommend": {
+        "doctrine/dbal": ">=2.0",
+        "doctrine/orm": ">=2.0"
     }
 }

+ 3 - 1
src/Symfony/Bundle/TwigBundle/composer.json

@@ -17,6 +17,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.3.2",
+        "twig/twig": ">=1.1",
+        "symfony/twig-bridge": ">=2.0"
     }
 }

+ 2 - 1
src/Symfony/Component/Validator/composer.json

@@ -17,7 +17,8 @@
         }
     ],
     "require": {
-        "php": ">=5.3.2"
+        "php": ">=5.3.2",
+        "doctrine/common": ">=2.1"
     },
     "suggest": {
         "symfony/http-foundation": ">=2.0",