[Serializer][PropertyInfo] Add support of false built-in type (from PHP 8.2)

alexandre-daubois · alexandre-daubois · commit 3c4de502e46b · 2022-04-08T23:49:37.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -272,6 +272,23 @@ public function php81TypesProvider()
         ];
     }
 
+    /**
+     * @dataProvider php82TypesProvider
+     * @requires PHP 8.2
+     */
+    public function testExtractPhp82Type($property, array $type = null)
+    {
+        $this->assertEquals($type, $this->extractor->getTypes('Symfony\Component\PropertyInfo\Tests\Fixtures\Php82Dummy', $property, []));
+    }
+
+    public function php82TypesProvider()
+    {
+        if (\PHP_VERSION_ID >= 80200) {
+            yield ['nil', null];
+            yield ['false', [new Type(Type::BUILTIN_TYPE_FALSE)]];
+        }
+    }
+
     /**
      * @dataProvider defaultValueProvider
      */
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Symfony\Component\PropertyInfo\Tests\Fixtures;
+
+class Php82Dummy
+{
+    public null $nil = null;
+
+    public false $false = false;
+}
diff --git a/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php b/src/Symfony/Component/PropertyInfo/Tests/TypeTest.php
@@ -49,4 +49,15 @@ public function testInvalidType()
         $this->expectExceptionMessage('"foo" is not a valid PHP type.');
         new Type('foo');
     }
+
+    public function testFalseType()
+    {
+        if (\PHP_VERSION_ID < 80200) {
+            $this->expectException(\InvalidArgumentException::class);
+            $this->expectExceptionMessage('"false" is not a valid PHP type.');
+        }
+
+        $type = new Type('false');
+        $this->assertEquals(Type::BUILTIN_TYPE_FALSE, $type->getBuiltinType());
+    }
 }
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
@@ -28,6 +28,7 @@ class Type
     public const BUILTIN_TYPE_OBJECT = 'object';
     public const BUILTIN_TYPE_ARRAY = 'array';
     public const BUILTIN_TYPE_NULL = 'null';
+    public const BUILTIN_TYPE_FALSE = 'false';
     public const BUILTIN_TYPE_CALLABLE = 'callable';
     public const BUILTIN_TYPE_ITERABLE = 'iterable';
 
@@ -61,6 +62,10 @@ class Type
      */
     public function __construct(string $builtinType, bool $nullable = false, string $class = null, bool $collection = false, self $collectionKeyType = null, self $collectionValueType = null)
     {
+        if (\PHP_VERSION_ID >= 80200) {
+            static::$builtinTypes[] = self::BUILTIN_TYPE_FALSE;
+        }
+
         if (!\in_array($builtinType, self::$builtinTypes)) {
             throw new \InvalidArgumentException(sprintf('"%s" is not a valid PHP type.', $builtinType));
         }
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -483,7 +483,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,
                     return (float) $data;
                 }
 
-                if (('is_'.$builtinType)($data)) {
+                if (Type::BUILTIN_TYPE_FALSE === $builtinType || ('is_'.$builtinType)($data)) {
                     return $data;
                 }
             } catch (NotNormalizableValueException $e) {
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/FalseBuiltInDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/FalseBuiltInDummy.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Symfony\Component\Serializer\Tests\Fixtures;
+
+class FalseBuiltInDummy
+{
+    public false $false = false;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -51,6 +51,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageInterface;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberOne;
 use Symfony\Component\Serializer\Tests\Fixtures\DummyMessageNumberTwo;
+use Symfony\Component\Serializer\Tests\Fixtures\FalseBuiltInDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\NormalizableTraversableDummy;
 use Symfony\Component\Serializer\Tests\Fixtures\TraversableDummy;
 use Symfony\Component\Serializer\Tests\Normalizer\TestDenormalizer;
@@ -572,6 +573,17 @@ public function testUnionTypeDeserializable()
         $this->assertEquals(new DummyUnionType(), $actual, 'Union type denormalization third case failed.');
     }
 
+    /**
+     * @requires PHP 8.2
+     */
+    public function testFalseBuiltInTypes()
+    {
+        $extractor = new PropertyInfoExtractor([], [new ReflectionExtractor()]);
+        $serializer = new Serializer([new ObjectNormalizer(null, null, null, $extractor)], ['json' => new JsonEncoder()]);
+
+        $serializer->deserialize('{"false":false}', FalseBuiltInDummy::class, 'json');
+    }
+
     private function serializerWithClassDiscriminator()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));

Original file line number	Diff line number	Diff line change
`@@ -483,7 +483,7 @@ private function validateAndDenormalize(string $currentClass, string $attribute,`
`483`	`483`	`return (float) $data;`
`484`	`484`	`}`
`485`	`485`
`486`		`- if (('is_'.$builtinType)($data)) {`
	`486`	`+ if (Type::BUILTIN_TYPE_FALSE === $builtinType \|\| ('is_'.$builtinType)($data)) {`
`487`	`487`	`return $data;`
`488`	`488`	`}`
`489`	`489`	`} catch (NotNormalizableValueException $e) {`