.github/workflows/build.yml

@@ -97,6 +97,30 @@ jobs:
         dependencies:
           - "lowest"
           - "highest"
+        phpunit-version:
+          - "^9.5"
+          - "^10.5"
+          - "^11.5"
+          - "^12.0.9"
+        exclude:
+          - php-version: "7.4"
+            phpunit-version: "^10.5"
+          - php-version: "8.0"
+            phpunit-version: "^10.5"
+          - php-version: "7.4"
+            phpunit-version: "^11.5"
+          - php-version: "8.0"
+            phpunit-version: "^11.5"
+          - php-version: "8.1"
+            phpunit-version: "^11.5"
+          - php-version: "7.4"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.0"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.1"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.2"
+            phpunit-version: "^12.0.9"
 
     steps:
       - name: "Checkout"
@@ -108,6 +132,9 @@ jobs:
           coverage: "none"
           php-version: "${{ matrix.php-version }}"
 
+      - name: "Require specific PHPUnit version"
+        run: "composer require --dev phpunit/phpunit:${{ matrix.phpunit-version }}"
+
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
         run: "composer update --prefer-lowest --no-interaction --no-progress"
@@ -136,6 +163,30 @@ jobs:
         dependencies:
           - "lowest"
           - "highest"
+        phpunit-version:
+          - "^9.5"
+          - "^10.5"
+          - "^11.5"
+          - "^12.0.9"
+        exclude:
+          - php-version: "7.4"
+            phpunit-version: "^10.5"
+          - php-version: "8.0"
+            phpunit-version: "^10.5"
+          - php-version: "7.4"
+            phpunit-version: "^11.5"
+          - php-version: "8.0"
+            phpunit-version: "^11.5"
+          - php-version: "8.1"
+            phpunit-version: "^11.5"
+          - php-version: "7.4"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.0"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.1"
+            phpunit-version: "^12.0.9"
+          - php-version: "8.2"
+            phpunit-version: "^12.0.9"
 
     steps:
       - name: "Checkout"
@@ -149,6 +200,9 @@ jobs:
           extensions: mbstring
           tools: composer:v2
 
+      - name: "Require specific PHPUnit version"
+        run: "composer require --dev phpunit/phpunit:${{ matrix.phpunit-version }}"
+
       - name: "Install lowest dependencies"
         if: ${{ matrix.dependencies == 'lowest' }}
         run: "composer update --prefer-lowest --no-interaction --no-progress"

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
 
       - name: Generate changelog
         id: changelog
-        uses: metcalfc/changelog-generator@v4.3.1
+        uses: metcalfc/changelog-generator@v4.5.0
         with:
           myToken: ${{ secrets.PHPSTAN_BOT_TOKEN }}
 

