bug #57320 [Serializer] avoid calling undefined built-in is_*() functions (xabbuh)

xabbuh · xabbuh · commit 322e7e45afee · 2024-06-06T14:35:57.000+02:00
This PR was merged into the 7.1 branch. Discussion ---------- [Serializer] avoid calling undefined built-in is_*() functions | Q | A | ------------- | --- | Branch? | 7.1 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #57314 | License | MIT Commits ------- e0a6587 avoid calling undefined built-in is_*() functions
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1132,7 +1132,7 @@ public function testNormalizationWithMaxDepthOnStdclassObjectDoesNotThrowWarning`
`1132`	`1132`
`1133`	`1133`	`public function testDenormalizeCollectionOfScalarTypesPropertyWithPhpDocExtractor()`
`1134`	`1134`	`{`
`1135`		`- $normalizer = new AbstractObjectNormalizerWithMetadataAndPhpDocExtractor();`
	`1135`	`+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();`
`1136`	`1136`	`$data = [`
`1137`	`1137`	`'type' => 'foo',`
`1138`	`1138`	`'values' => [`
`@@ -1150,7 +1150,7 @@ public function testDenormalizeCollectionOfScalarTypesPropertyWithPhpDocExtracto`
`1150`	`1150`
`1151`	`1151`	`public function testDenormalizeCollectionOfUnionTypesPropertyWithPhpDocExtractor()`
`1152`	`1152`	`{`
`1153`		`- $normalizer = new AbstractObjectNormalizerWithMetadataAndPhpDocExtractor();`
	`1153`	`+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();`
`1154`	`1154`	`$data = [`
`1155`	`1155`	`'values1' => [`
`1156`	`1156`	`'foo' => 'foo',`
`@@ -1166,6 +1166,15 @@ public function testDenormalizeCollectionOfUnionTypesPropertyWithPhpDocExtractor`
`1166`	`1166`
`1167`	`1167`	`$this->assertEquals($expected, $normalizer->denormalize($data, UnionCollectionDocBlockDummy::class));`
`1168`	`1168`	`}`
	`1169`	`+`
	`1170`	`+ public function testDenormalizeMixedProperty()`
	`1171`	`+ {`
	`1172`	`+ $normalizer = new AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors();`
	`1173`	`+ $expected = new MixedPropertyDummy();`
	`1174`	`+ $expected->foo = 'bar';`
	`1175`	`+`
	`1176`	`+ $this->assertEquals($expected, $normalizer->denormalize(['foo' => 'bar'], MixedPropertyDummy::class));`
	`1177`	`+ }`
`1169`	`1178`	`}`
`1170`	`1179`
`1171`	`1180`	`class AbstractObjectNormalizerDummy extends AbstractObjectNormalizer`
`@@ -1268,6 +1277,11 @@ class SnakeCaseNestedDummy`
`1268`	`1277`	`public $fooBar;`
`1269`	`1278`	`}`
`1270`	`1279`
	`1280`	`+class MixedPropertyDummy`
	`1281`	`+{`
	`1282`	`+ public mixed $foo;`
	`1283`	`+}`
	`1284`	`+`
`1271`	`1285`	`#[DiscriminatorMap(typeProperty: 'type', mapping: [`
`1272`	`1286`	`'first' => FirstNestedDummyWithConstructorAndDiscriminator::class,`
`1273`	`1287`	`'second' => SecondNestedDummyWithConstructorAndDiscriminator::class,`
`@@ -1612,11 +1626,11 @@ public function __construct(`
`1612`	`1626`	`public array $values2;`
`1613`	`1627`	`}`
`1614`	`1628`
`1615`		`-class AbstractObjectNormalizerWithMetadataAndPhpDocExtractor extends AbstractObjectNormalizer`
	`1629`	`+class AbstractObjectNormalizerWithMetadataAndPropertyTypeExtractors extends AbstractObjectNormalizer`
`1616`	`1630`	`{`
`1617`	`1631`	`public function __construct()`
`1618`	`1632`	`{`
`1619`		`- parent::__construct(new ClassMetadataFactory(new AttributeLoader()), null, new PropertyInfoExtractor([], [new PhpDocExtractor()]));`
	`1633`	`+ parent::__construct(new ClassMetadataFactory(new AttributeLoader()), null, new PropertyInfoExtractor([], [new PhpDocExtractor(), new ReflectionExtractor()]));`
`1620`	`1634`	`}`
`1621`	`1635`
`1622`	`1636`	`protected function extractAttributes(object $object, ?string $format = null, array $context = []): array`