Merge pull request #602 from rust17/main

Fix issue where non set optional values were transformed
spatie · Dec 1, 2023 · f61000f · f61000f
2 parents 02752fc + 9452f08
commit f61000f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/src/Transformers/DataTransformer.php b/src/Transformers/DataTransformer.php
@@ -76,6 +76,10 @@ protected function resolvePayload(TransformableData $data): array
 
             $name = $property->name;
 
+            if ($property->type->isOptional && ! array_key_exists($name, get_object_vars($data))) {
+                continue;
+            }
+
             if (! $this->shouldIncludeProperty($name, $data->{$name}, $trees)) {
                 continue;
             }

diff --git a/tests/ValidationTest.php b/tests/ValidationTest.php
@@ -2379,3 +2379,15 @@ public static function rules(ValidationContext $context): array
         ->assertOk(['success' => true, 'id' => 1])
         ->assertErrors(['success' => true]);
 })->skip('V4: The rule inferrers need to be rewritten/removed for this, we need to first add attribute rules and then decide require stuff');
+
+it('can validate an optional but nonexists attribute', function () {
+    $dataClass = new class () extends Data {
+        public array|null|Optional $property;
+    };
+
+    expect($dataClass::from()->toArray())->toBe([]);
+    expect($dataClass::from([])->toArray())->toBe([]);
+    expect($dataClass::from(['property' => null])->toArray())->toBe(['property' => null]);
+    expect($dataClass::from(['property' => []])->toArray())->toBe(['property' => []]);
+    expect($dataClass::validateAndCreate([])->toArray())->toBe([]);
+});