834: Fixed bug - wrong inspection for module name in registration.php

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/inspections/php/ModuleDeclarationInRegistrationPhpInspection.java

@@ -7,15 +7,21 @@
 
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.util.PsiTreeUtil;
 import com.jetbrains.php.lang.inspections.PhpInspection;
+import com.jetbrains.php.lang.psi.elements.Method;
+import com.jetbrains.php.lang.psi.elements.MethodReference;
+import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.StringLiteralExpression;
 import com.jetbrains.php.lang.psi.visitors.PhpElementVisitor;
 import com.magento.idea.magento2plugin.bundles.InspectionBundle;
 import com.magento.idea.magento2plugin.inspections.php.fix.PhpModuleNameQuickFix;
 import com.magento.idea.magento2plugin.inspections.util.GetEditableModuleNameByRootFileUtil;
 import com.magento.idea.magento2plugin.magento.files.RegistrationPhp;
+import com.magento.idea.magento2plugin.magento.packages.code.FrameworkLibraryType;
 import com.magento.idea.magento2plugin.util.magento.IsFileInEditableModuleUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,17 +40,38 @@ public void visitPhpStringLiteralExpression(final StringLiteralExpression expres
                 final String filename = file.getName();
 
                 if (!RegistrationPhp.FILE_NAME.equals(filename)) {
-                        return;
+                    return;
+                }
+                final MethodReference callerReference = PsiTreeUtil.getParentOfType(
+                        expression,
+                        MethodReference.class
+                );
+
+                if (callerReference == null) {
+                    return;
+                }
+                final PsiElement caller = callerReference.resolve();
+
+                if (!(caller instanceof Method)) {
+                    return;
+                }
+                final PhpClass callerOwner = ((Method) caller).getContainingClass();
+
+                if (callerOwner == null
+                        || !FrameworkLibraryType.COMPONENT_REGISTRAR.getType().equals(
+                                callerOwner.getPresentableFQN()
+                )) {
+                    return;
                 }
 
                 if (!IsFileInEditableModuleUtil.execute(file)) {
-                        return;
+                    return;
                 }
                 final String expectedName = GetEditableModuleNameByRootFileUtil.execute(file);
                 final String actualName = expression.getContents();
 
                 if (actualName.equals(expectedName)) {
-                        return;
+                    return;
                 }
                 final InspectionBundle inspectionBundle = new InspectionBundle();
 

src/com/magento/idea/magento2plugin/magento/packages/code/FrameworkLibraryType.java

@@ -13,6 +13,7 @@ public enum FrameworkLibraryType {
     ABSTRACT_COLLECTION(
             "Magento\\Framework\\Model\\ResourceModel\\Db\\Collection\\AbstractCollection"
     ),
+    COMPONENT_REGISTRAR("Magento\\Framework\\Component\\ComponentRegistrar"),
     COLLECTION_PROCESSOR("Magento\\Framework\\Api\\SearchCriteria\\CollectionProcessorInterface"),
     DATA_PERSISTOR("Magento\\Framework\\App\\Request\\DataPersistorInterface"),
     DATA_OBJECT("Magento\\Framework\\DataObject"),