Skip to content

Commit c2ba115

Browse files
Merge remote-tracking branch 'symfony/2.3' into lowest-25
* symfony/2.3: Test components using their lowest possible deps Conflicts: src/Symfony/Bridge/Doctrine/composer.json src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/composer.json src/Symfony/Component/DependencyInjection/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/Form/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Routing/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Validator/composer.json
2 parents 733cb4a + 52e2b2b commit c2ba115

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

composer.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,18 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/translation": "~2.0"
20+
"symfony/translation": "~2.0,>=2.0.5"
2121
},
2222
"require-dev": {
2323
"symfony/http-foundation": "~2.1",
2424
"symfony/intl": "~2.3",
25-
"symfony/yaml": "~2.0",
25+
"symfony/yaml": "~2.0,>=2.0.5",
2626
"symfony/config": "~2.2",
2727
"symfony/property-access": "~2.2",
2828
"symfony/expression-language": "~2.4",
2929
"doctrine/annotations": "~1.0",
3030
"doctrine/cache": "~1.0",
31-
"egulias/email-validator": "~1.0",
32-
"symfony/expression-language": "~2.4"
31+
"egulias/email-validator": "~1.0"
3332
},
3433
"suggest": {
3534
"doctrine/annotations": "For using the annotation mapping. You will also need doctrine/cache.",

0 commit comments

Comments
 (0)