allow all PhpUnit mock instance in chaining for finding createMock #39

Author: Haehnchen

src/main/java/de/espend/idea/php/phpunit/utils/PhpElementsUtil.java

@@ -84,7 +84,7 @@ public static boolean isInstanceOf(@NotNull PhpClass subjectClass, @NotNull Stri
     /**
      * Resolves MethodReference and compare containing class against implementations instances
      */
-    public static boolean isMethodReferenceInstanceOf(@NotNull MethodReference methodReference, @NotNull String expectedClassName) {
+    public static boolean isMethodReferenceInstanceOf(@NotNull MethodReference methodReference, @NotNull String ...expectedClassNameAsOr) {
         for (ResolveResult resolveResult : methodReference.multiResolve(false)) {
             PsiElement resolve = resolveResult.getElement();
 
@@ -97,11 +97,11 @@ public static boolean isMethodReferenceInstanceOf(@NotNull MethodReference metho
                 continue;
             }
 
-            if(!PhpElementsUtil.isInstanceOf(containingClass, expectedClassName)) {
-                continue;
+            for (String expectedClassName : expectedClassNameAsOr) {
+                if (PhpElementsUtil.isInstanceOf(containingClass, expectedClassName)) {
+                    return true;
+                }
             }
-
-            return true;
         }
 
         return false;

src/main/java/de/espend/idea/php/phpunit/utils/processor/CreateMockMethodReferenceProcessor.java

@@ -8,6 +8,11 @@
 import org.jetbrains.annotations.Nullable;
 
 /**
+ * Try to find a "createMock" method inside a call chain
+ *
+ *  - $this->createMock(...)->expects()->method('foobar')
+ *  - $this->foo->expects()->method('foobar') // via eg "setup" method
+ *
  * @author Daniel Espendiller <daniel@espendiller.net>
  */
 public class CreateMockMethodReferenceProcessor implements ChainVisitorUtil.ChainProcessorInterface {
@@ -29,11 +34,14 @@ public boolean process(@NotNull MethodReference methodReference) {
             return false;
         }
 
-        return
-            PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit_Framework_MockObject_MockObject") ||
-            PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit_Framework_MockObject_Builder_InvocationMocker") ||
-            PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit\\Framework\\MockObject\\MockObject", "method") ||
-            PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker", "method");
+        // allowed chain of classes types
+        return PhpElementsUtil.isMethodReferenceInstanceOf(
+            methodReference,
+            "PHPUnit_Framework_MockObject_MockObject",
+            "PHPUnit_Framework_MockObject_Builder_InvocationMocker",
+            "PHPUnit\\Framework\\MockObject\\MockObject",
+            "PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker"
+        );
     }
 
     @Nullable