fix: Allow default values for typed promoted properties & ignore missing values for nullable properties (set as null by default)

Author: autaut03

src/GoodPhp/Serialization/TypeAdapter/Primitive/ClassProperties/Property/DefaultBoundClassPropertyFactory.php

@@ -10,8 +10,10 @@ class DefaultBoundClassPropertyFactory implements BoundClassPropertyFactory
 	public function create(PropertyReflection $property, string $serializedName, string $typeAdapterType, Serializer $serializer): BoundClassProperty
 	{
 		return OptionalSkippingBoundClassProperty::wrap(
-			DefaultValueSkippingBoundClassProperty::wrap(
-				DirectlyBoundClassProperty::from($property, $serializedName, $typeAdapterType, $serializer)
+			NullSkippingBoundClassProperty::wrap(
+				DefaultValueSkippingBoundClassProperty::wrap(
+					DirectlyBoundClassProperty::from($property, $serializedName, $typeAdapterType, $serializer)
+				)
 			)
 		);
 	}

src/GoodPhp/Serialization/TypeAdapter/Primitive/ClassProperties/Property/DefaultValueSkippingBoundClassProperty.php

@@ -2,6 +2,7 @@
 
 namespace GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\Property;
 
+use Closure;
 use GoodPhp\Reflection\Reflector\Reflection\PropertyReflection;
 use GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\MissingValueException;
 
@@ -14,16 +15,21 @@ class DefaultValueSkippingBoundClassProperty implements BoundClassProperty
 {
 	public function __construct(
 		private readonly BoundClassProperty $delegate,
+		private readonly Closure $defaultValue,
 	) {
 	}
 
 	public static function wrap(BoundClassProperty $property): BoundClassProperty
 	{
-		if (!$property->reflection()->hasDefaultValue()) {
-			return $property;
+		if ($property->reflection()->hasDefaultValue()) {
+			return new self($property, fn () => $property->reflection()->defaultValue());
 		}
 
-		return new self($property);
+		if ($property->reflection()->promotedParameter() && $property->reflection()->promotedParameter()->hasDefaultValue()) {
+			return new self($property, fn () => $property->reflection()->promotedParameter()->hasDefaultValue());
+		}
+
+		return $property;
 	}
 
 	public function reflection(): PropertyReflection
@@ -52,7 +58,9 @@ public function deserialize(array $data): array
 		try {
 			return $this->delegate->deserialize($data);
 		} catch (MissingValueException) {
-			return [];
+			return [
+				$this->reflection()->name() => ($this->defaultValue)(),
+			];
 		}
 	}
 }

src/GoodPhp/Serialization/TypeAdapter/Primitive/ClassProperties/Property/NullSkippingBoundClassProperty.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\Property;
+
+use GoodPhp\Reflection\Reflector\Reflection\PropertyReflection;
+use GoodPhp\Reflection\Type\Special\NullableType;
+use GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\MissingValueException;
+
+/**
+ * Skips nullable fields if their value is missing.
+ *
+ * @template T
+ */
+class NullSkippingBoundClassProperty implements BoundClassProperty
+{
+	public function __construct(
+		private readonly BoundClassProperty $delegate,
+	) {
+	}
+
+	public static function wrap(BoundClassProperty $property): BoundClassProperty
+	{
+		if (!$property->reflection()->type() instanceof NullableType) {
+			return $property;
+		}
+
+		return new self($property);
+	}
+
+	public function reflection(): PropertyReflection
+	{
+		return $this->delegate->reflection();
+	}
+
+	public function serializedName(): string
+	{
+		return $this->delegate->serializedName();
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function serialize(object $object): array
+	{
+		return $this->delegate->serialize($object);
+	}
+
+	/**
+	 * @inheritDoc
+	 */
+	public function deserialize(array $data): array
+	{
+		try {
+			return $this->delegate->deserialize($data);
+		} catch (MissingValueException) {
+			return [
+				$this->reflection()->name() => null,
+			];
+		}
+	}
+}

tests/Integration/JsonSerializationTest.php

@@ -16,7 +16,6 @@
 use GoodPhp\Serialization\TypeAdapter\Exception\UnexpectedEnumValueException;
 use GoodPhp\Serialization\TypeAdapter\Exception\UnexpectedValueTypeException;
 use GoodPhp\Serialization\TypeAdapter\Json\JsonTypeAdapter;
-use GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\MissingValueException;
 use GoodPhp\Serialization\TypeAdapter\Primitive\ClassProperties\PropertyMappingException;
 use Illuminate\Support\Collection;
 use PHPUnit\Framework\TestCase;
@@ -336,7 +335,7 @@ public function deserializesProvider(): Generator
 				empty_optional(),
 				null,
 			),
-			'{"primitive":1,"nested":{},"date":"2020-01-01T00:00:00.000+00:00","nullable":null}',
+			'{"primitive":1,"nested":{},"date":"2020-01-01T00:00:00.000+00:00"}',
 		];
 	}
 
@@ -479,10 +478,7 @@ public function deserializesWithAnExceptionProvider(): Generator
 		];
 
 		yield 'ClassStub with wrong primitive type' => [
-			new MultipleMappingException([
-				new PropertyMappingException('primitive', new UnexpectedValueTypeException('1', PrimitiveType::integer())),
-				new PropertyMappingException('nullable', new MissingValueException()),
-			]),
+			new PropertyMappingException('primitive', new UnexpectedValueTypeException('1', PrimitiveType::integer())),
 			new NamedType(
 				ClassStub::class,
 				new Collection([