merged branch guilhermeblanco/patch-14 (PR #7161)

This PR was merged into the 2.1 branch.

Commits
-------

06ebb0d Defined stable version point of Doctrine.

Discussion
----------

Defined stable version point of Doctrine.

As per @stof suggestion, updated 2.1 branch to define the stable version point for Doctrine libraries. @fabpot it's all yours! =)

```
| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
```
This commit is contained in:
Fabien Potencier 2013-02-23 07:40:48 +01:00
commit 6e3fa85eb6
5 changed files with 7 additions and 7 deletions

View File

@ -17,7 +17,7 @@
],
"require": {
"php": ">=5.3.3",
"doctrine/common": ">2.2,<2.5-dev",
"doctrine/common": "~2.2",
"twig/twig": ">=1.9.1,<2.0-dev"
},
"replace": {

View File

@ -25,7 +25,7 @@
"symfony/routing": "2.1.*",
"symfony/templating": "2.1.*",
"symfony/translation": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
"doctrine/common": "~2.2"
},
"require-dev": {
"symfony/finder": "2.1.*"

View File

@ -22,12 +22,12 @@
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"symfony/http-kernel": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
"doctrine/common": "~2.2"
},
"suggest": {
"symfony/config": "2.1.*",
"symfony/yaml": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev"
"doctrine/common": "~2.2"
},
"autoload": {
"psr-0": { "Symfony\\Component\\Routing": "" }

View File

@ -25,8 +25,8 @@
"symfony/form": "2.1.*",
"symfony/routing": "2.1.*",
"symfony/validator": "2.1.*",
"doctrine/common": ">=2.2,<2.4-dev",
"doctrine/dbal": ">=2.2,<2.4-dev"
"doctrine/common": "~2.2",
"doctrine/dbal": "~2.2"
},
"suggest": {
"symfony/class-loader": "2.1.*",

View File

@ -24,7 +24,7 @@
"symfony/yaml": "2.1.*"
},
"suggest": {
"doctrine/common": ">=2.1,<2.4-dev",
"doctrine/common": "~2.1",
"symfony/http-foundation": "2.1.*",
"symfony/yaml": "2.1.*"
},