Skip to content

Commit aefad07

Browse files
Merge branch '2.8' into 3.0
* 2.8: prefer phpunit 5.x on hhvm Reflected the change of the choice_value option in the Upgrade information [FrameworkBundle][HttpKernel] the finder is required to discover bundle commands [travis] Auto-conf deps=high matrix line fix error level for deprecation 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 [FrameworkBundle] minor: fix property_info service name in composer.json [HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile [HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers CSS min-height and min-width should not be "auto" Conflicts: .travis.yml UPGRADE-2.8.md appveyor.yml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/HttpFoundation/ParameterBag.php
2 parents b8712c3 + 2b70f92 commit aefad07

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

composer.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"symfony/http-kernel": "~2.8|~3.0",
2727
"symfony/polyfill-mbstring": "~1.0",
2828
"symfony/filesystem": "~2.8|~3.0",
29+
"symfony/finder": "~2.8|~3.0",
2930
"symfony/routing": "~3.0",
3031
"symfony/security-core": "~2.8|~3.0",
3132
"symfony/security-csrf": "~2.8|~3.0",
@@ -40,7 +41,6 @@
4041
"symfony/console": "~2.8|~3.0",
4142
"symfony/css-selector": "~2.8|~3.0",
4243
"symfony/dom-crawler": "~2.8|~3.0",
43-
"symfony/finder": "~2.8|~3.0",
4444
"symfony/polyfill-intl-icu": "~1.0",
4545
"symfony/security": "~2.8|~3.0",
4646
"symfony/form": "~2.8|~3.0",
@@ -53,12 +53,11 @@
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",
6059
"symfony/yaml": "For using the debug:config and lint:yaml commands",
61-
"symfony/property-info": "For using the property_info_extractor service",
60+
"symfony/property-info": "For using the property_info service",
6261
"symfony/process": "For using the server:run, server:start, server:stop, and server:status commands"
6362
},
6463
"autoload": {

0 commit comments

Comments
 (0)