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

alexandre-daubois · alexandre-daubois · commit 06088082e0af · 2022-06-17T10:15:21.000+02:00
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php b/src/Symfony/Component/PropertyInfo/Tests/Extractor/ReflectionExtractorTest.php
@@ -313,6 +313,7 @@ public function php82TypesProvider()
     {
         yield ['nil', null];
         yield ['false', [new Type(Type::BUILTIN_TYPE_FALSE)]];
+        yield ['true', [new Type(Type::BUILTIN_TYPE_TRUE)]];
     }
 
     /**
diff --git a/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php b/src/Symfony/Component/PropertyInfo/Tests/Fixtures/Php82Dummy.php
@@ -16,4 +16,6 @@ class Php82Dummy
     public null $nil = null;
 
     public false $false = false;
+
+    public true $true = true;
 }
diff --git a/src/Symfony/Component/PropertyInfo/Type.php b/src/Symfony/Component/PropertyInfo/Type.php
@@ -28,8 +28,8 @@ 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_TRUE = 'true';
+    public const BUILTIN_TYPE_FALSE = 'false';
     public const BUILTIN_TYPE_CALLABLE = 'callable';
     public const BUILTIN_TYPE_ITERABLE = 'iterable';
 
@@ -47,8 +47,8 @@ class Type
         self::BUILTIN_TYPE_OBJECT,
         self::BUILTIN_TYPE_ARRAY,
         self::BUILTIN_TYPE_CALLABLE,
-        self::BUILTIN_TYPE_FALSE,
         self::BUILTIN_TYPE_TRUE,
+        self::BUILTIN_TYPE_FALSE,
         self::BUILTIN_TYPE_NULL,
         self::BUILTIN_TYPE_ITERABLE,
     ];
diff --git a/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php b/src/Symfony/Component/Serializer/Normalizer/AbstractObjectNormalizer.php
@@ -564,7 +564,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri
                     return (float) $data;
                 }
 
-                if (Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) {
+                if ((Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) || (Type::BUILTIN_TYPE_TRUE === $builtinType && true === $data)) {
                     return $data;
                 }
 
diff --git a/src/Symfony/Component/Serializer/Tests/Fixtures/TrueBuiltInDummy.php b/src/Symfony/Component/Serializer/Tests/Fixtures/TrueBuiltInDummy.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * 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;
+
+class TrueBuiltInDummy
+{
+    public true $true = true;
+}
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -61,6 +61,7 @@
 use Symfony\Component\Serializer\Tests\Fixtures\Php74Full;
 use Symfony\Component\Serializer\Tests\Fixtures\Php80WithPromotedTypedConstructor;
 use Symfony\Component\Serializer\Tests\Fixtures\TraversableDummy;
+use Symfony\Component\Serializer\Tests\Fixtures\TrueBuiltInDummy;
 use Symfony\Component\Serializer\Tests\Normalizer\TestDenormalizer;
 use Symfony\Component\Serializer\Tests\Normalizer\TestNormalizer;
 
@@ -764,6 +765,19 @@ public function testFalseBuiltInTypes()
         $this->assertEquals(new FalseBuiltInDummy(), $actual);
     }
 
+    /**
+     * @requires PHP 8.2
+     */
+    public function testTrueBuiltInTypes()
+    {
+        $extractor = new PropertyInfoExtractor([], [new ReflectionExtractor()]);
+        $serializer = new Serializer([new ObjectNormalizer(null, null, null, $extractor)], ['json' => new JsonEncoder()]);
+
+        $actual = $serializer->deserialize('{"true":true}', TrueBuiltInDummy::class, 'json');
+
+        $this->assertEquals(new TrueBuiltInDummy(), $actual);
+    }
+
     private function serializerWithClassDiscriminator()
     {
         $classMetadataFactory = new ClassMetadataFactory(new AnnotationLoader(new AnnotationReader()));

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,7 @@ public function php82TypesProvider()`
`313`	`313`	`{`
`314`	`314`	`yield ['nil', null];`
`315`	`315`	`yield ['false', [new Type(Type::BUILTIN_TYPE_FALSE)]];`
	`316`	`+ yield ['true', [new Type(Type::BUILTIN_TYPE_TRUE)]];`
`316`	`317`	`}`
`317`	`318`
`318`	`319`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,6 @@ class Php82Dummy`
`16`	`16`	`public null $nil = null;`
`17`	`17`
`18`	`18`	`public false $false = false;`
	`19`	`+`
	`20`	`+ public true $true = true;`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ private function validateAndDenormalize(array $types, string $currentClass, stri`
`564`	`564`	`return (float) $data;`
`565`	`565`	`}`
`566`	`566`
`567`		`- if (Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) {`
	`567`	`+ if ((Type::BUILTIN_TYPE_FALSE === $builtinType && false === $data) \|\| (Type::BUILTIN_TYPE_TRUE === $builtinType && true === $data)) {`
`568`	`568`	`return $data;`
`569`	`569`	`}`
`570`	`570`