Skip to content

[PHP] FIXES #9171 Return type not added to constructor override #9234

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

Open
DamImpr wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

[PHP] FIXES #9171 Return type not added to constructor override #9234

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
7 changes: 5 additions & 2 deletions php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCompletionItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1452,11 +1452,14 @@ protected String getNameAndFunctionBodyForTemplate() {
if (phpVersion != null
&& phpVersion.compareTo(PhpVersion.PHP_70) >= 0) {
Collection<TypeResolver> returnTypes = getBaseFunctionElement().getReturnTypes();
// check whether the method in question is the constructor. If it is, the return type should not be added.
boolean isConstructor = getBaseFunctionElement() instanceof MethodElement
&& ((MethodElement) getBaseFunctionElement()).isConstructor();
// we can also write a union type in phpdoc e.g. @return int|float
// check whether the union type is actual declared return type to avoid adding the union type for phpdoc
if (returnTypes.size() == 1
if (!isConstructor && (returnTypes.size() == 1
|| getBaseFunctionElement().isReturnUnionType()
|| getBaseFunctionElement().isReturnIntersectionType()) {
|| getBaseFunctionElement().isReturnIntersectionType())) {
String returnType = getBaseFunctionElement().asString(PrintAs.ReturnTypes, typeNameResolver, phpVersion);
if (StringUtils.hasText(returnType)) {
boolean nullableType = CodeUtils.isNullableType(returnType);
Expand Down
Loading