Skip to content

Commit a9de781

Browse files
Merge branch '3.0'
* 3.0: 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 [FrameworkBundle] fixes outdated phpdoc on Controller::createForm() method. 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"
2 parents ba82f61 + aefad07 commit a9de781

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

Controller/Controller.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
2323
use Symfony\Component\Security\Csrf\CsrfToken;
2424
use Symfony\Component\Form\Extension\Core\Type\FormType;
25-
use Symfony\Component\Form\FormTypeInterface;
2625
use Symfony\Component\Form\Form;
2726
use Symfony\Component\Form\FormBuilder;
2827
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -275,9 +274,9 @@ protected function createAccessDeniedException($message = 'Access Denied.', \Exc
275274
/**
276275
* Creates and returns a Form instance from the type of the form.
277276
*
278-
* @param string|FormTypeInterface $type The built type of the form
279-
* @param mixed $data The initial data for the form
280-
* @param array $options Options for the form
277+
* @param string $type The fully qualified class name of the form type
278+
* @param mixed $data The initial data for the form
279+
* @param array $options Options for the form
281280
*
282281
* @return Form
283282
*/

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)