@@ -12,7 +12,6 @@ parameters:
 - stubs/Assert.stub
 - stubs/AssertionFailedError.stub
 - stubs/ExpectationFailedException.stub
-- stubs/InvocationMocker.stub
 - stubs/MockBuilder.stub
 - stubs/MockObject.stub
 - stubs/Stub.stub
@@ -42,18 +41,10 @@ services:
 class: PHPStan\Type\PHPUnit\Assert\AssertStaticMethodTypeSpecifyingExtension
 tags:
 - phpstan.typeSpecifier.staticMethodTypeSpecifyingExtension
--
-class: PHPStan\Type\PHPUnit\InvocationMockerDynamicReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
 -
 class: PHPStan\Type\PHPUnit\MockBuilderDynamicReturnTypeExtension
 tags:
 - phpstan.broker.dynamicMethodReturnTypeExtension
--
-class: PHPStan\Type\PHPUnit\MockObjectDynamicReturnTypeExtension
-tags:
-- phpstan.broker.dynamicMethodReturnTypeExtension
 -
 class: PHPStan\Rules\PHPUnit\CoversHelper
 -

@@ -5,9 +5,10 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\MethodCall;
 use PHPStan\Analyser\Scope;
+use PHPStan\Rules\IdentifierRuleError;
 use PHPStan\Rules\Rule;
 use PHPStan\Rules\RuleErrorBuilder;
-use PHPUnit\Framework\MockObject\Builder\InvocationMocker;
+use PHPStan\Type\Type;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
 use function array_filter;
@@ -47,44 +48,58 @@ public function processNode(Node $node, Scope $scope): array
 $method = $constantString->getValue();
 $type = $scope->getType($node->var);
 
-if (
-(
-in_array(MockObject::class, $type->getObjectClassNames(), true)
-|| in_array(Stub::class, $type->getObjectClassNames(), true)
-)
-&& !$type->hasMethod($method)->yes()
-) {
-$mockClasses = array_filter($type->getObjectClassNames(), static fn (string $class): bool => $class !== MockObject::class && $class !== Stub::class);
-if (count($mockClasses) === 0) {
-continue;
-}
-
-$errors[] = RuleErrorBuilder::message(sprintf(
-'Trying to mock an undefined method %s() on class %s.',
-$method,
-implode('&', $mockClasses),
-))->identifier('phpunit.mockMethod')->build();
+$error = $this->checkCallOnType($type, $method);
+if ($error !== null) {
+$errors[] = $error;
 continue;
 }
 
-$mockedClassObject = $type->getTemplateType(InvocationMocker::class, 'TMockedClass');
-if ($mockedClassObject->hasMethod($method)->yes()) {
+if (!$node->var instanceof MethodCall) {
 continue;
 }
 
-$classNames = $mockedClassObject->getObjectClassNames();
-if (count($classNames) === 0) {
+if (!$node->var->name instanceof Node\Identifier) {
 continue;
 }
 
-$errors[] = RuleErrorBuilder::message(sprintf(
+if ($node->var->name->toLowerString() !== 'expects') {
+continue;
+}
+
+$varType = $scope->getType($node->var->var);
+$error = $this->checkCallOnType($varType, $method);
+if ($error === null) {
+continue;
+}
+
+$errors[] = $error;
+}
+
+return $errors;
+}
+
+private function checkCallOnType(Type $type, string $method): ?IdentifierRuleError
+{
+if (
+(
+in_array(MockObject::class, $type->getObjectClassNames(), true)
+|| in_array(Stub::class, $type->getObjectClassNames(), true)
+)
+&& !$type->hasMethod($method)->yes()
+) {
+$mockClasses = array_filter($type->getObjectClassNames(), static fn (string $class): bool => $class !== MockObject::class && $class !== Stub::class);
+if (count($mockClasses) === 0) {
+return null;
+}
+
+return RuleErrorBuilder::message(sprintf(
 'Trying to mock an undefined method %s() on class %s.',
 $method,
-implode('|', $classNames),
+implode('&', $mockClasses),
 ))->identifier('phpunit.mockMethod')->build();
 }
 
-return $errors;
+return null;
 }
 
 }

@@ -4,7 +4,6 @@
 
 use PHPStan\Rules\Rule;
 use PHPStan\Testing\RuleTestCase;
-use function interface_exists;
 
 /**
 * @extends RuleTestCase<MockMethodCallRule>
@@ -28,14 +27,11 @@ 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);
 }