Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite5c2029

Browse files
committed
Fix serializer do not transform empty \Traversable to Array
1 parent1bc3ee7 commite5c2029

File tree

2 files changed

+25
-0
lines changed

2 files changed

+25
-0
lines changed

‎src/Symfony/Component/Serializer/Serializer.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ public function normalize($data, $format = null, array $context = [])
157157
}
158158

159159
if (\is_array($data) ||$datainstanceof \Traversable) {
160+
if ($datainstanceof \Countable &&0 ===$data->count()) {
161+
return$data;
162+
}
163+
160164
$normalized = [];
161165
foreach ($dataas$key =>$val) {
162166
$normalized[$key] =$this->normalize($val,$format,$context);

‎src/Symfony/Component/Serializer/Tests/SerializerTest.php‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
useSymfony\Component\Serializer\Mapping\Factory\ClassMetadataFactory;
2626
useSymfony\Component\Serializer\Mapping\Factory\ClassMetadataFactoryInterface;
2727
useSymfony\Component\Serializer\Mapping\Loader\AnnotationLoader;
28+
useSymfony\Component\Serializer\Normalizer\AbstractObjectNormalizer;
2829
useSymfony\Component\Serializer\Normalizer\ArrayDenormalizer;
2930
useSymfony\Component\Serializer\Normalizer\CustomNormalizer;
3031
useSymfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
@@ -490,6 +491,26 @@ public function testNotNormalizableValueExceptionMessageForAResource()
490491
(newSerializer())->normalize(tmpfile());
491492
}
492493

494+
publicfunctiontestNormalizePreserveEmptyArrayObject()
495+
{
496+
$serializer =newSerializer(
497+
[
498+
newPropertyNormalizer(),
499+
newObjectNormalizer(),
500+
newArrayDenormalizer(),
501+
],
502+
[
503+
'json' =>newJsonEncoder(),
504+
]
505+
);
506+
507+
$object = [];
508+
$object['foo'] =new \ArrayObject();
509+
$object['bar'] =new \ArrayObject(['notempty']);
510+
$object['baz'] =new \ArrayObject(['nested' =>new \ArrayObject()]);
511+
$this->assertEquals('{"foo":{},"bar":["notempty"],"baz":{"nested":{}}}',$serializer->serialize($object,'json', [AbstractObjectNormalizer::PRESERVE_EMPTY_OBJECTS =>true]));
512+
}
513+
493514
privatefunctionserializerWithClassDiscriminator()
494515
{
495516
$classMetadataFactory =newClassMetadataFactory(newAnnotationLoader(newAnnotationReader()));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp