AssertRuleHelper - InitializerExprTypeResolver does not have support for resolving method call types, use Scope instead

Author: ondrejmirtes

src/Rules/PhpDoc/AssertRuleHelper.php

@@ -11,8 +11,6 @@
 use PHPStan\PhpDoc\Tag\AssertTag;
 use PHPStan\Reflection\ExtendedMethodReflection;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Reflection\InitializerExprContext;
-use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Reflection\ParametersAcceptor;
 use PHPStan\Reflection\ReflectionProvider;
 use PHPStan\Rules\ClassNameCheck;
@@ -35,7 +33,6 @@ final class AssertRuleHelper
 {
 
 	public function __construct(
-		private InitializerExprTypeResolver $initializerExprTypeResolver,
 		private ReflectionProvider $reflectionProvider,
 		private UnresolvableTypeHelper $unresolvableTypeHelper,
 		private ClassNameCheck $classCheck,
@@ -69,8 +66,6 @@ public function check(
 			$parametersByName['this'] = new ObjectType($class->getName(), classReflection: $class);
 		}
 
-		$context = InitializerExprContext::createEmpty();
-
 		$errors = [];
 		foreach ($reflection->getAsserts()->getAll() as $assert) {
 			$parameterName = substr($assert->getParameter()->getParameterName(), 1);
@@ -86,7 +81,7 @@ public function check(
 			}
 
 			$assertedExpr = $assert->getParameter()->getExpr(new TypeExpr($parametersByName[$parameterName]));
-			$assertedExprType = $this->initializerExprTypeResolver->getType($assertedExpr, $context);
+			$assertedExprType = $scope->getType($assertedExpr);
 			$assertedExprString = $assert->getParameter()->describe();
 			if ($assertedExprType instanceof ErrorType) {
 				$errors[] = RuleErrorBuilder::message(sprintf('Assert references unknown %s.', $assertedExprString))

stubs/ReflectionEnumWithLazyObjects.stub

@@ -24,4 +24,6 @@ class ReflectionEnum extends ReflectionClass
 	 */
 	public function isBacked(): bool {}
 
+	public function getBackingType(): ?ReflectionNamedType;
+
 }

tests/PHPStan/Rules/PhpDoc/FunctionAssertRuleTest.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\PhpDoc;
 
-use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Rules\ClassCaseSensitivityCheck;
 use PHPStan\Rules\ClassForbiddenNameCheck;
 use PHPStan\Rules\ClassNameCheck;
@@ -19,10 +18,8 @@ class FunctionAssertRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		$initializerExprTypeResolver = self::getContainer()->getByType(InitializerExprTypeResolver::class);
 		$reflectionProvider = self::createReflectionProvider();
 		return new FunctionAssertRule(new AssertRuleHelper(
-			$initializerExprTypeResolver,
 			$reflectionProvider,
 			new UnresolvableTypeHelper(),
 			new ClassNameCheck(

tests/PHPStan/Rules/PhpDoc/MethodAssertRuleTest.php

@@ -2,7 +2,6 @@
 
 namespace PHPStan\Rules\PhpDoc;
 
-use PHPStan\Reflection\InitializerExprTypeResolver;
 use PHPStan\Rules\ClassCaseSensitivityCheck;
 use PHPStan\Rules\ClassForbiddenNameCheck;
 use PHPStan\Rules\ClassNameCheck;
@@ -19,10 +18,8 @@ class MethodAssertRuleTest extends RuleTestCase
 
 	protected function getRule(): Rule
 	{
-		$initializerExprTypeResolver = self::getContainer()->getByType(InitializerExprTypeResolver::class);
 		$reflectionProvider = self::createReflectionProvider();
 		return new MethodAssertRule(new AssertRuleHelper(
-			$initializerExprTypeResolver,
 			$reflectionProvider,
 			new UnresolvableTypeHelper(),
 			new ClassNameCheck(
@@ -153,4 +150,14 @@ public function testBug10594(): void
 		$this->analyse([__DIR__ . '/data/bug-10594.php'], []);
 	}
 
+	public function testBugIncompatibleAssertTypeWithMethodReturnType(): void
+	{
+		$this->analyse([__DIR__ . '/data/incompatible-assert-type-with-method-return-type.php'], [
+			[
+				'Asserted type non-empty-list<static(IncompatibleAssertTypeWithMethodReturnType\Foo)> for $this->getValues() with type list<int> can never happen.',
+				19,
+			],
+		]);
+	}
+
 }

tests/PHPStan/Rules/PhpDoc/data/incompatible-assert-type-with-method-return-type.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace IncompatibleAssertTypeWithMethodReturnType;
+
+class Foo
+{
+
+	/**
+	 * @return list<int>
+	 */
+	public function getValues(): array
+	{
+
+	}
+
+	/**
+	 * @phpstan-assert-if-false non-empty-list<static> $this->getValues()
+	 */
+	public function isEmpty(): bool
+	{
+
+	}
+
+}