From 08e48ab7f092dfd49efb5d058743956a6ab30025 Mon Sep 17 00:00:00 2001
From: Damiano Improta <damiano.improta@gmail.com>
Date: Wed, 26 Aug 2026 17:36:50 +0200
Subject: [PATCH] prevent the return type from being generated in the PHPDoc
 when it is a constructor.

Removed the return type from the constructor in the list of methods to override

Add unittest for constructor override fix
---
 .../editor/elements/BaseFunctionElementSupport.java |  2 +-
 .../testInstanceOverrideConstructor.php             | 13 +++++++++++++
 ...r.php.testInstanceOverrideConstructor_01.codegen |  3 +++
 .../codegen/SelectedPropertyMethodsCreatorTest.java |  6 ++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 php/php.editor/src/org/netbeans/modules/php/editor/elements/BaseFunctionElementSupport.java
 create mode 100644 php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php
 create mode 100644 php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php.testInstanceOverrideConstructor_01.codegen

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/elements/BaseFunctionElementSupport.java b/php/php.editor/src/org/netbeans/modules/php/editor/elements/BaseFunctionElementSupport.java
old mode 100644
new mode 100755
index e5b6e78613a9..0f6a24a54716
--- a/php/php.editor/src/org/netbeans/modules/php/editor/elements/BaseFunctionElementSupport.java
+++ b/php/php.editor/src/org/netbeans/modules/php/editor/elements/BaseFunctionElementSupport.java
@@ -137,7 +137,7 @@ public final String asString(PrintAs as, BaseFunctionElement element, TypeNameRe
                 if (methdodInvocation.startsWith(" ")) {
                     methdodInvocation = methdodInvocation.substring(1);
                 }
-                if (returns2.size() > 0) {
+                if (!returns2.isEmpty() && !element.getName().equals(MethodElement.CONSTRUCTOR_NAME)) {
                     template.append(String.format("{%nreturn parent::%s;%n}", methdodInvocation)); //NOI18N
                 } else {
                     template.append(String.format("{%nparent::%s;%n}", methdodInvocation)); //NOI18N
diff --git a/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php b/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php
new file mode 100644
index 000000000000..8009dc296a32
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php
@@ -0,0 +1,13 @@
+<?php
+
+class Foo {
+    /**
+     * @param string $test
+     * @return String demo
+     */
+    public function __construct(string $test) {}
+}
+
+class Bar extends Foo {
+
+}
\ No newline at end of file
diff --git a/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php.testInstanceOverrideConstructor_01.codegen b/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php.testInstanceOverrideConstructor_01.codegen
new file mode 100644
index 000000000000..ee6f92f8a17e
--- /dev/null
+++ b/php/php.editor/test/unit/data/testfiles/codegen/testInstanceOverrideConstructor/testInstanceOverrideConstructor.php.testInstanceOverrideConstructor_01.codegen
@@ -0,0 +1,3 @@
+public function __construct(string $test){
+parent::__construct($test);
+}
diff --git a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/codegen/SelectedPropertyMethodsCreatorTest.java b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/codegen/SelectedPropertyMethodsCreatorTest.java
index 50eabddd580a..8fbd0f90bc00 100644
--- a/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/codegen/SelectedPropertyMethodsCreatorTest.java
+++ b/php/php.editor/test/unit/src/org/netbeans/modules/php/editor/codegen/SelectedPropertyMethodsCreatorTest.java
@@ -252,6 +252,12 @@ public void testInstanceOverrideMethodWithGuessingFloatType_02() throws Exceptio
                 selectProperties(cgsInfo.getPossibleMethods(), "myFoo"), new SinglePropertyMethodCreator.InheritedMethodCreator(cgsInfo)));
     }
 
+    public void testInstanceOverrideConstructor_01() throws Exception {
+        CGSInfo cgsInfo = getCgsInfo("class Bar extends Foo {^", PhpVersion.PHP_83);
+        checkResult(new SelectedPropertyMethodsCreator().create(
+                selectProperties(cgsInfo.getPossibleMethods(), "__construct"), new SinglePropertyMethodCreator.InheritedMethodCreator(cgsInfo)));
+    }
+
     public void testGetterWithType_01() throws Exception {
         CGSInfo cgsInfo = getCgsInfo("class Foo {^", PhpVersion.PHP_70);
         cgsInfo.setPublicModifier(false);