CreateStub returns a Stub

Author: VincentLanglet

extension.neon

@@ -12,6 +12,7 @@ parameters:
 		- stubs/InvocationMocker.stub
 		- stubs/MockBuilder.stub
 		- stubs/MockObject.stub
+		- stubs/Stub.stub
 		- stubs/TestCase.stub
 	exceptions:
 		uncheckedExceptionRegexes:

src/PhpDoc/PHPUnit/MockObjectTypeNodeResolverExtension.php

@@ -39,6 +39,7 @@ public function resolve(TypeNode $typeNode, NameScope $nameScope): ?Type
 		static $mockClassNames = [
 			'PHPUnit_Framework_MockObject_MockObject' => true,
 			'PHPUnit\Framework\MockObject\MockObject' => true,
+			'PHPUnit\Framework\MockObject\Stub' => true,
 		];
 
 		$types = $this->typeNodeResolver->resolveMultiple($typeNode->types, $nameScope);

src/Rules/PHPUnit/MockMethodCallRule.php

@@ -12,6 +12,7 @@
 use PHPStan\Type\ObjectType;
 use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
 use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\MockObject\Stub;
 use function array_filter;
 use function count;
 use function implode;
@@ -52,11 +53,14 @@ public function processNode(Node $node, Scope $scope): array
 
 		if (
 			$type instanceof IntersectionType
-			&& in_array(MockObject::class, $type->getReferencedClasses(), true)
+			&& (
+				in_array(MockObject::class, $type->getReferencedClasses(), true)
+				|| in_array(Stub::class, $type->getReferencedClasses(), true)
+			)
 			&& !$type->hasMethod($method)->yes()
 		) {
 			$mockClass = array_filter($type->getReferencedClasses(), static function (string $class): bool {
-				return $class !== MockObject::class;
+				return $class !== MockObject::class && $class !== Stub::class;
 			});
 
 			return [

stubs/Stub.stub

@@ -0,0 +1,8 @@
+<?php
+
+namespace PHPUnit\Framework\MockObject;
+
+interface Stub
+{
+
+}

stubs/TestCase.stub

@@ -4,14 +4,15 @@ namespace PHPUnit\Framework;
 
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\MockBuilder;
+use PHPUnit\Framework\MockObject\Stub;
 
 class TestCase
 {
 
 	/**
 	 * @template T
 	 * @phpstan-param class-string<T> $originalClassName
-	 * @phpstan-return MockObject&T
+	 * @phpstan-return Stub&T
 	 */
 	public function createStub($originalClassName) {}
 

tests/Rules/PHPUnit/MockMethodCallRuleTest.php

@@ -4,6 +4,7 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
+use function interface_exists;
 
 /**
  * @extends RuleTestCase<MockMethodCallRule>
@@ -18,7 +19,7 @@ protected function getRule(): Rule
 
 	public function testRule(): void
 	{
-		$this->analyse([__DIR__ . '/data/mock-method-call.php'], [
+		$expectedErrors = [
 			[
 				'Trying to mock an undefined method doBadThing() on class MockMethodCall\Bar.',
 				15,
@@ -27,7 +28,16 @@ public function testRule(): void
 				'Trying to mock an undefined method doBadThing() on class MockMethodCall\Bar.',
 				20,
 			],
-		]);
+		];
+
+		if (interface_exists('PHPUnit\Framework\MockObject\Builder\InvocationStubber')) {
+			$expectedErrors[] = [
+				'Trying to mock an undefined method doBadThing() on class MockMethodCall\Bar.',
+				36,
+			];
+		}
+
+		$this->analyse([__DIR__ . '/data/mock-method-call.php'], $expectedErrors);
 	}
 
 	/**

tests/Rules/PHPUnit/data/mock-method-call.php

@@ -26,6 +26,16 @@ public function testWithAnotherObject()
 		$bar->method('doBadThing');
 	}
 
+	public function testGoodMethodOnStub()
+	{
+		$this->createStub(Bar::class)->method('doThing');
+	}
+
+	public function testBadMethodOnStub()
+	{
+		$this->createStub(Bar::class)->method('doBadThing');
+	}
+
 }
 
 class Bar {