Skip to content

[Serializer] Fix JsonSerializableNormalizer ignores circular reference handler in $context #46297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolas-grekas merged 1 commit into from
May 10, 2022
Merged

[Serializer] Fix JsonSerializableNormalizer ignores circular reference handler in $context #46297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class JsonSerializableNormalizer extends AbstractNormalizer
public function normalize($object, $format = null, array $context = [])
{
if ($this->isCircularReference($object, $context)) {
return $this->handleCircularReference($object);
return $this->handleCircularReference($object, $format, $context);
}

if (!$object instanceof \JsonSerializable) {
Expand Down
25 changes: 25 additions & 0 deletions src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableCircularReferenceDummy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?php

/*
* This file is part of the Symfony package.
*
* (c) Fabien Potencier <fabien@symfony.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/

namespace Symfony\Component\Serializer\Tests\Fixtures;

/**
* @author Marvin Feldmann <breyndot.echse@gmail.com>
*/
class JsonSerializableCircularReferenceDummy implements \JsonSerializable
{
public function jsonSerialize(): array
{
return [
'me' => $this,
];
}
}
18 changes: 18 additions & 0 deletions src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,19 @@
use Symfony\Component\Serializer\Exception\InvalidArgumentException;
use Symfony\Component\Serializer\Normalizer\JsonSerializableNormalizer;
use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
use Symfony\Component\Serializer\Serializer;
use Symfony\Component\Serializer\SerializerInterface;
use Symfony\Component\Serializer\Tests\Fixtures\JsonSerializableCircularReferenceDummy;
use Symfony\Component\Serializer\Tests\Fixtures\JsonSerializableDummy;
use Symfony\Component\Serializer\Tests\Normalizer\Features\CircularReferenceTestTrait;

/**
* @author Fred Cox <mcfedr@gmail.com>
*/
class JsonSerializableNormalizerTest extends TestCase
{
use CircularReferenceTestTrait;

/**
* @var JsonSerializableNormalizer
*/
Expand Down Expand Up @@ -96,6 +101,19 @@ private function doTestCircularNormalize(bool $legacy = false)
$this->assertEquals('string_object', $this->normalizer->normalize(new JsonSerializableDummy()));
}

protected function getNormalizerForCircularReference(array $defaultContext): JsonSerializableNormalizer
{
$normalizer = new JsonSerializableNormalizer(null, null, $defaultContext);
new Serializer([$normalizer]);

return $normalizer;
}

protected function getSelfReferencingModel()
{
return new JsonSerializableCircularReferenceDummy();
}

public function testInvalidDataThrowException()
{
$this->expectException(InvalidArgumentException::class);
Expand Down