apache · troizet · Jul 20, 2025 · tmysik · Aug 4, 2025 · troizet
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Parser.java
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/ASTPHP5Symbols.java
@@ -19,7 +19,7 @@
 
 //----------------------------------------------------
 // The following code was generated by CUP v0.11a beta 20060608
-// Sun Jan 12 13:42:53 JST 2025
+// Sun Jul 20 15:28:17 NOVT 2025
 //----------------------------------------------------
 
 package org.netbeans.modules.php.editor.parser;

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable18.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable18.java
@@ -2963,17 +2963,21 @@ protected EncodedActionTable18() {
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
-        sb.append("\006");
+        sb.append("\010");
+        sb.append("\111");
+        sb.append("\ufee2");
         sb.append("\151");
         sb.append("\ufee2");
         sb.append("\232");
         sb.append("\u0242");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
-        sb.append("\004");
+        sb.append("\006");
+        sb.append("\111");
+        sb.append("\u0494");
         sb.append("\151");
-        sb.append("\u05cd");
+        sb.append("\u0495");
         sb.append("\001");
         sb.append("\002");
         sb.append("\000");
@@ -4524,9 +4528,5 @@ protected EncodedActionTable18() {
         sb.append("\123");
         sb.append("\100");
         sb.append("\012");
-        sb.append("\101");
-        sb.append("\206");
-        sb.append("\102");
-        sb.append("\041");
     }
 }
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable19.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable19.java
@@ -28,6 +28,10 @@ public String getTableData() {
     }
     protected EncodedActionTable19() {
         sb = new StringBuilder();
+        sb.append("\101");
+        sb.append("\206");
+        sb.append("\102");
+        sb.append("\041");
         sb.append("\103");
         sb.append("\144");
         sb.append("\104");
@@ -4524,9 +4528,5 @@ protected EncodedActionTable19() {
         sb.append("\006");
         sb.append("\070");
         sb.append("\236");
-        sb.append("\111");
-        sb.append("\uff20");
-        sb.append("\001");
-        sb.append("\002");
     }
 }
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable20.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable20.java
@@ -28,6 +28,10 @@ public String getTableData() {
     }
     protected EncodedActionTable20() {
         sb = new StringBuilder();
+        sb.append("\111");
+        sb.append("\uff20");
+        sb.append("\001");
+        sb.append("\002");
         sb.append("\000");
         sb.append("\004");
         sb.append("\111");
@@ -4524,9 +4528,5 @@ protected EncodedActionTable20() {
         sb.append("\206");
         sb.append("\102");
         sb.append("\041");
-        sb.append("\103");
-        sb.append("\144");
-        sb.append("\104");
-        sb.append("\117");
     }
 }
diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable21.java b/php/php.editor/src/org/netbeans/modules/php/editor/parser/EncodedActionTable21.java
@@ -28,6 +28,10 @@ public String getTableData() {
     }
     protected EncodedActionTable21() {
         sb = new StringBuilder();
+        sb.append("\103");
+        sb.append("\144");
+        sb.append("\104");
+        sb.append("\117");
         sb.append("\105");
         sb.append("\141");
         sb.append("\115");

diff --git a/...src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java b/...src/org/netbeans/modules/php/editor/verification/IncorrectNonAbstractMethodHintError.java
@@ -30,9 +30,12 @@
 import org.netbeans.modules.csl.spi.support.CancelSupport;
 import org.netbeans.modules.php.editor.CodeUtils;
 import org.netbeans.modules.php.editor.model.FileScope;
+import org.netbeans.modules.php.editor.model.InterfaceScope;
+import org.netbeans.modules.php.editor.model.Model;
+import org.netbeans.modules.php.editor.model.Scope;
+import org.netbeans.modules.php.editor.model.VariableScope;
 import org.netbeans.modules.php.editor.parser.PHPParseResult;
 import org.netbeans.modules.php.editor.parser.astnodes.ASTNode;
-import org.netbeans.modules.php.editor.parser.astnodes.Block;
 import org.netbeans.modules.php.editor.parser.astnodes.BodyDeclaration.Modifier;
 import org.netbeans.modules.php.editor.parser.astnodes.FunctionDeclaration;
 import org.netbeans.modules.php.editor.parser.astnodes.MethodDeclaration;
@@ -73,7 +76,8 @@ public void invoke(PHPRuleContext context, List<Hint> hints) {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
-            CheckVisitor checkVisitor = new CheckVisitor();
+            Model model = phpParseResult.getModel();
+            CheckVisitor checkVisitor = new CheckVisitor(model);
             phpParseResult.getProgram().accept(checkVisitor);
             Set<MethodDeclaration> incorrectNonAbstractMethods = checkVisitor.getIncorrectNonAbstractMethods();
             addIcorrectNonAbstractMethodHints(incorrectNonAbstractMethods, hints, context.doc);
@@ -107,17 +111,26 @@ private void addHint(ASTNode node, String description, List<Hint> hints, List<Hi
     //~ Inner classes
     private static final class CheckVisitor extends DefaultVisitor {
 
+        private final Model model;
+
         private final Set<MethodDeclaration> incorrectNonAbstractMethods = new HashSet<>();
 
+        public CheckVisitor(Model model) {
+            super();
+            this.model = model;
+        }
+
         @Override
         public void visit(MethodDeclaration node) {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
             if (!Modifier.isAbstract(node.getModifier())) {
                 FunctionDeclaration function = node.getFunction();
-                Block body = function.getBody();
-                if (body == null) {
+                final VariableScope variableScope = model.getVariableScope(function.getEndOffset() - 1);
 private final class CheckVisitor extends DefaultVisitor { 
     private final FileObject fileObject; 
     private final Index index; 
     private final List<Hint> hints = new ArrayList<>(); 
     private final Model model; 
     private CheckVisitor(FileObject fileObject, Index index, Model model) { 
         this.fileObject = fileObject; 
         this.index = index; 
         this.model = model; 
     } 
     public List<Hint> getHints() { 
         return Collections.unmodifiableList(hints); 
     } 
     @Override 
     @Messages({ 
         "# {0} - Class name", 
         "AbstractClassInstantiationDesc=Abstract class {0} can not be instantiated" 
     }) 
     public void visit(ClassInstanceCreation node) { 
         if (CancelSupport.getDefault().isCancelled() 
                 || CodeUtils.isDollaredName(node.getClassName())) { 
             // GH-6119 
             // e.g. 
             // abstract class AbstractClass {} 
             // $a = new $abstractClass(); 
             return; 
         } 
         ASTNodeInfo<ClassInstanceCreation> info = ASTNodeInfo.create(node); 
         int startOffset = node.getStartOffset(); 
         VariableScope variableScope = model.getVariableScope(startOffset); 
         QualifiedName fullyQualifiedName = VariousUtils.getFullyQualifiedName(info.getQualifiedName(), startOffset, variableScope); 
         Set<ClassElement> classes = index.getClasses(NameKind.exact(fullyQualifiedName)); 
         if (!classes.isEmpty()) { 
             ClassElement classElement = ModelUtils.getFirst(classes); 
             if (classElement != null && classElement.isAbstract()) { 
                 OffsetRange offsetRange = new OffsetRange(startOffset, node.getEndOffset()); 
                 hints.add(new Hint( 
                         AbstractClassInstantiationHintError.this, 
                         Bundle.AbstractClassInstantiationDesc(classElement.getFullyQualifiedName().toString()), 
                         fileObject, 
                         offsetRange, 
                         null, 
                         500)); 
             } 
         } 
     } 
 } 
 private final class CheckVisitor extends DefaultVisitor { 
     private final FileObject fileObject; 
     private final Index index; 
     private final List<Hint> hints = new ArrayList<>(); 
     private final Model model; 
  
     private CheckVisitor(FileObject fileObject, Index index, Model model) { 
         this.fileObject = fileObject; 
         this.index = index; 
         this.model = model; 
     } 
  
     public List<Hint> getHints() { 
         return Collections.unmodifiableList(hints); 
     } 
  
     @Override 
     @Messages({ 
         "# {0} - Class name", 
         "AbstractClassInstantiationDesc=Abstract class {0} can not be instantiated" 
     }) 
     public void visit(ClassInstanceCreation node) { 
         if (CancelSupport.getDefault().isCancelled() 
                 || CodeUtils.isDollaredName(node.getClassName())) { 
             // GH-6119 
             // e.g. 
             // abstract class AbstractClass {} 
             // $a = new $abstractClass(); 
             return; 
         } 
         ASTNodeInfo<ClassInstanceCreation> info = ASTNodeInfo.create(node); 
         int startOffset = node.getStartOffset(); 
         VariableScope variableScope = model.getVariableScope(startOffset); 
         QualifiedName fullyQualifiedName = VariousUtils.getFullyQualifiedName(info.getQualifiedName(), startOffset, variableScope); 
         Set<ClassElement> classes = index.getClasses(NameKind.exact(fullyQualifiedName)); 
         if (!classes.isEmpty()) { 
             ClassElement classElement = ModelUtils.getFirst(classes); 
             if (classElement != null && classElement.isAbstract()) { 
                 OffsetRange offsetRange = new OffsetRange(startOffset, node.getEndOffset()); 
                 hints.add(new Hint( 
                         AbstractClassInstantiationHintError.this, 
                         Bundle.AbstractClassInstantiationDesc(classElement.getFullyQualifiedName().toString()), 
                         fileObject, 
                         offsetRange, 
                         null, 
                         500)); 
             } 
         } 
     } 
 } 
+                Scope inScope = variableScope.getInScope();
+                boolean isInterface = inScope instanceof InterfaceScope;
+                if (!isInterface && variableScope.getBlockRange().getLength() <= 1) {
                     incorrectNonAbstractMethods.add(node);
                 }
             }

diff --git a/...hp.editor/src/org/netbeans/modules/php/editor/verification/InitializeFieldSuggestion.java b/...hp.editor/src/org/netbeans/modules/php/editor/verification/InitializeFieldSuggestion.java
@@ -176,7 +176,7 @@ public void visit(MethodDeclaration node) {
                 processConstructorPropertyPromotion(node);
             }
             FunctionDeclaration function = node.getFunction();
-            if (CodeUtils.isConstructor(node) && function.getBody() != null) {
+            if (CodeUtils.isConstructor(node) && function.getBody() != null && function.getBody().isCurly()) {
                 formalParameters = new ArrayList<>(function.getFormalParameters());
                 isInConstructor = true;
                 constructorBodyEndOffset = function.getBody().getEndOffset() - 1;

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/ModifiersCheckHintError.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/ModifiersCheckHintError.java
@@ -544,14 +544,14 @@ private void processMethodScope(MethodScope methodScope) {
         boolean isEnum = inScope instanceof EnumScope;
         if (phpModifiers.isAbstract() && isAnonClass) {
             fixes = new ArrayList<>();
-            if (methodScope.getBlockRange() != null) {
+            if (methodScope.getBlockRange() != null && methodScope.getBlockRange().getLength() > 1) {
                 // e.g. abstract public function method(): void {}
                 fixes.add(new RemoveModifierFix(doc, PhpModifiers.ABSTRACT_MODIFIER, methodScope.getOffset()));
             }
             hints.add(new SimpleHint(Bundle.AbstractMethodInAnonymousClass(), methodScope.getNameRange(), fixes));
         } else if (phpModifiers.isAbstract() && isEnum) {
             fixes = new ArrayList<>();
-            if (methodScope.getBlockRange() != null) {
+            if (methodScope.getBlockRange() != null  && methodScope.getBlockRange().getLength() > 1) {
                 // e.g. abstract public function method(): void {}
                 fixes.add(new RemoveModifierFix(doc, PhpModifiers.ABSTRACT_MODIFIER, methodScope.getOffset()));
             }
@@ -563,7 +563,7 @@ private void processMethodScope(MethodScope methodScope) {
             }
             fixes.add(new RemoveModifierFix(doc, PhpModifiers.FINAL_MODIFIER, methodScope.getOffset()));
             hints.add(new SimpleHint(Bundle.AbstractFinalMethod(methodScope.getName()), methodScope.getNameRange(), fixes));
-        } else if (phpModifiers.isAbstract() && methodScope.getBlockRange() != null) {
+        } else if (phpModifiers.isAbstract() && methodScope.getBlockRange() != null  && methodScope.getBlockRange().getLength() > 1) {
             fixes = Collections.<HintFix>singletonList(new RemoveBodyFix(doc, methodScope));
             hints.add(new SimpleHint(Bundle.AbstractWithBlockMethod(methodScope.getName()), methodScope.getNameRange(), fixes));
         } else if (phpModifiers.isAbstract() && phpModifiers.isPrivate() && !isTrait) {

diff --git a/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableHint.java b/php/php.editor/src/org/netbeans/modules/php/editor/verification/UnusedVariableHint.java
@@ -410,7 +410,7 @@ public void visit(FunctionDeclaration node) {
             if (CancelSupport.getDefault().isCancelled()) {
                 return;
             }
-            if (node.getBody() != null) {
+            if (node.getBody() != null && node.getBody().isCurly()) {
                 parentNodes.push(node);
                 super.visit(node);
                 parentNodes.pop();

diff --git a/...les/php/editor/parser/ASTPHP5ParserTest/parser/php80/constructorPropertyPromotion_01.pass b/...les/php/editor/parser/ASTPHP5ParserTest/parser/php80/constructorPropertyPromotion_01.pass
@@ -1559,6 +1559,8 @@
                                     </DefaultValue>
                                 </FormalParameter>
                             </FormalParameters>
+                            <Block start='2365' end='2366' isCurly='flase'>
+                            </Block>
                         </FunctionDeclaration>
                     </MethodDeclaration>
                 </Block>

diff --git a/...rg/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/unionTypesTypes.pass b/...rg/netbeans/modules/php/editor/parser/ASTPHP5ParserTest/parser/php80/unionTypesTypes.pass
@@ -867,6 +867,8 @@
                                     <Identifier start='1329' end='1333' name='null'/>
                                 </NamespaceName>
                             </UnionType>
+                            <Block start='1333' end='1334' isCurly='flase'>
+                            </Block>
                         </FunctionDeclaration>
                     </MethodDeclaration>
                     <MethodDeclaration start='1340' end='1428' modifiers='protected abstract static'>
@@ -902,6 +904,8 @@
                                     <Identifier start='1424' end='1427' name='Bar'/>
                                 </NamespaceName>
                             </UnionType>
+                            <Block start='1427' end='1428' isCurly='flase'>
+                            </Block>
                         </FunctionDeclaration>
                     </MethodDeclaration>
                 </Block>

diff --git a/...s/org/netbeans/modules/php/editor/parser/SanitizeSourceTest/sanitize/nullableTypes03.pass b/...s/org/netbeans/modules/php/editor/parser/SanitizeSourceTest/sanitize/nullableTypes03.pass
@@ -22,6 +22,8 @@
                                 <Identifier start='81' end='87' name='create'/>
                                 <FormalParameters>
                                 </FormalParameters>
+                                <Block start='92' end='93' isCurly='flase'>
+                                </Block>
                             </FunctionDeclaration>
                         </MethodDeclaration>
                     </Block>

diff --git a/...ta/testfiles/verification/ModifiersCheckHintError/testInterfaceInvalidMethodsWithBody.php b/...ta/testfiles/verification/ModifiersCheckHintError/testInterfaceInvalidMethodsWithBody.php
@@ -0,0 +1,35 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+interface InvalidMethodWithBodyInterface {
+
+    // Invalid with body
+    function implicitPublicMethodWithBody() {}
+    static function implicitPublicStaticMethodWithBody() {}
+    public function implicitPublicMethodWithBody() {}
+    public static function implicitPublicMethodWithBody() {}
+
+    // Invalid with body and return type
+    function implicitPublicMethodWithBodyAndReturnType(): void {}
+    static function implicitPublicStaticMethodWithBodyAndReturnType(): void {}
+    public function implicitPublicMethodWithBodyAndReturnType(): void {}
+    public static function implicitPublicMethodWithBodyAndReturnType(): void {}
+
+}
diff --git a/...ntError/testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody.hints b/...ntError/testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody.hints
@@ -0,0 +1,32 @@
+    function implicitPublicMethodWithBody() {}
+             ----------------------------
+HINT:Interface method "implicitPublicMethodWithBody" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBody
+    static function implicitPublicStaticMethodWithBody() {}
+                    ----------------------------------
+HINT:Interface method "implicitPublicStaticMethodWithBody" can not contain body
+FIX:Remove body of the method: implicitPublicStaticMethodWithBody
+    public function implicitPublicMethodWithBody() {}
+                    ----------------------------
+HINT:Interface method "implicitPublicMethodWithBody" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBody
+    public static function implicitPublicMethodWithBody() {}
+                           ----------------------------
+HINT:Interface method "implicitPublicMethodWithBody" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBody
+    function implicitPublicMethodWithBodyAndReturnType(): void {}
+             -----------------------------------------
+HINT:Interface method "implicitPublicMethodWithBodyAndReturnType" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBodyAndReturnType
+    static function implicitPublicStaticMethodWithBodyAndReturnType(): void {}
+                    -----------------------------------------------
+HINT:Interface method "implicitPublicStaticMethodWithBodyAndReturnType" can not contain body
+FIX:Remove body of the method: implicitPublicStaticMethodWithBodyAndReturnType
+    public function implicitPublicMethodWithBodyAndReturnType(): void {}
+                    -----------------------------------------
+HINT:Interface method "implicitPublicMethodWithBodyAndReturnType" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBodyAndReturnType
+    public static function implicitPublicMethodWithBodyAndReturnType(): void {}
+                           -----------------------------------------
+HINT:Interface method "implicitPublicMethodWithBodyAndReturnType" can not contain body
+FIX:Remove body of the method: implicitPublicMethodWithBodyAndReturnType
diff --git a/.../testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody_Fix_01.fixed b/.../testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody_Fix_01.fixed
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+interface InvalidMethodWithBodyInterface {
+
+    // Invalid with body
+    function implicitPublicMethodWithBody();
+
+    static function implicitPublicStaticMethodWithBody() {}
+    public function implicitPublicMethodWithBody() {}
+    public static function implicitPublicMethodWithBody() {}
+
+    // Invalid with body and return type
+    function implicitPublicMethodWithBodyAndReturnType(): void {}
+    static function implicitPublicStaticMethodWithBodyAndReturnType(): void {}
+    public function implicitPublicMethodWithBodyAndReturnType(): void {}
+    public static function implicitPublicMethodWithBodyAndReturnType(): void {}
+
+}
diff --git a/.../testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody_Fix_02.fixed b/.../testInterfaceInvalidMethodsWithBody.php.testInterfaceInvalidMethodsWithBody_Fix_02.fixed
@@ -0,0 +1,36 @@
+<?php
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+interface InvalidMethodWithBodyInterface {
+
+    // Invalid with body
+    function implicitPublicMethodWithBody() {}
+    static function implicitPublicStaticMethodWithBody() {}
+    public function implicitPublicMethodWithBody() {}
+    public static function implicitPublicMethodWithBody() {}
+
+    // Invalid with body and return type
+    function implicitPublicMethodWithBodyAndReturnType(): void;
+
+    static function implicitPublicStaticMethodWithBodyAndReturnType(): void {}
+    public function implicitPublicMethodWithBodyAndReturnType(): void {}
+    public static function implicitPublicMethodWithBodyAndReturnType(): void {}
+
+}