Skip to content

Commit 0e1cbab

Browse files
Merge branch '2.3' into 2.7
* 2.3: 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 [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 src/Symfony/Bundle/SecurityBundle/Templating/Helper/LogoutUrlHelper.php
2 parents 4f9e426 + 7adb27a commit 0e1cbab

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
@@ -21,6 +21,7 @@
2121
"symfony/dependency-injection": "~2.6,>=2.6.2",
2222
"symfony/config": "~2.4",
2323
"symfony/event-dispatcher": "~2.5",
24+
"symfony/finder": "~2.0,>=2.0.5",
2425
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4",
2526
"symfony/http-kernel": "~2.7",
2627
"symfony/filesystem": "~2.3",
@@ -37,7 +38,6 @@
3738
"symfony/console": "~2.7",
3839
"symfony/css-selector": "~2.0,>=2.0.5",
3940
"symfony/dom-crawler": "~2.0,>=2.0.5",
40-
"symfony/finder": "~2.0,>=2.0.5",
4141
"symfony/intl": "~2.3",
4242
"symfony/security": "~2.6",
4343
"symfony/form": "~2.7,>=2.7.2",
@@ -49,7 +49,6 @@
4949
},
5050
"suggest": {
5151
"symfony/console": "For using the console commands",
52-
"symfony/finder": "For using the translation loader and cache warmer",
5352
"symfony/form": "For using forms",
5453
"symfony/serializer": "For using the serializer service",
5554
"symfony/validator": "For using validation",

0 commit comments

Comments
 (0)