瀏覽代碼

merged branch stof/common_deps (PR #4318)

Commits
-------

d1f0c25 Fixed the composer constraint for Doctrine Common

Discussion
----------

Common deps

This allows using Doctrine 2.2 when using the full repo as it is compatible. The workaround previously was to use the individual components as the deps was less strict in them.

Closes #4289

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

by travisbot at 2012-05-17T22:36:03Z

This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1361187) (merged d1f0c254 into b3799680).
Fabien Potencier 13 年之前
父節點
當前提交
fd966f7f8a
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      composer.json
  2. 1 1
      src/Symfony/Bridge/Doctrine/composer.json
  3. 1 1
      src/Symfony/Component/Validator/composer.json

+ 1 - 1
composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "doctrine/common": "2.1.*",
+        "doctrine/common": ">=2.1,<2.3-dev",
         "monolog/monolog": ">=1.0,<1.2-dev",
         "swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
         "twig/twig": ">=1.1,<2.0-dev"

+ 1 - 1
src/Symfony/Bridge/Doctrine/composer.json

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "doctrine/common": ">=2.1,<2.3"
+        "doctrine/common": ">=2.1,<2.3-dev"
     },
     "recommend": {
         "doctrine/dbal": ">=2.1,<2.3",

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

@@ -17,7 +17,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "doctrine/common": ">=2.1,<2.3"
+        "doctrine/common": ">=2.1,<2.3-dev"
     },
     "suggest": {
         "symfony/http-foundation": "self.version",