Skip to content

Commit 2b70f92

Browse files
Merge branch '2.7' into 2.8
* 2.7: prefer phpunit 5.x on hhvm [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line Fix the logout path when not using the router Fix the logout path when not using the router [Form] cast IDs to match deprecated behaviour of EntityChoiceList [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers Conflicts: .travis.yml src/Symfony/Bundle/FrameworkBundle/composer.json
2 parents f72d302 + 0e1cbab commit 2b70f92

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
"symfony/dependency-injection": "~2.8",
2323
"symfony/config": "~2.8",
2424
"symfony/event-dispatcher": "~2.8|~3.0.0",
25+
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
2526
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4|~3.0.0",
2627
"symfony/http-kernel": "~2.8",
2728
"symfony/polyfill-mbstring": "~1.0",
@@ -40,7 +41,6 @@
4041
"symfony/console": "~2.8|~3.0.0",
4142
"symfony/css-selector": "~2.0,>=2.0.5|~3.0.0",
4243
"symfony/dom-crawler": "~2.0,>=2.0.5|~3.0.0",
43-
"symfony/finder": "~2.0,>=2.0.5|~3.0.0",
4444
"symfony/polyfill-intl-icu": "~1.0",
4545
"symfony/security": "~2.6|~3.0.0",
4646
"symfony/form": "~2.8",
@@ -53,7 +53,6 @@
5353
},
5454
"suggest": {
5555
"symfony/console": "For using the console commands",
56-
"symfony/finder": "For using the translation loader and cache warmer",
5756
"symfony/form": "For using forms",
5857
"symfony/serializer": "For using the serializer service",
5958
"symfony/validator": "For using validation",

0 commit comments

Comments
 (0)