Improve

Author: VincentLanglet

extension.neon

@@ -51,6 +51,7 @@ services:
 		class: PHPStan\Type\PHPUnit\MockForIntersectionDynamicReturnTypeExtension
 		tags:
 			- phpstan.broker.dynamicMethodReturnTypeExtension
+			- phpstan.broker.dynamicStaticMethodReturnTypeExtension
 	-
 		class: PHPStan\Rules\PHPUnit\CoversHelper
 	-

src/Type/PHPUnit/MockForIntersectionDynamicReturnTypeExtension.php

@@ -2,20 +2,23 @@
 
 namespace PHPStan\Type\PHPUnit;
 
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr\MethodCall;
+use PhpParser\Node\Expr\StaticCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Type\DynamicMethodReturnTypeExtension;
+use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeCombinator;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\MockObject\Stub;
 use PHPUnit\Framework\TestCase;
 use function count;
-use function in_array;
+use function strtolower;
 
-class MockForIntersectionDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension
+class MockForIntersectionDynamicReturnTypeExtension implements DynamicMethodReturnTypeExtension, DynamicStaticMethodReturnTypeExtension
 {
 
 	public function getClass(): string
@@ -25,19 +28,29 @@ public function getClass(): string
 
 	public function isMethodSupported(MethodReflection $methodReflection): bool
 	{
-		return in_array(
-			$methodReflection->getName(),
-			[
-				'createMockForIntersectionOfInterfaces',
-				'createStubForIntersectionOfInterfaces',
-			],
-			true,
-		);
+		return strtolower($methodReflection->getName()) === 'createmockforintersectionofinterfaces';
+	}
+
+	public function isStaticMethodSupported(MethodReflection $methodReflection): bool
+	{
+		return strtolower($methodReflection->getName()) === 'createstubforintersectionofinterfaces';
+	}
+
+	public function getTypeFromStaticMethodCall(MethodReflection $methodReflection, StaticCall $methodCall, Scope $scope): ?Type
+	{
+		return $this->getTypeFromCall($methodReflection, $methodCall->getArgs(), $scope);
 	}
 
 	public function getTypeFromMethodCall(MethodReflection $methodReflection, MethodCall $methodCall, Scope $scope): ?Type
 	{
-		$args = $methodCall->getArgs();
+		return $this->getTypeFromCall($methodReflection, $methodCall->getArgs(), $scope);
+	}
+
+	/**
+	 * @param array<Arg> $args
+	 */
+	private function getTypeFromCall(MethodReflection $methodReflection, array $args, Scope $scope): ?Type
+	{
 		if (!isset($args[0])) {
 			return null;
 		}

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

@@ -51,7 +51,7 @@ public function testMockForIntersection()
 
 	public function testStubForIntersection()
 	{
-		$stub = $this->createStubForIntersectionOfInterfaces([FooInterface::class, BarInterface::class]);
+		$stub = static::createStubForIntersectionOfInterfaces([FooInterface::class, BarInterface::class]);
 		$stub->method('fooMethod');
 		$stub->method('barMethod');
 		$stub->method('bazMethod');

tests/Type/PHPUnit/MockForIntersectionDynamicReturnTypeExtensionTest.php

@@ -0,0 +1,42 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\PHPUnit;
+
+use PHPStan\Testing\TypeInferenceTestCase;
+use PHPUnit\Framework\Attributes\DataProvider;
+use PHPUnit\Framework\TestCase;
+use function method_exists;
+
+class MockForIntersectionDynamicReturnTypeExtensionTest extends TypeInferenceTestCase
+{
+
+	/** @return mixed[] */
+	public static function dataFileAsserts(): iterable
+	{
+		if (method_exists(TestCase::class, 'createMockForIntersectionOfInterfaces')) { // @phpstan-ignore-line
+			yield from self::gatherAssertTypes(__DIR__ . '/data/mock-for-intersection.php');
+		}
+
+		return [];
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param mixed ...$args
+	 */
+	#[DataProvider('dataFileAsserts')]
+	public function testFileAsserts(
+		string $assertType,
+		string $file,
+		...$args
+	): void
+	{
+		$this->assertFileAsserts($assertType, $file, ...$args);
+	}
+
+	public static function getAdditionalConfigFiles(): array
+	{
+		return [__DIR__ . '/../../../extension.neon'];
+	}
+
+}

tests/Type/PHPUnit/data/mock-for-intersection.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace MockForIntersection;
+
+use PHPUnit\Framework\TestCase;
+
+use function PHPStan\Testing\assertType;
+
+class Foo extends TestCase
+{
+
+	public function inheritedAssertMethodsNarrowType(?string $s): void
+	{
+		assertType(
+			'MockForIntersection\BarInterface&MockForIntersection\FooInterface&PHPUnit\Framework\MockObject\MockObject',
+			$this->createMockForIntersectionOfInterfaces([FooInterface::class, BarInterface::class]),
+		);
+		assertType(
+			'MockForIntersection\BarInterface&MockForIntersection\FooInterface&PHPUnit\Framework\MockObject\Stub',
+			self::createStubForIntersectionOfInterfaces([FooInterface::class, BarInterface::class]),
+		);
+	}
+
+}
+
+interface FooInterface {}
+interface BarInterface {}