Merge branch '2.3' into 2.6

nicolas-grekas · nicolas-grekas · commit acb7cfad1be8 · 2015-07-22T12:08:40.000+02:00
* 2.3:
  [Security] fix check for empty usernames
  [Form] updated exception message of ButtonBuilder::setRequestHandler()
  [travis] Fix deps=high jobs
  [HttpFoundation] [PSR-7] Allow to use resources as content body and to return resources from string content
  [DependencyInjection] Remove unused code in XmlFileLoader
  [HttpFoundation] Behaviour change in PHP7 for substr
  bumped Symfony version to 2.3.32
  updated VERSION for 2.3.31
  update CONTRIBUTORS for 2.3.31
  updated CHANGELOG for 2.3.31

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
	src/Symfony/Component/HttpKernel/Kernel.php
diff --git a/ButtonBuilder.php b/ButtonBuilder.php
@@ -498,7 +498,7 @@ public function setMethod($method)
      */
     public function setRequestHandler(RequestHandlerInterface $requestHandler)
     {
-        throw new BadMethodCallException('Buttons do not support form processors.');
+        throw new BadMethodCallException('Buttons do not support request handlers.');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -498,7 +498,7 @@ public function setMethod($method)`
`498`	`498`	`*/`
`499`	`499`	`public function setRequestHandler(RequestHandlerInterface $requestHandler)`
`500`	`500`	`{`
`501`		`- throw new BadMethodCallException('Buttons do not support form processors.');`
	`501`	`+ throw new BadMethodCallException('Buttons do not support request handlers.');`
`502`	`502`	`}`
`503`	`503`
`504`	`504`	`/**`