Merge branch '4.4.0-develop' into 1144-error-magento-installation-path

Author: bohdan-harniuk

src/com/magento/idea/magento2plugin/inspections/xml/ObserverDeclarationInspection.java

@@ -8,6 +8,7 @@
 import com.intellij.codeInspection.ProblemHighlightType;
 import com.intellij.codeInspection.ProblemsHolder;
 import com.intellij.ide.highlighter.XmlFileType;
+import com.intellij.openapi.externalSystem.service.execution.NotSupportedException;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -71,6 +72,10 @@ public void visitFile(final @NotNull PsiFile file) {
                     return;
                 }
 
+                // This added to cover case if file exists only in memory.
+                if (file.getContainingDirectory() == null) {
+                    return;
+                }
                 final EventIndex eventIndex = new EventIndex(file.getProject());
                 final HashMap<String, XmlTag> targetObserversHash = new HashMap<>();
 
@@ -108,7 +113,8 @@ public void visitFile(final @NotNull PsiFile file) {
                         }
 
                         final String observerName = observerNameAttribute.getValue();
-                        if (observerName == null) {
+                        if (observerName == null
+                                || observerNameAttribute.getValueElement() == null) {
                             continue;
                         }
 
@@ -188,6 +194,11 @@ private List<HashMap<String, String>> fetchModuleNamesWhereSameObserverNameUsed(
                     final EventIndex eventIndex,
                     final PsiFile file
             ) {
+                if (file.getContainingDirectory() == null) {
+                    throw new NotSupportedException(
+                            "Operation is not supported for files in memory"
+                    );
+                }
                 final List<HashMap<String, String>> modulesName = new ArrayList<>();
                 final String currentFileDirectory = file.getContainingDirectory().toString();
                 final String currentFileFullPath = currentFileDirectory

src/com/magento/idea/magento2plugin/lang/php/MagentoProxyDeclarationFilter.java

@@ -58,7 +58,7 @@ private <E extends PhpNamedElement> boolean isValidFqn(final E candidate) {
         PhpClass targetClass = null;
 
         if (candidate instanceof Method) {
-            targetClass = (PhpClass) candidate.getParent();
+            targetClass = ((Method) candidate).getContainingClass();
         } else if (candidate instanceof PhpClass) {
             targetClass = (PhpClass) candidate;
         }