Skip to content

Commit e683da8

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 de86596 + 51145be commit e683da8

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

composer.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,24 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/event-dispatcher": "~2.5",
20+
"symfony/event-dispatcher": "2.5.*,>2.5.8|~2.6,>2.6.1",
2121
"symfony/http-foundation": "~2.5",
2222
"symfony/debug": "~2.6",
2323
"psr/log": "~1.0"
2424
},
2525
"require-dev": {
26-
"symfony/browser-kit": "~2.2",
26+
"symfony/browser-kit": "~2.3",
2727
"symfony/class-loader": "~2.1",
28-
"symfony/config": "~2.0",
28+
"symfony/config": "~2.0,>=2.0.5",
2929
"symfony/console": "~2.2",
30-
"symfony/dependency-injection": "~2.0",
30+
"symfony/css-selector": "~2.0,>=2.0.5",
31+
"symfony/dependency-injection": "~2.2",
32+
"symfony/dom-crawler": "~2.0,>=2.0.5",
3133
"symfony/expression-language": "~2.4",
32-
"symfony/finder": "~2.0",
33-
"symfony/process": "~2.0",
34+
"symfony/finder": "~2.0,>=2.0.5",
35+
"symfony/process": "~2.0,>=2.0.5",
3436
"symfony/routing": "~2.2",
35-
"symfony/stopwatch": "~2.2",
37+
"symfony/stopwatch": "~2.3",
3638
"symfony/templating": "~2.2",
3739
"symfony/translation": "~2.0",
3840
"symfony/var-dumper": "~2.6"

0 commit comments

Comments
 (0)