Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue where non set optional values were transformed #602

Merged
merged 2 commits into from
Dec 1, 2023
Merged

Fix issue where non set optional values were transformed #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0342ece
Fix issue where non set optional values were transformed
rust17 Nov 8, 2023
9452f08
test: add more test case
rust17 Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Transformers/DataTransformer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
12 changes: 12 additions & 0 deletions tests/ValidationTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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([]);
});
Loading