diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
index df3d693f21fc..27c383177c09 100644
--- a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
+++ b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -773,11 +773,24 @@ private function validateAndDenormalize(Type $type, string $currentClass, string
return (float) $data;
}
- if ((TypeIdentifier::FALSE === $typeIdentifier && false === $data) || (TypeIdentifier::TRUE === $typeIdentifier && true === $data)) {
- return $data;
- }
-
- if (('is_'.$typeIdentifier->value)($data)) {
+ $dataMatchesExpectedType = match ($typeIdentifier) {
+ TypeIdentifier::ARRAY => \is_array($data),
+ TypeIdentifier::BOOL => \is_bool($data),
+ TypeIdentifier::CALLABLE => \is_callable($data),
+ TypeIdentifier::FALSE => false === $data,
+ TypeIdentifier::FLOAT => \is_float($data),
+ TypeIdentifier::INT => \is_int($data),
+ TypeIdentifier::ITERABLE => is_iterable($data),
+ TypeIdentifier::MIXED => true,
+ TypeIdentifier::NULL => null === $data,
+ TypeIdentifier::OBJECT => \is_object($data),
+ TypeIdentifier::RESOURCE => \is_resource($data),
+ TypeIdentifier::STRING => \is_string($data),
+ TypeIdentifier::TRUE => true === $data,
+ default => false,
+ };
+
+ if ($dataMatchesExpectedType) {
return $data;
}
} catch (NotNormalizableValueException|InvalidArgumentException $e) {
diff --git a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
index f41c0fdf3956..21ce5d7684c9 100644
--- a/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
+++ b/src/Symfony/Component/Serializer/Tests/Normalizer/AbstractObjectNormalizerTest.php
@@ -1132,7 +1132,7 @@ public function testNormalizationWithMaxDepthOnStdclassObjectDoesNotThrowWarning
public function testDenormalizeCollectionOfScalarTypesPropertyWithPhpDocExtractor()
{
- $normalizer = new AbstractObjectNormalizerWithMetadataAndPhpDocExtractor();
+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();
$data = [
'type' => 'foo',
'values' => [
@@ -1150,7 +1150,7 @@ public function testDenormalizeCollectionOfScalarTypesPropertyWithPhpDocExtracto
public function testDenormalizeCollectionOfUnionTypesPropertyWithPhpDocExtractor()
{
- $normalizer = new AbstractObjectNormalizerWithMetadataAndPhpDocExtractor();
+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();
$data = [
'values1' => [
'foo' => 'foo',
@@ -1166,6 +1166,15 @@ public function testDenormalizeCollectionOfUnionTypesPropertyWithPhpDocExtractor
$this->assertEquals($expected, $normalizer->denormalize($data, UnionCollectionDocBlockDummy::class));
}
+
+ public function testDenormalizeMixedProperty()
+ {
+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();
+ $expected = new MixedPropertyDummy();
+ $expected->foo = 'bar';
+
+ $this->assertEquals($expected, $normalizer->denormalize(['foo' => 'bar'], MixedPropertyDummy::class));
+ }
}
class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer
@@ -1268,6 +1277,11 @@ class SnakeCaseNestedDummy
public $fooBar;
}
+class MixedPropertyDummy
+{
+ public mixed $foo;
+}
+
#[DiscriminatorMap(typeProperty: 'type', mapping: [
'first' => FirstNestedDummyWithConstructorAndDiscriminator::class,
'second' => SecondNestedDummyWithConstructorAndDiscriminator::class,
@@ -1612,11 +1626,11 @@ public function __construct(
public array $values2;
}
-class AbstractObjectNormalizerWithMetadataAndPhpDocExtractor extends AbstractObjectNormalizer
+class AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors extends AbstractObjectNormalizer
{
public function __construct()
{
- parent::__construct(new ClassMetadataFactory(new AttributeLoader()), null, new PropertyInfoExtractor([], [new PhpDocExtractor()]));
+ parent::__construct(new ClassMetadataFactory(new AttributeLoader()), null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]));
}
protected function extractAttributes(object $object, ?string $format = null, array $context = []): array
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy