UCT-707: Refactored using deprecated constant inspection

Author: bohdan-harniuk

src/com/magento/idea/magento2uct/inspections/php/UsedFieldInspection.java

@@ -90,14 +90,14 @@ protected abstract void execute(
      *
      * @param project Project
      * @param problemsHolder ProblemsHolder
-     * @param field Field
-     * @param fieldReference FieldReference
+     * @param constant Field
+     * @param constantReference FieldReference
      */
     protected abstract void execute(
             final Project project,
             final @NotNull ProblemsHolder problemsHolder,
-            final ClassConstImpl field,
-            final ClassConstantReference fieldReference
+            final ClassConstImpl constant,
+            final ClassConstantReference constantReference
     );
 
     /**

src/com/magento/idea/magento2uct/inspections/php/deprecation/UsingDeprecatedConstant.java

@@ -8,70 +8,63 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.jetbrains.php.lang.inspections.PhpInspection;
 import com.jetbrains.php.lang.psi.elements.ClassConstantReference;
+import com.jetbrains.php.lang.psi.elements.Field;
+import com.jetbrains.php.lang.psi.elements.FieldReference;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.impl.ClassConstImpl;
-import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor;
 import com.magento.idea.magento2uct.inspections.UctProblemsHolder;
+import com.magento.idea.magento2uct.inspections.php.UsedFieldInspection;
+import com.magento.idea.magento2uct.packages.IssueSeverityLevel;
 import com.magento.idea.magento2uct.packages.SupportedIssue;
-import com.magento.idea.magento2uct.settings.UctSettingsService;
 import com.magento.idea.magento2uct.versioning.VersionStateManager;
 import org.jetbrains.annotations.NotNull;
 
-public class UsingDeprecatedConstant extends PhpInspection {
+public class UsingDeprecatedConstant extends UsedFieldInspection {
 
     @Override
-    public @NotNull PsiElementVisitor buildVisitor(
+    protected void execute(
+            final Project project,
             final @NotNull ProblemsHolder problemsHolder,
-            final boolean isOnTheFly
+            final Field field,
+            final FieldReference fieldReference
     ) {
-        return new PhpElementVisitor() {
+    }
 
-            @Override
-            public void visitPhpClassConstantReference(
-                    final ClassConstantReference constantReference
-            ) {
-                final Project project = constantReference.getProject();
-                final UctSettingsService settings = UctSettingsService.getInstance(project);
+    @Override
+    protected void execute(
+            final Project project,
+            final @NotNull ProblemsHolder problemsHolder,
+            final ClassConstImpl constant,
+            final ClassConstantReference constantReference
+    ) {
+        final String constantFqn = constant.getFQN();
 
-                if (!settings.isEnabled() || !settings.isIssueLevelSatisfiable(
-                        SupportedIssue.USING_DEPRECATED_CONSTANT.getLevel())
-                ) {
-                    return;
-                }
-                final PsiElement element = constantReference.resolve();
+        if (!VersionStateManager.getInstance(project).isDeprecated(constantFqn)) {
+            return;
+        }
+        final PhpClass containingClass = constant.getContainingClass();
 
-                if (!(element instanceof ClassConstImpl)) {
-                    return;
-                }
-                final String constantClass = ((ClassConstImpl) element).getFQN();
+        if (containingClass == null) {
+            return;
+        }
 
-                if (!VersionStateManager.getInstance(project).isDeprecated(constantClass)) {
-                    return;
-                }
-                final PhpClass containingClass = ((ClassConstImpl) element).getContainingClass();
+        if (problemsHolder instanceof UctProblemsHolder) {
+            ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
+                    SupportedIssue.USING_DEPRECATED_CONSTANT.getCode()
+            );
+        }
+        problemsHolder.registerProblem(
+                constantReference,
+                SupportedIssue.USING_DEPRECATED_CONSTANT.getMessage(
+                        containingClass.getFQN().concat("::").concat(constant.getName())
+                ),
+                ProblemHighlightType.LIKE_DEPRECATED
+        );
+    }
 
-                if (containingClass == null) {
-                    return;
-                }
-                if (problemsHolder instanceof UctProblemsHolder) {
-                    ((UctProblemsHolder) problemsHolder).setReservedErrorCode(
-                            SupportedIssue.USING_DEPRECATED_CONSTANT.getCode()
-                    );
-                }
-                problemsHolder.registerProblem(
-                        constantReference,
-                        SupportedIssue.USING_DEPRECATED_CONSTANT.getMessage(
-                                containingClass.getFQN()
-                                        .concat("::")
-                                        .concat(((ClassConstImpl) element).getName())
-                        ),
-                        ProblemHighlightType.LIKE_DEPRECATED
-                );
-            }
-        };
+    @Override
+    protected IssueSeverityLevel getSeverityLevel() {
+        return SupportedIssue.USING_DEPRECATED_CONSTANT.getLevel();
     }
 }