Skip to content

Commit 34c8a4b

Browse files
Merge branch '2.7' into 2.8
* 2.7: [Yaml] Fix tests on PHP 7.0.2 [2.7] Workaround https://bugs.php.net/63206 [2.3] Workaround https://bugs.php.net/63206 Add closing parenthesis [Serializer] Unset object_to_populate after using it [Serializer] Allow to use proxies in object_to_populate
2 parents 085a1eb + a91e8af commit 34c8a4b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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
)

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)