Skip to content

Commit f01a71c

Browse files
committed
add missing namespaces PhpUnit mock instances
1 parent ed7b271 commit f01a71c

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/com/phpuaca/filter/FilterFactory.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ private FilterFactory() {
2525
.add(new FilterConfigItem("PHPUnit_Framework_TestCase", "getMockForTrait", 7, MockBuilderFilter.class))
2626
.add(new FilterConfigItem("PHPUnit_Framework_MockObject_Builder_InvocationMocker", "method", 1, InvocationMockerFilter.class))
2727
.add(new FilterConfigItem("PHPUnit_Framework_MockObject_MockObject", "method", 1, InvocationMockerFilter.class))
28+
.add(new FilterConfigItem("PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker", "method", 1, InvocationMockerFilter.class))
29+
.add(new FilterConfigItem("PHPUnit\\Framework\\MockObject\\MockObject", "method", 1, InvocationMockerFilter.class))
2830
.add(new FilterConfigItem("MethodMock", "resetMethodCalledStack", 2, MethodMockFilter.class))
2931
.add(new FilterConfigItem("MethodMock", "getCalledArgs", 2, MethodMockFilter.class))
3032
.add(new FilterConfigItem("MethodMock", "isMethodCalled", 2, MethodMockFilter.class))

src/de/espend/idea/php/phpunit/utils/PhpUnitPluginUtil.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,9 @@ public static String findCreateMockParameterOnParameterScope(@NotNull StringLite
7575
PsiElement methodReference = parameterList.getParent();
7676
if(methodReference instanceof MethodReference && (
7777
PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) methodReference, "PHPUnit_Framework_MockObject_MockObject", "method") ||
78-
PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) methodReference, "PHPUnit_Framework_MockObject_Builder_InvocationMocker", "method")
78+
PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) methodReference, "PHPUnit_Framework_MockObject_Builder_InvocationMocker", "method") ||
79+
PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) methodReference, "PHPUnit\\Framework\\MockObject\\MockObject", "method") ||
80+
PhpElementsUtil.isMethodReferenceInstanceOf((MethodReference) methodReference, "PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker", "method")
7981
))
8082
{
8183
return CreateMockMethodReferenceProcessor.createParameter((MethodReference) methodReference);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ public boolean process(@NotNull MethodReference methodReference) {
3131

3232
return
3333
PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit_Framework_MockObject_MockObject") ||
34-
PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit_Framework_MockObject_Builder_InvocationMocker");
34+
PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit_Framework_MockObject_Builder_InvocationMocker") ||
35+
PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit\\Framework\\MockObject\\MockObject", "method") ||
36+
PhpElementsUtil.isMethodReferenceInstanceOf(methodReference, "PHPUnit\\Framework\\MockObject\\Builder\\InvocationMocker", "method");
3537
}
3638

3739
@Nullable

0 commit comments

Comments
 (0)