Fix handling assertInstanceOf

phpstan · Feb 21, 2023 · 7e43c8f · 7e43c8f
1 parent 4b17a23
commit 7e43c8f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/Type/PHPUnit/Assert/AssertTypeSpecifyingExtensionHelper.php b/src/Type/PHPUnit/Assert/AssertTypeSpecifyingExtensionHelper.php
@@ -124,15 +124,15 @@ private static function getExpressionResolvers(): array
 		if (self::$resolvers === null) {
 			self::$resolvers = [
 				'InstanceOf' => static function (Scope $scope, Arg $class, Arg $object): ?Instanceof_ {
-					$classType = $scope->getType($class->value)->getClassStringObjectType();
-					$classNames = $classType->getObjectClassNames();
+					$classType = $scope->getType($class->value);
+					$classNames = $classType->getConstantStrings();
 					if (count($classNames) !== 1) {
 						return null;
 					}
 
 					return new Instanceof_(
 						$object->value,
-						new Name($classNames[0])
+						new Name($classNames[0]->getValue())
 					);
 				},
 				'Same' => static function (Scope $scope, Arg $expected, Arg $actual): Identical {

diff --git a/tests/Rules/PHPUnit/data/impossible-assert-method-call.php b/tests/Rules/PHPUnit/data/impossible-assert-method-call.php
@@ -20,4 +20,13 @@ public function doBar(object $o): void
 		$this->assertEmpty($o);
 	}
 
+	/**
+	 * @param class-string<\Exception> $name
+	 * @return void
+	 */
+	public function doBaz(\Exception $e, string $name): void
+	{
+		$this->assertInstanceOf($name, $e);
+	}
+
 }