narrow down $this/static for type specifier 2

phpstan · Apr 13, 2024 · ddce768 · ddce768
1 parent d3a2990
commit ddce768
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/Analyser/TypeSpecifier.php b/src/Analyser/TypeSpecifier.php
@@ -1645,7 +1645,7 @@ private function createForExpr(
 		) {
 			$methodName = $expr->name->toString();
 			if ($expr->class instanceof Name) {
-				$calledOnType = $scope->resolveTypeByName($expr->class);
+				$calledOnType = $scope->getType(new ClassConstFetch($expr->class, 'class'))->getClassStringObjectType();
 			} else {
 				$calledOnType = $scope->getType($expr->class);
 			}

diff --git a/tests/PHPStan/Analyser/data/bug-instanceof-static-vs-this-type-specifier.php b/tests/PHPStan/Analyser/data/bug-instanceof-static-vs-this-type-specifier.php
@@ -6,6 +6,8 @@ interface FooInterface
 {
 	/** @phpstan-assert-if-true null $v */
 	public static function isNull(?int $v): bool;
+
+	public static function foo(): int;
 }
 
 class FooBase
@@ -16,12 +18,20 @@ public function bar(?int $v): void
 			if ($this->isNull($v)) \PHPStan\Testing\assertType('null', $v);
 			if ($this::isNull($v)) \PHPStan\Testing\assertType('null', $v);
 			if (static::isNull($v)) \PHPStan\Testing\assertType('null', $v);
+
+			if ($this::foo() === 5) \PHPStan\Testing\assertType('5', $this::foo());
+			if ($this->foo() === 5) \PHPStan\Testing\assertType('5', $this->foo());
+			if (static::foo() === 5) \PHPStan\Testing\assertType('5', static::foo());
 		}
 
 		if (is_a(static::class, FooInterface::class, true)) {
 			if ($this->isNull($v)) \PHPStan\Testing\assertType('null', $v);
 			if ($this::isNull($v)) \PHPStan\Testing\assertType('null', $v);
 			if (static::isNull($v)) \PHPStan\Testing\assertType('null', $v);
+
+			if ($this::foo() === 5) \PHPStan\Testing\assertType('5', $this::foo());
+			if ($this->foo() === 5) \PHPStan\Testing\assertType('5', $this->foo());
+			if (static::foo() === 5) \PHPStan\Testing\assertType('5', static::foo());
 		}
 	}
 }