Skip to content

Commit a9e6e04

Browse files
Merge branch '2.6' into 2.7
* 2.6: [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
2 parents b54a0b8 + 9334d5b commit a9e6e04

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

ButtonBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ public function setMethod($method)
498498
*/
499499
public function setRequestHandler(RequestHandlerInterface $requestHandler)
500500
{
501-
throw new BadMethodCallException('Buttons do not support form processors.');
501+
throw new BadMethodCallException('Buttons do not support request handlers.');
502502
}
503503

504504
/**

0 commit comments

Comments
 (0)