8000 merged branch Seldaek/composerjson (PR #2719) · DavidChristmann/symfony@9824c3a · GitHub
[go: up one dir, main page]
Skip to content

Commit 9824c3a

Browse files
fabpotfabpot
committed
merged branch Seldaek/composerjson (PR symfony#2719)
Commits ------- 6d5b296 Adjust doctrine requirements 628cce1 Adjust composer files to strictly require known to work packages Discussion ---------- Adjust composer files to strictly require known to work packages I also bumped doctrine common to 2.2, because it seems 2.1 doesn't have the AbstractManagerRegistry stuff that is used by symfony 2.1. Please someone correct me if this is wrong. --------------------------------------------------------------------------- by fabpot at 2011/11/25 07:59:53 -0800 It should be done on the 2.0 branch too, no? --------------------------------------------------------------------------- by Seldaek at 2011/11/26 16:11:25 -0800 Well as we discussed the 2.0 branch is not a priority right now, but yes if someone wants to port the changes to 2.0 it'd be good.
2 parents 1f9cf94 + 6d5b296 commit 9824c3a

File tree

9 files changed

+12
-14
lines changed

9 files changed

+12
-14
lines changed

‎composer.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
}
1818
],
1919
"require": {
20-
"php": ">=5.3.2"
20+
"php": ">=5.3.2",
21+
"doctrine/common": "2.2.*",
22+
"monolog/monolog": "1.0.*",
23+
"swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev",
24+
"twig/twig": ">=1.1,<1.5-dev"
2125
},
2226
"replace": {
2327
"symfony/doctrine-bridge": "self.version",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
}
1818
],
1919
"require": {
20-
"php": ">=5.3.2"
20+
"php": ">=5.3.2",
21+
"doctrine/common": "2.2.*"
2122
},
2223
"recommend": {
2324
"doctrine/dbal": ">=2.1",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"swiftmailer/swiftmailer": ">=4.1"
21+
"swiftmailer/swiftmailer": ">=4.1.2,<4.2-dev"
2222
},
2323
"suggest": {
2424
"symfony/http-kernel": "self.version"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"twig/twig": ">=1.1"
21+
"twig/twig": ">=1.1,<1.5-dev"
2222
},
2323
"suggest": {
2424
"symfony/form": "self.version",

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"symfony/doctrine-bridge": "2.*",
22-
"symfony/doctrine-abstract-bundle": "2.*"
23-
},
24-
"recommend": {
25-
"doctrine/dbal": "2.*",
26-
"doctrine/orm": "2.*"
21+
"symfony/doctrine-bridge": "self.version"
2722
},
2823
"autoload": {
2924
"psr-0": { "Symfony\\Bundle\\DoctrineBundle": "" }

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"symfony/routing": "self.version",
2424
"symfony/templating": "self.version",
2525
"symfony/translator": "self.version",
26-
"doctrine/common": ">=2.1.0"
26+
"doctrine/common": ">=2.1,<2.3-dev"
2727
},
2828
"recommend": {
2929
"symfony/console": "self.version",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"monolog/monolog": ">=1.0",
2221
"symfony/monolog-bridge": "self.version"
2322
},
2423
"autoload": {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"swiftmailer/swiftmailer": ">=4.1.2"
21+
"symfony/swiftmailer-bridge": "self.version"
2222
},
2323
"autoload": {
2424
"psr-0": { "Symfony\\Bundle\\SwiftmailerBundle": "" }

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
],
1919
"require": {
2020
"php": ">=5.3.2",
21-
"twig/twig": ">=1.1",
2221
"symfony/twig-bridge": "self.version"
2322
},
2423
"autoload": {

0 commit comments

Comments
 (0)
0