Skip to content

Commit

Permalink
Merge branch '3.0'
Browse files Browse the repository at this point in the history
* 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"
  • Loading branch information
nicolas-grekas committed Dec 18, 2015
2 parents ba82f61 + aefad07 commit a9de781
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
7 changes: 3 additions & 4 deletions Controller/Controller.php
Expand Up @@ -22,7 +22,6 @@
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
use Symfony\Component\Security\Csrf\CsrfToken;
use Symfony\Component\Form\Extension\Core\Type\FormType;
use Symfony\Component\Form\FormTypeInterface;
use Symfony\Component\Form\Form;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
Expand Down Expand Up @@ -275,9 +274,9 @@ protected function createAccessDeniedException($message = 'Access Denied.', \Exc
/**
* Creates and returns a Form instance from the type of the form.
*
* @param string|FormTypeInterface $type The built type of the form
* @param mixed $data The initial data for the form
* @param array $options Options for the form
* @param string $type The fully qualified class name of the form type
* @param mixed $data The initial data for the form
* @param array $options Options for the form
*
* @return Form
*/
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Expand Up @@ -26,6 +26,7 @@
"symfony/http-kernel": "~2.8|~3.0",
"symfony/polyfill-mbstring": "~1.0",
"symfony/filesystem": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/routing": "~3.0",
"symfony/security-core": "~2.8|~3.0",
"symfony/security-csrf": "~2.8|~3.0",
Expand All @@ -40,7 +41,6 @@
"symfony/console": "~2.8|~3.0",
"symfony/css-selector": "~2.8|~3.0",
"symfony/dom-crawler": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/security": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
Expand All @@ -53,12 +53,11 @@
},
"suggest": {
"symfony/console": "For using the console commands",
"symfony/finder": "For using the translation loader and cache warmer",
"symfony/form": "For using forms",
"symfony/serializer": "For using the serializer service",
"symfony/validator": "For using validation",
"symfony/yaml": "For using the debug:config and lint:yaml commands",
"symfony/property-info": "For using the property_info_extractor service",
"symfony/property-info": "For using the property_info service",
"symfony/process": "For using the server:run, server:start, server:stop, and server:status commands"
},
"autoload": {
Expand Down

0 comments on commit a9de781

Please sign in to comment.