Skip to content

[PropertyInfo] ensure compatibility with type resolver 0.5 #33626

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

Merged
merged 1 commit into from
Sep 18, 2019
Merged

[PropertyInfo] ensure compatibility with type resolver 0.5 #33626

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion src/Symfony/Component/PropertyInfo/Util/PhpDocTypeHelper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@ public function getTypes(DocType $varType)

$varTypes = [];
for ($typeIndex = 0; $varType->has($typeIndex); ++$typeIndex) {
$varTypes[] = (string) $varType->get($typeIndex);
$nestedVarType = $varType->get($typeIndex);

if ($nestedVarType instanceof Nullable) {
$varTypes[] = (string) $nestedVarType->getActualType();
$nullable = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it expected that this could never be false again the loop? Just asking, I am currently on a phone 😊

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least that's the current behaviour. The failing example docblock here was ?string|int which was expected to reveal string and int as types both being nullable.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the thing is, nullable applies to the whole typehint. Either null is allowed or it is not. But it cannot be both of them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @stof, that’s what I thought but wanted to be sure 👍🏻

} else {
$varTypes[] = (string) $nestedVarType;
}
}

// If null is present, all types are nullable
Expand Down