Skip to content

Commit 1b01ac6

Browse files
Merge remote-tracking branch 'symfony/2.5' into lowest-26
* symfony/2.5: Test lowest versions of dependencies Test components using their lowest possible deps Conflicts: src/Symfony/Bridge/Twig/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Security/composer.json
2 parents 6bc6de3 + 6e90c35 commit 1b01ac6

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

composer.json

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,22 @@
2121
"symfony/http-kernel": "~2.2"
2222
},
2323
"require-dev": {
24-
"symfony/browser-kit": "~2.3",
24+
"symfony/browser-kit": "~2.4",
2525
"symfony/console": "~2.3",
26-
"symfony/form": "~2.3",
27-
"symfony/framework-bundle": "~2.2,<2.6.0",
26+
"symfony/css-selector": "~2.0,>=2.0.5",
27+
"symfony/dependency-injection": "~2.3",
28+
"symfony/dom-crawler": "~2.0,>=2.0.5",
29+
"symfony/form": "~2.4",
30+
"symfony/framework-bundle": "~2.6",
31+
"symfony/http-foundation": "~2.3",
2832
"symfony/twig-bundle": "~2.2",
29-
"symfony/process": "~2.0",
33+
"symfony/twig-bridge": "~2.2,>=2.2.6",
34+
"symfony/process": "~2.0,>=2.0.5",
3035
"symfony/validator": "~2.2",
31-
"symfony/yaml": "~2.0",
36+
"symfony/yaml": "~2.0,>=2.0.5",
3237
"symfony/expression-language": "~2.4",
33-
"doctrine/doctrine-bundle": "~1.2"
38+
"doctrine/doctrine-bundle": "~1.2",
39+
"twig/twig": "~1.12"
3440
},
3541
"autoload": {
3642
"psr-0": { "Symfony\\Bundle\\SecurityBundle\\": "" }

0 commit comments

Comments
 (0)