8000 merged branch guilhermeblanco/patch-14 (PR #7161) · symfony/symfony@6e3fa85 · GitHub
[go: up one dir, main page]

Skip to content

Commit 6e3fa85

Browse files
committed
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 ```
2 parents 52bd4ff + 06ebb0d commit 6e3fa85

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"doctrine/common": ">2.2,<2.5-dev",
20+
"doctrine/common": "~2.2",
2121
"twig/twig": ">=1.9.1,<2.0-dev"
2222
},
2323
"replace": {

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"symfony/routing": "2.1.*",
2626
"symfony/templating": "2.1.*",
2727
"symfony/translation": "2.1.*",
28-
"doctrine/common": ">=2.2,<2.4-dev"
8000 28+
"doctrine/common": "~2.2"
2929
},
3030
"require-dev": {
3131
"symfony/finder": "2.1.*"

src/Symfony/Component/Routing/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
"symfony/config": "2.1.*",
2323
"symfony/yaml": "2.1.*",
2424
"symfony/http-kernel": "2.1.*",
25-
"doctrine/common": ">=2.2,<2.4-dev"
25+
"doctrine/common": "~2.2"
2626
},
2727
"suggest": {
2828
"symfony/config": "2.1.*",
2929
"symfony/yaml": "2.1.*",
30-
"doctrine/common": ">=2.2,<2.4-dev"
30+
"doctrine/common": "~2.2"
3131
},
3232
"autoload": {
3333
"psr-0": { "Symfony\\Component\\Routing": "" }

src/Symfony/Component/Security/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
"symfony/form": "2.1.*",
2626
"symfony/routing": "2.1.*",
2727
"symfony/validator": "2.1.*",
28-
"doctrine/common": ">=2.2,<2.4-dev",
29-
"doctrine/dbal": ">=2.2,<2.4-dev"
28+
"doctrine/common": "~2.2",
29+
"doctrine/dbal": "~2.2"
3030
},
3131
"suggest": {
3232
"symfony/class-loader": "2.1.*",

src/Symfony/Component/Validator/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"symfony/yaml": "2.1.*"
2525
},
2626
"suggest": {
27-
"doctrine/common": ">=2.1,<2.4-dev",
27+
"doctrine/common": "~2.1",
2828
"symfony/http-foundation": "2.1.*",
2929
"symfony/yaml": "2.1.*"
3030
},

0 commit comments

Comments
 (0)
0