LICENSE

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) 2016 Ondřej Mirtes
+Copyright (c) 2025 PHPStan s.r.o.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -13,14 +13,13 @@
 		"phpunit/phpunit": "<7.0"
 	},
 	"require-dev": {
+		"nikic/php-parser": "^5",
 		"php-parallel-lint/php-parallel-lint": "^1.2",
+		"phpstan/phpstan-deprecation-rules": "^2.0",
 		"phpstan/phpstan-strict-rules": "^2.0",
 		"phpunit/phpunit": "^9.6"
 	},
 	"config": {
-		"platform": {
-			"php": "7.4.6"
-		},
 		"sort-packages": true
 	},
 	"extra": {

extension.neon

@@ -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
 	-

phpstan-baseline.neon

@@ -14,3 +14,8 @@ parameters:
 			message: "#^Accessing PHPStan\\\\Rules\\\\Comparison\\\\ImpossibleCheckTypeMethodCallRule\\:\\:class is not covered by backward compatibility promise\\. The class might change in a minor PHPStan version\\.$#"
 			count: 1
 			path: tests/Rules/PHPUnit/ImpossibleCheckTypeMethodCallRuleTest.php
+
+		-
+			message: "#^Accessing PHPStan\\\\Rules\\\\Methods\\\\CallMethodsRule\\:\\:class is not covered by backward compatibility promise\\. The class might change in a minor PHPStan version\\.$#"
+			count: 1
+			path: tests/Rules/Methods/CallMethodsRuleTest.php

phpstan.neon

@@ -2,9 +2,15 @@ includes:
 	- extension.neon
 	- rules.neon
 	- vendor/phpstan/phpstan-strict-rules/rules.neon
+	- vendor/phpstan/phpstan-deprecation-rules/rules.neon
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 	- phpstan-baseline.neon
 
 parameters:
 	excludePaths:
 		- tests/*/data/*
+	ignoreErrors:
+		-
+			message: '#^Attribute class PHPUnit\\Framework\\Attributes\\DataProvider does not exist\.$#'
+			identifier: attribute.notFound
+			reportUnmatched: false

phpunit.xml

@@ -12,20 +12,6 @@
          failOnWarning="true"
          xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xml"
 >
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <clover outputFile="tests/tmp/clover.xml"/>
-            <text
-                outputFile="php://stdout"
-                showUncoveredFiles="true"
-                showOnlySummary="true"
-            />
-        </report>
-    </coverage>
-
     <testsuites>
         <testsuite name="PHPStan for PHPUnit">
             <directory suffix="Test.php">tests</directory>

src/Rules/PHPUnit/ClassCoversExistsRule.php

@@ -50,7 +50,7 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		$classReflection = $node->getClassReflection();
 
-		if (!$classReflection->isSubclassOf(TestCase::class)) {
+		if (!$classReflection->is(TestCase::class)) {
 			return [];
 		}
 

src/Rules/PHPUnit/ClassMethodCoversExistsRule.php

@@ -56,7 +56,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$classReflection->isSubclassOf(TestCase::class)) {
+		if (!$classReflection->is(TestCase::class)) {
 			return [];
 		}
 

src/Rules/PHPUnit/DataProviderDeclarationRule.php

@@ -52,7 +52,7 @@ public function processNode(Node $node, Scope $scope): array
 	{
 		$classReflection = $scope->getClassReflection();
 
-		if ($classReflection === null || !$classReflection->isSubclassOf(TestCase::class)) {
+		if ($classReflection === null || !$classReflection->is(TestCase::class)) {
 			return [];
 		}
 

src/Rules/PHPUnit/DataProviderHelper.php

@@ -76,7 +76,7 @@ public function getDataProviderMethods(
 				}
 
 				$dataProviderMethod = $this->parseDataProviderAnnotationValue($scope, $dataProviderValue);
-				$dataProviderMethod[] = $node->getLine();
+				$dataProviderMethod[] = $node->getStartLine();
 
 				yield $dataProviderValue => $dataProviderMethod;
 			}
@@ -257,7 +257,7 @@ private function parseDataProviderExternalAttribute(Attribute $attribute): ?arra
 			sprintf('%s::%s', $className, $methodNameArg->value) => [
 				$dataProviderClassReflection,
 				$methodNameArg->value,
-				$attribute->getLine(),
+				$attribute->getStartLine(),
 			],
 		];
 	}
@@ -279,7 +279,7 @@ private function parseDataProviderAttribute(Attribute $attribute, ClassReflectio
 			$methodNameArg->value => [
 				$classReflection,
 				$methodNameArg->value,
-				$attribute->getLine(),
+				$attribute->getStartLine(),
 			],
 		];
 	}

src/Rules/PHPUnit/MockMethodCallRule.php

@@ -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;
 	}
 
 }

src/Rules/PHPUnit/NoMissingSpaceInClassAnnotationRule.php

@@ -33,7 +33,7 @@ public function getNodeType(): string
 	public function processNode(Node $node, Scope $scope): array
 	{
 		$classReflection = $scope->getClassReflection();
-		if ($classReflection === null || $classReflection->isSubclassOf(TestCase::class) === false) {
+		if ($classReflection === null || $classReflection->is(TestCase::class) === false) {
 			return [];
 		}
 

src/Rules/PHPUnit/NoMissingSpaceInMethodAnnotationRule.php

@@ -33,7 +33,7 @@ public function getNodeType(): string
 	public function processNode(Node $node, Scope $scope): array
 	{
 		$classReflection = $scope->getClassReflection();
-		if ($classReflection === null || $classReflection->isSubclassOf(TestCase::class) === false) {
+		if ($classReflection === null || $classReflection->is(TestCase::class) === false) {
 			return [];
 		}
 

src/Rules/PHPUnit/ShouldCallParentMethodsRule.php

@@ -33,7 +33,7 @@ public function processNode(Node $node, Scope $scope): array
 			return [];
 		}
 
-		if (!$scope->getClassReflection()->isSubclassOf(TestCase::class)) {
+		if (!$scope->getClassReflection()->is(TestCase::class)) {
 			return [];
 		}