Skip to content

Commit cd20971

Browse files
Merge branch '5.4' into 6.0
* 5.4: [Serializer] Fix AbstractObjectNormalizer not considering pseudo type false [Serializer] Fix JsonSerializableNormalizer ignores circular reference handler in $context [Serializer][PropertyInfo] Fix support for "false" built-in type on PHP 8.2 [ErrorHandler] Fix list of tentative return types Fix CS in Console Table after #45565 Suppress unhandled error in some specific use-cases. fix italian translation for validators
2 parents 76b9a43 + b548151 commit cd20971

File tree

5 files changed

+75
-1
lines changed

5 files changed

+75
-1
lines changed

Normalizer/JsonSerializableNormalizer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer
2727
public function normalize(mixed $object, string $format = null, array $context = []): array|string|int|float|bool|\ArrayObject|null
2828
{
2929
if ($this->isCircularReference($object, $context)) {
30-
return $this->handleCircularReference($object);
30+
return $this->handleCircularReference($object, $format, $context);
3131
}
3232

3333
if (!$object instanceof \JsonSerializable) {

Tests/Fixtures/FalseBuiltInDummy.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Serializer\Tests\Fixtures;
13+
14+
class FalseBuiltInDummy
15+
{
16+
public false $false = false;
17+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
3+
/*
4+
* This file is part of the Symfony package.
5+
*
6+
* (c) Fabien Potencier <[email protected]>
7+
*
8+
* For the full copyright and license information, please view the LICENSE
9+
* file that was distributed with this source code.
10+
*/
11+
12+
namespace Symfony\Component\Serializer\Tests\Fixtures;
13+
14+
/**
15+
* @author Marvin Feldmann <[email protected]>
16+
*/
17+
class JsonSerializableCircularReferenceDummy implements \JsonSerializable
18+
{
19+
public function jsonSerialize(): array
20+
{
21+
return [
22+
'me' => $this,
23+
];
24+
}
25+
}

Tests/Normalizer/JsonSerializableNormalizerTest.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,19 @@
1717
use Symfony\Component\Serializer\Exception\InvalidArgumentException;
1818
use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
1919
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
20+
use Symfony\Component\Serializer\Serializer;
2021
use Symfony\Component\Serializer\SerializerInterface;
22+
use Symfony\Component\Serializer\Tests\Fixtures\JsonSerializableCircularReferenceDummy;
2123
use Symfony\Component\Serializer\Tests\Fixtures\JsonSerializableDummy;
24+
use Symfony\Component\Serializer\Tests\Normalizer\Features\CircularReferenceTestTrait;
2225

2326
/**
2427
* @author Fred Cox <[email protected]>
2528
*/
2629
class JsonSerializableNormalizerTest extends TestCase
2730
{
31+
use CircularReferenceTestTrait;
32+
2833
/**
2934
* @var JsonSerializableNormalizer
3035
*/
@@ -86,6 +91,19 @@ public function testCircularNormalize()
8691
$this->assertEquals('string_object', $this->normalizer->normalize(new JsonSerializableDummy()));
8792
}
8893

94+
protected function getNormalizerForCircularReference(array $defaultContext): JsonSerializableNormalizer
95+
{
96+
$normalizer = new JsonSerializableNormalizer(null, null, $defaultContext);
97+
new Serializer([$normalizer]);
98+
99+
return $normalizer;
100+
}
101+
102+
protected function getSelfReferencingModel()
103+
{
104+
return new JsonSerializableCircularReferenceDummy();
105+
}
106+
89107
public function testInvalidDataThrowException()
90108
{
91109
$this->expectException(InvalidArgumentException::class);

Tests/SerializerTest.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface;
5757
use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne;
5858
use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo;
59+
use Symfony\Component\Serializer\Tests\Fixtures\FalseBuiltInDummy;
5960
use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
6061
use Symfony\Component\Serializer\Tests\Fixtures\Php74Full;
6162
use Symfony\Component\Serializer\Tests\Fixtures\Php80WithPromotedTypedConstructor;
@@ -750,6 +751,19 @@ public function testUnionTypeDeserializable()
750751
$this->assertEquals(new DummyUnionType(), $actual, 'Union type denormalization third case failed.');
751752
}
752753

754+
/**
755+
* @requires PHP 8.2
756+
*/
757+
public function testFalseBuiltInTypes()
758+
{
759+
$extractor = new PropertyInfoExtractor([], [new ReflectionExtractor()]);
760+
$serializer = new Serializer([new ObjectNormalizer(null, null, null, $extractor)], ['json' => new JsonEncoder()]);
761+
762+
$actual = $serializer->deserialize('{"false":false}', FalseBuiltInDummy::class, 'json');
763+
764+
$this->assertEquals(new FalseBuiltInDummy(), $actual);
765+
}
766+
753767
private function serializerWithClassDiscriminator()
754768
{
755769
$classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));

0 commit comments

Comments
 (0)