Skip to content

fix "nullable" check in trait and allow setting "null" property value in normalize #1

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

Closed
wants to merge 2 commits into from
Closed

fix "nullable" check in trait and allow setting "null" property value in normalize #1

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
c3fd7db
Do not skip "nullable" properties in normalize
tecbird Jan 17, 2025
77b7e99
Fix condition for "nullable" properties
tecbird Jan 17, 2025
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
19 changes: 13 additions & 6 deletions Generator/Normalizer/NormalizerGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,20 @@ protected function createNormalizeMethod(string $modelFqdn, Context $context, Cl
}

if (!$property->isRequired()) {
$statements[] = new Stmt\If_(
new Expr\BinaryOp\BooleanAnd(
if ($property->isNullable()) {
$statements[] = new Stmt\If_(
new Expr\MethodCall($objectVariable, 'isInitialized', [new Arg(new Scalar\String_($property->getPhpName()))]),
new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $propertyVar)
),
['stmts' => $normalizationStatements]
);
['stmts' => $normalizationStatements]
);
} else {
$statements[] = new Stmt\If_(
new Expr\BinaryOp\BooleanAnd(
new Expr\MethodCall($objectVariable, 'isInitialized', [new Arg(new Scalar\String_($property->getPhpName()))]),
new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $propertyVar)
),
['stmts' => $normalizationStatements]
);
}
} else {
$statements[] = new Stmt\If_(
new Expr\BinaryOp\NotIdentical(new Expr\ConstFetch(new Name('null')), $propertyVar),
Expand Down
2 changes: 1 addition & 1 deletion Guesser/Guess/CheckNullableTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public function isNullable($schema): bool
return $schema->offsetExists('x-nullable') && \is_bool($schema->offsetGet('x-nullable')) && $schema->offsetGet('x-nullable');
}
if (\get_class($schema) === 'Jane\\Component\\OpenApi3\\JsonSchema\\Model\\Schema') {
return method_exists($schema, 'getNullable') && !($schema->getNullable() ?? false);
return method_exists($schema, 'getNullable') && $schema->getNullable() === true;
}

return false;
Expand Down
Loading