Skip to content

Commit 3c6d1a9

Browse files
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
2 parents eac37cd + 26af0ae commit 3c6d1a9

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ interface EventSubscriberInterface
3838
*
3939
* * array('eventName' => 'methodName')
4040
* * array('eventName' => array('methodName', $priority))
41-
* * array('eventName' => array(array('methodName1', $priority), array('methodName2'))
41+
* * array('eventName' => array(array('methodName1', $priority), array('methodName2')))
4242
*
4343
* @return array The event names to listen to
4444
*/

src/Symfony/Component/HttpFoundation/JsonResponse.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public function setData($data = array())
106106
// PHP 5.3 triggers annoying warnings for some
107107
// types that can't be serialized as JSON (INF, resources, etc.)
108108
// but doesn't provide the JsonSerializable interface.
109-
set_error_handler('var_dump', 0);
109+
set_error_handler(function () { return false; });
110110
$data = @json_encode($data, $this->encodingOptions);
111111
} else {
112112
// PHP 5.4 and up wrap exceptions thrown by JsonSerializable

src/Symfony/Component/Yaml/Tests/Fixtures/YtsSpecificationExamples.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ yaml: |
515515
php: |
516516
array(
517517
'canonical' => 12345,
518-
'decimal' => 12345,
518+
'decimal' => 12345.0,
519519
'octal' => 014,
520520
'hexadecimal' => 0xC
521521
)
@@ -1538,7 +1538,7 @@ yaml: |
15381538
php: |
15391539
array(
15401540
'canonical' => 12345,
1541-
'decimal' => 12345,
1541+
'decimal' => 12345.0,
15421542
'octal' => 12,
15431543
'hexadecimal' => 12
15441544
)

src/Symfony/Component/Yaml/Tests/Fixtures/YtsTypeTransfers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ php: |
182182
array(
183183
'zero' => 0,
184184
'simple' => 12,
185-
'one-thousand' => 1000,
186-
'negative one-thousand' => -1000
185+
'one-thousand' => 1000.0,
186+
'negative one-thousand' => -1000.0
187187
)
188188
---
189189
test: Integers as Map Keys

0 commit comments

Comments
 (0)