Skip to content

[PHP] Return type changed in PHP >= 8-0. Fluent setters now return static. #9431

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
matthiasblaesing merged 1 commit into from
Jun 21, 2026
Merged

[PHP] Return type changed in PHP >= 8-0. Fluent setters now return static. #9431

Show file tree
Hide file tree
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
22 changes: 22 additions & 0 deletions php/php.api.phpmodule/src/org/netbeans/modules/php/api/PhpVersion.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,28 @@ public boolean hasMixedType() {
return this.compareTo(PhpVersion.PHP_80) >= 0;
}

/**
* Check whether this version supports the static return type. (as of PHP 8.0)
*
* @return {@code true} if this version supports static return type,
* {@code false} otherwise
* @since 2.107
*/
public boolean hasStaticReturnType() {
Comment thread
matthiasblaesing marked this conversation as resolved.
return this.compareTo(PhpVersion.PHP_80) >= 0;
}

/**
* Check whether this version supports the self return type. (as of PHP 7.0)
*
* @return {@code true} if this version supports self return type,
* {@code false} otherwise
* @since 2.107
*/
public boolean hasSelfReturnType() {
return this.compareTo(PhpVersion.PHP_70) >= 0;
}

/**
* Check whether this version supports the never type.
*
Expand Down
6 changes: 6 additions & 0 deletions php/php.editor/src/org/netbeans/modules/php/editor/codegen/SinglePropertyMethodCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,12 @@ public String create(Property property) {
}

private String getReturnType() {
if (cgsInfo.isFluentSetter() && cgsInfo.getPhpVersion().hasStaticReturnType()) {
Comment thread
tmysik marked this conversation as resolved.
Comment thread
tmysik marked this conversation as resolved.
return String.format(": %s ", Type.STATIC); // NOI18N
}
if (cgsInfo.isFluentSetter() && cgsInfo.getPhpVersion().hasSelfReturnType()) {
return String.format(": %s ", Type.SELF); // NOI18N
}
if (!cgsInfo.isFluentSetter() && cgsInfo.getPhpVersion().hasVoidReturnType()) {
return String.format(": %s ", Type.VOID); // NOI18N
}
Expand Down
5 changes: 4 additions & 1 deletion php/php.editor/src/org/netbeans/modules/php/editor/completion/PHPCodeCompletion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
Expand Down Expand Up @@ -2331,7 +2332,9 @@ private void autoCompleteExpression(final PHPCompletionResult completionResult,
Model model = request.result.getModel();
Set<AliasedName> aliasedNames = ModelUtils.getAliasedNames(model, request.anchor);

for (final PhpElement element : request.index.getTopLevelElements(prefix, aliasedNames, Trait.ALIAS)) {
List<PhpElement> topLevelElements = new ArrayList<>(request.index.getTopLevelElements(prefix, aliasedNames, Trait.ALIAS));
topLevelElements.sort(Comparator.comparing(PhpElement::getName, String.CASE_INSENSITIVE_ORDER));
for (final PhpElement element : topLevelElements) {
Comment thread
matthiasblaesing marked this conversation as resolved.
if (CancelSupport.getDefault().isCancelled()) {
return;
}
Expand Down
36 changes: 18 additions & 18 deletions ...pertiesSetter/testTypedPropertiesSetter.php.testTypedPropertiesSetter_PHP70Fluent.codegen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
public function setInstanceArray(array $$instanceArray) {
public function setInstanceArray(array $$instanceArray): self {
$$this->instanceArray = $instanceArray;
return $$this;
}

public function setInstanceInt(int $$instanceInt) {
public function setInstanceInt(int $$instanceInt): self {
$$this->instanceInt = $instanceInt;
return $$this;
}

public function setInstanceString(string $$instanceString) {
public function setInstanceString(string $$instanceString): self {
$$this->instanceString = $instanceString;
return $$this;
}

public function setInstanceBool(bool $$instanceBool) {
public function setInstanceBool(bool $$instanceBool): self {
$$this->instanceBool = $instanceBool;
return $$this;
}

public function setInstanceNull($$instanceNull) {
public function setInstanceNull($$instanceNull): self {
$$this->instanceNull = $instanceNull;
return $$this;
}

public function setInstanceNullable(string $$instanceNullable) {
public function setInstanceNullable(string $$instanceNullable): self {
$$this->instanceNullable = $instanceNullable;
return $$this;
}

public function setInstanceArrayNullable(array $$instanceArrayNullable) {
public function setInstanceArrayNullable(array $$instanceArrayNullable): self {
$$this->instanceArrayNullable = $instanceArrayNullable;
return $$this;
}

public function setInstanceClass(Test53 $$instanceClass) {
public function setInstanceClass(Test53 $$instanceClass): self {
$$this->instanceClass = $instanceClass;
return $$this;
}

public static function setStaticInt(int $$staticInt) {
public static function setStaticInt(int $$staticInt): self {
self::$$staticInt = $staticInt;
return self;
}

public static function setStaticNullable(int $$staticNullable) {
public static function setStaticNullable(int $$staticNullable): self {
self::$$staticNullable = $staticNullable;
return self;
}

public function setInstanceInt74($$instanceInt74) {
public function setInstanceInt74($$instanceInt74): self {
$$this->instanceInt74 = $instanceInt74;
return $$this;
}

public function setInstanceString74($$instanceString74) {
public function setInstanceString74($$instanceString74): self {
$$this->instanceString74 = $instanceString74;
return $$this;
}

public function setInstanceBool74($$instanceBool74) {
public function setInstanceBool74($$instanceBool74): self {
$$this->instanceBool74 = $instanceBool74;
return $$this;
}

public function setInstanceNullable74($$instanceNullable74) {
public function setInstanceNullable74($$instanceNullable74): self {
$$this->instanceNullable74 = $instanceNullable74;
return $$this;
}

public static function setStaticInt74($$staticInt74) {
public static function setStaticInt74($$staticInt74): self {
self::$$staticInt74 = $staticInt74;
return self;
}

public static function setStaticString74($$staticString74) {
public static function setStaticString74($$staticString74): self {
self::$$staticString74 = $staticString74;
return self;
}

public static function setStaticBool74($$staticBool74) {
public static function setStaticBool74($$staticBool74): self {
self::$$staticBool74 = $staticBool74;
return self;
}

public static function setStaticNullable74($$staticNullable74) {
public static function setStaticNullable74($$staticNullable74): self {
self::$$staticNullable74 = $staticNullable74;
return self;
}
Expand Down
36 changes: 18 additions & 18 deletions ...pertiesSetter/testTypedPropertiesSetter.php.testTypedPropertiesSetter_PHP71Fluent.codegen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,89 @@
public function setInstanceArray(array $$instanceArray) {
public function setInstanceArray(array $$instanceArray): self {
$$this->instanceArray = $instanceArray;
return $$this;
}

public function setInstanceInt(int $$instanceInt) {
public function setInstanceInt(int $$instanceInt): self {
$$this->instanceInt = $instanceInt;
return $$this;
}

public function setInstanceString(string $$instanceString) {
public function setInstanceString(string $$instanceString): self {
$$this->instanceString = $instanceString;
return $$this;
}

public function setInstanceBool(bool $$instanceBool) {
public function setInstanceBool(bool $$instanceBool): self {
$$this->instanceBool = $instanceBool;
return $$this;
}

public function setInstanceNull($$instanceNull) {
public function setInstanceNull($$instanceNull): self {
$$this->instanceNull = $instanceNull;
return $$this;
}

public function setInstanceNullable(?string $$instanceNullable) {
public function setInstanceNullable(?string $$instanceNullable): self {
$$this->instanceNullable = $instanceNullable;
return $$this;
}

public function setInstanceArrayNullable(?array $$instanceArrayNullable) {
public function setInstanceArrayNullable(?array $$instanceArrayNullable): self {
$$this->instanceArrayNullable = $instanceArrayNullable;
return $$this;
}

public function setInstanceClass(Test53 $$instanceClass) {
public function setInstanceClass(Test53 $$instanceClass): self {
$$this->instanceClass = $instanceClass;
return $$this;
}

public static function setStaticInt(int $$staticInt) {
public static function setStaticInt(int $$staticInt): self {
self::$$staticInt = $staticInt;
return self;
}

public static function setStaticNullable(?int $$staticNullable) {
public static function setStaticNullable(?int $$staticNullable): self {
self::$$staticNullable = $staticNullable;
return self;
}

public function setInstanceInt74($$instanceInt74) {
public function setInstanceInt74($$instanceInt74): self {
$$this->instanceInt74 = $instanceInt74;
return $$this;
}

public function setInstanceString74($$instanceString74) {
public function setInstanceString74($$instanceString74): self {
$$this->instanceString74 = $instanceString74;
return $$this;
}

public function setInstanceBool74($$instanceBool74) {
public function setInstanceBool74($$instanceBool74): self {
$$this->instanceBool74 = $instanceBool74;
return $$this;
}

public function setInstanceNullable74($$instanceNullable74) {
public function setInstanceNullable74($$instanceNullable74): self {
$$this->instanceNullable74 = $instanceNullable74;
return $$this;
}

public static function setStaticInt74($$staticInt74) {
public static function setStaticInt74($$staticInt74): self {
self::$$staticInt74 = $staticInt74;
return self;
}

public static function setStaticString74($$staticString74) {
public static function setStaticString74($$staticString74): self {
self::$$staticString74 = $staticString74;
return self;
}

public static function setStaticBool74($$staticBool74) {
public static function setStaticBool74($$staticBool74): self {
self::$$staticBool74 = $staticBool74;
return self;
}

public static function setStaticNullable74($$staticNullable74) {
public static function setStaticNullable74($$staticNullable74): self {
self::$$staticNullable74 = $staticNullable74;
return self;
}
Expand Down
90 changes: 90 additions & 0 deletions ...pertiesSetter/testTypedPropertiesSetter.php.testTypedPropertiesSetter_PHP74Fluent.codegen
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
public function setInstanceArray(array $$instanceArray): self {
$$this->instanceArray = $instanceArray;
return $$this;
}

public function setInstanceInt(int $$instanceInt): self {
$$this->instanceInt = $instanceInt;
return $$this;
}

public function setInstanceString(string $$instanceString): self {
$$this->instanceString = $instanceString;
return $$this;
}

public function setInstanceBool(bool $$instanceBool): self {
$$this->instanceBool = $instanceBool;
return $$this;
}

public function setInstanceNull($$instanceNull): self {
$$this->instanceNull = $instanceNull;
return $$this;
}

public function setInstanceNullable(?string $$instanceNullable): self {
$$this->instanceNullable = $instanceNullable;
return $$this;
}

public function setInstanceArrayNullable(?array $$instanceArrayNullable): self {
$$this->instanceArrayNullable = $instanceArrayNullable;
return $$this;
}

public function setInstanceClass(Test53 $$instanceClass): self {
$$this->instanceClass = $instanceClass;
return $$this;
}

public static function setStaticInt(int $$staticInt): self {
self::$$staticInt = $staticInt;
return self;
}

public static function setStaticNullable(?int $$staticNullable): self {
self::$$staticNullable = $staticNullable;
return self;
}

public function setInstanceInt74(int $$instanceInt74): self {
$$this->instanceInt74 = $instanceInt74;
return $$this;
}

public function setInstanceString74(string $$instanceString74): self {
$$this->instanceString74 = $instanceString74;
return $$this;
}

public function setInstanceBool74(bool $$instanceBool74): self {
$$this->instanceBool74 = $instanceBool74;
return $$this;
}

public function setInstanceNullable74(?string $$instanceNullable74): self {
$$this->instanceNullable74 = $instanceNullable74;
return $$this;
}

public static function setStaticInt74(int $$staticInt74): self {
self::$$staticInt74 = $staticInt74;
return self;
}

public static function setStaticString74(string $$staticString74): self {
self::$$staticString74 = $staticString74;
return self;
}

public static function setStaticBool74(bool $$staticBool74): self {
self::$$staticBool74 = $staticBool74;
return self;
}

public static function setStaticNullable74(?string $$staticNullable74): self {
self::$$staticNullable74 = $staticNullable74;
return self;
}

Loading
Loading