8000 merged branch stloyd/feature/doctrine_versions (PR #6632) · 77web/symfony@6ccaa65 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6ccaa65

Browse files
fabpotfabpot
committed
merged branch stloyd/feature/doctrine_versions (PR symfony#6632)
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes symfony#6632). Commits ------- a1c0ff5 Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) of Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version Discussion ---------- Update `composer.json` files --------------------------------------------------------------------------- by fabpot at 2013-01-09T17:55:54Z When will Doctrine 2.4 be released? If not in the next couple of weeks, this PR cannot be merged as we need to ship Symfony 2.2 with a stable version of Doctrine. --------------------------------------------------------------------------- by stof at 2013-01-09T18:13:59Z @fabpot This allows to use Doctrine 2.4. It does not require to use 2.4. Actually, as Doctrine releases are BC, I would even vote for using ``~2.2`` as requirement --------------------------------------------------------------------------- by fabpot at 2013-01-10T08:18:52Z If the Doctrine is fine with `~2.2`, let's do that. @beberlei Can you confirm? --------------------------------------------------------------------------- by stloyd at 2013-01-10T08:30:19Z As Doctrine latest release is `2.3.2` maybe for Symfony `2.2` we should increase to `~2.3` not `~2.2` ? --------------------------------------------------------------------------- by stof at 2013-01-10T09:15:00Z @stloyd Why should we force using 2.3 when we don't require any of the 2.3 features ? Composer will use the most recent package matching the constraint anyway, so 2.2 will not be used unless someone forbids 2.3 in another package. --------------------------------------------------------------------------- by stloyd at 2013-01-29T19:24:09Z @fabpot ping
2 parents f39cb95 + 53c7054 commit 6ccaa65

File tree

8 files changed

+19
-18
lines changed

8 files changed

+19
-18
lines changed

‎composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"doctrine/common": ">2.2,<2.4-dev",
21-
"twig/twig": ">=1.11.0,<2.0-dev",
20+
"doctrine/common": "~2.2",
21+
"twig/twig": "~1.11",
2222
"psr/log": "~1.0"
2323
},
2424
"replace": {
@@ -59,10 +59,10 @@
5959
},
6060
"require-dev": {
6161
"doctrine/data-fixtures": "1.0.*",
62-
"doctrine/dbal": ">=2.2,<2.4-dev",
63-
"doctrine/orm": ">=2.2.3,<2.4-dev",
62+
"doctrine/dbal": "~2.2",
63+
"doctrine/orm": "~2.2,>=2.2.3",
6464
"monolog/monolog": "~1.3",
65-
"propel/propel1": "dev-master"
65+
"propel/propel1": "1.6.*"
6666
},
6767
"autoload": {
6868
"psr-0": { "Symfony\\": "src/" },

‎src/Symfony/Bridge/Doctrine/composer.json

Lines changed: 5 additions & 5 deletions
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.4-dev"
20+
"doctrine/common": "~2.2"
2121
},
2222
"require-dev": {
2323
"symfony/stopwatch": "2.2.*",
@@ -27,15 +27,15 @@
2727
"symfony/security": "2.2.*",
2828
"symfony/validator": "2.2.*",
2929
"doctrine/data-fixtures": "1.0.*",
30-
"doctrine/dbal": ">=2.2,<2.4-dev",
31-
"doctrine/orm": ">=2.2.3,<2.4-dev"
30+
"doctrine/dbal": "~2.2",
31+
"doctrine/orm": "~2.2,>=2.2.3"
3232
},
3333
"suggest": {
3434
"symfony/form": "2.2.*",
3535
"symfony/validator": "2.2.*",
3636
"doctrine/data-fixtures": "1.0.*",
37-
"doctrine/dbal": ">=2.2,<2.4-dev",
38-
"doctrine/orm": ">=2.2.3,<2.4-dev"
37+
"doctrine/dbal": "~2.2",
38+
"doctrine/orm": "~2.2,>=2.2.3"
3939
},
4040
"autoload": {
4141
"psr-0": { "Symfony\\Bridge\\Doctrine\\": "" }

‎src/Symfony/Bridge/Twig/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-
"twig/twig": ">=1.9.1,<2.0-dev"
20+
"twig/twig": "~1.11"
2121
},
2222
"require-dev": {
2323
"symfony/form": "2.2.*",

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/stopwatch": "2.2.*",
2727
"symfony/templating": "2.2.*",
2828
"symfony/translation": "2.2.*",
29-
"doctrine/common": ">=2.2,<2.4-dev"
29+
"doctrine/common": "~2.2"
3030
},
3131
"require-dev": {
3232
"symfony/finder": "2.2.*",

‎src/Symfony/Component/Locale/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"php": ">=5.3.3"
2020
},
2121
"suggest": {
22-
"ext-intl": ">=5.3.3"
22+
"ext-intl": "to use other locales than built-in `en`"
2323
},
2424
"autoload": {
2525
"psr-0": { "Symfony\\Component\\Locale\\": "" },

‎src/Symfony/Component/Routing/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
"symfony/config": "2.2.*",
2323
"symfony/yaml": "2.2.*",
2424
"symfony/http-kernel": "2.2.*",
25-
"doctrine/common": ">=2.2,<2.4-dev",
25+
"doctrine/common": "~2.2",
2626
"psr/log": "~1.0"
2727
},
2828
"suggest": {
2929
"symfony/config": "2.2.*",
3030
"symfony/yaml": "2.2.*",
31-
"doctrine/common": ">=2.2,<2.4-dev"
31+
"doctrine/common": "~2.2"
3232
},
3333
"autoload": {
3434
"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.2.*",
2626
"symfony/routing": "2.2.*",
2727
"symfony/validator": "2.2.*",
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
"psr/log": "~1.0"
3131
},
3232
"suggest": {

‎src/Symfony/Component/Validator/composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,9 @@
2626
"symfony/config": "2.2.*"
2727
},
2828
"suggest": {
29-
"doctrine/common": ">=2.1,<2.4-dev",
29+
"doctrine/common": "~2.2",
3030
"symfony/http-foundation": "2.2.*",
31+
"symfony/locale": "2.2.*",
3132
"symfony/yaml": "2.2.*",
3233
"symfony/config": "2.2.*"
3334
},

0 commit comments

Comments
 (0)
0