Merge branch '4.4.0-develop' into 1179-fix-compatibility-issues

VitaliyBoyko · web-flow · commit c168afc15107 · 2022-09-13T12:27:46.000+03:00
diff --git a/src/com/magento/idea/magento2plugin/lang/php/MagentoProxyDeclarationFilter.java b/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;
         }

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ private <E extends PhpNamedElement> boolean isValidFqn(final E candidate) {`
`58`	`58`	`PhpClass targetClass = null;`
`59`	`59`
`60`	`60`	`if (candidate instanceof Method) {`
`61`		`- targetClass = (PhpClass) candidate.getParent();`
	`61`	`+ targetClass = ((Method) candidate).getContainingClass();`
`62`	`62`	`} else if (candidate instanceof PhpClass) {`
`63`	`63`	`targetClass = (PhpClass) candidate;`
`64`	`64`	`}`