From 5cdccc43507e33abbac3b6bc0f6bba9a3e3da967 Mon Sep 17 00:00:00 2001 From: omerida Date: Tue, 12 Jan 2016 14:46:23 -0500 Subject: [PATCH 1/3] Add closing parenthesis --- .../Component/EventDispatcher/EventSubscriberInterface.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php index ec53e54e20..8af778919b 100644 --- a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php +++ b/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php @@ -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 */ From c5479dde8cbbdbd8a5aa205846630969b3804114 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 13 Jan 2016 08:28:48 +0100 Subject: [PATCH 2/3] [2.3] Workaround https://bugs.php.net/63206 --- src/Symfony/Component/HttpFoundation/JsonResponse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php index 13611425d4..9d7b9ebd31 100644 --- a/src/Symfony/Component/HttpFoundation/JsonResponse.php +++ b/src/Symfony/Component/HttpFoundation/JsonResponse.php @@ -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 From 902f6ddb93732fe83378ef36e6d3f4ab8f17ceda Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Wed, 13 Jan 2016 09:54:41 +0100 Subject: [PATCH 3/3] [Yaml] Fix tests on PHP 7.0.2 --- .../Yaml/Tests/Fixtures/YtsSpecificationExamples.yml | 4 ++-- .../Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml index f8f002eb41..a06df7fb31 100644 --- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml +++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml @@ -515,7 +515,7 @@ yaml: | php: | array( 'canonical' => 12345, - 'decimal' => 12345, + 'decimal' => 12345.0, 'octal' => 014, 'hexadecimal' => 0xC ) @@ -1536,7 +1536,7 @@ yaml: | php: | array( 'canonical' => 12345, - 'decimal' => 12345, + 'decimal' => 12345.0, 'octal' => 12, 'hexadecimal' => 12 ) diff --git a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml index aac4e68077..46c8d4a2c0 100644 --- a/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml +++ b/src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml @@ -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