Skip to content

symfony 6.0 #98

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

Closed
wants to merge 1 commit into from
Closed

symfony 6.0 #98

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
92 changes: 67 additions & 25 deletions src/Serializer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,84 @@

use Symfony\Component\Serializer\Serializer as BaseSerializer;

final class Serializer extends BaseSerializer
{
private const KEY_TYPE = '#type';
private const KEY_SCALAR = '#scalar';

public function normalize($data, $format = null, array $context = [])
if (PHP_VERSION_ID >= 80000) {
final class Serializer extends BaseSerializer
{
$normalizedData = parent::normalize($data, $format, $context);
private const KEY_TYPE = '#type';
private const KEY_SCALAR = '#scalar';

public function normalize($data, $format = null, array $context = []): \ArrayObject|array|string|int|float|bool|null
{
$normalizedData = parent::normalize($data, $format, $context);

if (\is_object($data)) {
$typeData = [self::KEY_TYPE => \get_class($data)];
$valueData = is_scalar($normalizedData) ? [self::KEY_SCALAR => $normalizedData] : $normalizedData;
$normalizedData = array_merge($typeData, $valueData);
if (\is_object($data)) {
$typeData = [self::KEY_TYPE => $data::class];
$valueData = is_scalar($normalizedData) ? [self::KEY_SCALAR => $normalizedData] : $normalizedData;
$normalizedData = array_merge($typeData, $valueData);
}

return $normalizedData;
}

return $normalizedData;
}
public function denormalize($data, $class, $format = null, array $context = []): mixed
{
if (\is_array($data) && (isset($data[self::KEY_TYPE]))) {
$type = $data[self::KEY_TYPE];
unset($data[self::KEY_TYPE]);

public function denormalize($data, $class, $format = null, array $context = [])
{
if (\is_array($data) && (isset($data[self::KEY_TYPE]))) {
$type = $data[self::KEY_TYPE];
unset($data[self::KEY_TYPE]);
$data = $data[self::KEY_SCALAR] ?? $data;
$data = $this->denormalize($data, $type, $format, $context);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line should be removed in the two versions (it is actually one of the fixes introduced in #87), because it triggers two denormalizations, which is wrong in most cases since it will potentially try to denormalize an object.


return parent::denormalize($data, $type, $format, $context);
}

$data = $data[self::KEY_SCALAR] ?? $data;
$data = $this->denormalize($data, $type, $format, $context);
if (is_iterable($data)) {
$class = ('' === $class) ? 'stdClass' : $class;

return parent::denormalize($data, $type, $format, $context);
return parent::denormalize($data, $class.'[]', $format, $context);
}

return $data;
}
}
} else {
final class Serializer extends BaseSerializer
{
private const KEY_TYPE = '#type';
private const KEY_SCALAR = '#scalar';

public function normalize($data, $format = null, array $context = [])
{
$normalizedData = parent::normalize($data, $format, $context);

if (is_iterable($data)) {
$class = ('' === $class) ? 'stdClass' : $class;
if (\is_object($data)) {
$typeData = [self::KEY_TYPE => \get_class($data)];
$valueData = is_scalar($normalizedData) ? [self::KEY_SCALAR => $normalizedData] : $normalizedData;
$normalizedData = array_merge($typeData, $valueData);
}

return parent::denormalize($data, $class.'[]', $format, $context);
return $normalizedData;
}

return $data;
public function denormalize($data, $class, $format = null, array $context = [])
{
if (\is_array($data) && (isset($data[self::KEY_TYPE]))) {
$type = $data[self::KEY_TYPE];
unset($data[self::KEY_TYPE]);

$data = $data[self::KEY_SCALAR] ?? $data;
$data = $this->denormalize($data, $type, $format, $context);

return parent::denormalize($data, $type, $format, $context);
}

if (is_iterable($data)) {
$class = ('' === $class) ? 'stdClass' : $class;

return parent::denormalize($data, $class.'[]', $format, $context);
}

return $data;
}
}
}