Add type specifying support for classes extending Assert

Author: Nicolas Reynis

src/Type/PHPUnit/Assert/AssertMethodTypeSpecifyingExtension.php

@@ -24,7 +24,7 @@ public function setTypeSpecifier(TypeSpecifier $typeSpecifier): void
 
 	public function getClass(): string
 	{
-		return 'PHPUnit\Framework\TestCase';
+		return 'PHPUnit\Framework\Assert';
 	}
 
 	public function isMethodSupported(

tests/Type/PHPUnit/AssertMethodTypeSpecifyingExtensionTest.php

@@ -0,0 +1,40 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\Type\PHPUnit;
+
+use PHPStan\Testing\TypeInferenceTestCase;
+
+class AssertMethodTypeSpecifyingExtensionTest extends TypeInferenceTestCase
+{
+
+	/** @return mixed[] */
+	public function dataFileAsserts(): iterable
+	{
+		if (!class_exists('PHPUnit\\Framework\\Assert')) {
+			return [];
+		}
+
+		yield from $this->gatherAssertTypes(__DIR__ . '/data/assert-method.php');
+	}
+
+	/**
+	 * @dataProvider dataFileAsserts
+	 * @param string $assertType
+	 * @param string $file
+	 * @param mixed ...$args
+	 */
+	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/assert-method.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace AssertMethod;
+
+use function PHPStan\Testing\assertType;
+
+class Foo
+{
+
+	public function inheritedAssertMethodsNarrowType(?string $s): void
+	{
+		$customAsserter = new class () extends \PHPUnit\Framework\Assert {};
+		$customAsserter->assertNotNull($s);
+		assertType('string', $s);
+	}
+
+}