diff --git a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php index c4a8c7a7b5a6d..509e44c0a2f14 100644 --- a/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php +++ b/src/Symfony/Component/Serializer/Normalizer/JsonSerializableNormalizer.php @@ -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) { diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableCircularReferenceDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableCircularReferenceDummy.php new file mode 100644 index 0000000000000..6dbed8f98d943 --- /dev/null +++ b/src/Symfony/Component/Serializer/Tests/Fixtures/JsonSerializableCircularReferenceDummy.php @@ -0,0 +1,25 @@ + + * + * 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 + */ +class JsonSerializableCircularReferenceDummy implements \JsonSerializable +{ + public function jsonSerialize(): array + { + return [ + 'me' => $this, + ]; + } +} diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php index e0222a5fa0b9c..cf6310a980ade 100644 --- a/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php +++ b/src/Symfony/Component/Serializer/Tests/Normalizer/JsonSerializableNormalizerTest.php @@ -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 */ class JsonSerializableNormalizerTest extends TestCase { + use CircularReferenceTestTrait; + /** * @var JsonSerializableNormalizer */ @@ -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);