[#1831] EmptyClassInspector: resolved false positives (enums)

kalessil · Sep 18, 2024 · 83ae086 · 83ae086
1 parent a665c27
commit 83ae086
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/.../phpStorm/phpInspectionsEA/inspectors/semanticalAnalysis/classes/EmptyClassInspector.java b/.../phpStorm/phpInspectionsEA/inspectors/semanticalAnalysis/classes/EmptyClassInspector.java
@@ -22,7 +22,8 @@
  */
 
 public class EmptyClassInspector extends BasePhpInspection {
-    private static final String message = "Class does not contain any properties or methods.";
+    private static final String messageClass = "Class does not contain any properties or methods.";
+    private static final String messageEnum  = "Enum does not contain any values or methods.";
 
     @NotNull
     @Override
@@ -42,8 +43,11 @@ public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, bool
         return new BasePhpElementVisitor() {
             @Override
             public void visitPhpClass(@NotNull PhpClass clazz) {
-                if (!clazz.isInterface() && !clazz.isDeprecated() && !clazz.isAnonymous()) {
-                    final boolean isEmpty = clazz.getOwnFields().length == 0 && clazz.getOwnMethods().length == 0 && clazz.getTraits().length == 0;
+                if (! clazz.isInterface() && ! clazz.isDeprecated() && ! clazz.isAnonymous()) {
+                    final boolean isEmpty = clazz.getOwnFields().length == 0 &&
+                                            clazz.getOwnMethods().length == 0 &&
+                                            clazz.getTraits().length == 0 &&
+                                            clazz.getEnumCases().isEmpty();
                     if (isEmpty) {
                         final PhpClass parent = OpenapiResolveUtil.resolveSuperClass(clazz);
                         if (parent != null) {
@@ -57,7 +61,7 @@ public void visitPhpClass(@NotNull PhpClass clazz) {
                         if (nameNode != null) {
                             holder.registerProblem(
                                     nameNode,
-                                    MessagesPresentationUtil.prefixWithEa(message)
+                                    MessagesPresentationUtil.prefixWithEa(clazz.isEnum() ? messageEnum : messageClass )
                             );
                         }
                     }

diff --git a/testData/fixtures/classes/empty-class.php b/testData/fixtures/classes/empty-class.php
@@ -4,6 +4,7 @@ class ClassWithAProperty { public $property; }
 class ClassWithAMethod   { public function __construct() {} }
 
 class <weak_warning descr="[EA] Class does not contain any properties or methods.">AnEmptyClass</weak_warning> {}
+enum <weak_warning descr="[EA] Enum does not contain any values or methods.">AnEmptyEnum</weak_warning> {}
 
 /* false-positives: empty interface */
 interface EmptyInterface {}