Merge branch '2.3' into 2.7

* 2.3:
  [Yaml] Fix tests on PHP 7.0.2
  [2.3] Workaround https://bugs.php.net/63206
  Add closing parenthesis
This commit is contained in:
Nicolas Grekas 2016-01-13 11:26:43 +01:00
commit 3c6d1a93dd
4 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,7 @@ interface EventSubscriberInterface
*
* * array('eventName' => 'methodName')
* * array('eventName' => array('methodName', $priority))
* * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
* * array('eventName' => array(array('methodName1', $priority), array('methodName2')))
*
* @return array The event names to listen to
*/

View File

@ -106,7 +106,7 @@ class JsonResponse extends Response
// PHP 5.3 triggers annoying warnings for some
// types that can't be serialized as JSON (INF, resources, etc.)
// but doesn't provide the JsonSerializable interface.
set_error_handler('var_dump', 0);
set_error_handler(function () { return false; });
$data = @json_encode($data, $this->encodingOptions);
} else {
// PHP 5.4 and up wrap exceptions thrown by JsonSerializable

View File

@ -515,7 +515,7 @@ yaml: |
php: |
array(
'canonical' => 12345,
'decimal' => 12345,
'decimal' => 12345.0,
'octal' => 014,
'hexadecimal' => 0xC
)
@ -1538,7 +1538,7 @@ yaml: |
php: |
array(
'canonical' => 12345,
'decimal' => 12345,
'decimal' => 12345.0,
'octal' => 12,
'hexadecimal' => 12
)

View File

@ -182,8 +182,8 @@ php: |
array(
'zero' => 0,
'simple' => 12,
'one-thousand' => 1000,
'negative one-thousand' => -1000
'one-thousand' => 1000.0,
'negative one-thousand' => -1000.0
)
---
test: Integers as Map Keys