More specific return type for methods used to analyse currently entered function or method

Author: ondrejmirtes

src/Analyser/MutatingScope.php

@@ -208,7 +208,7 @@ public function __construct(
 		private ScopeContext $context,
 		private PhpVersion $phpVersion,
 		private bool $declareStrictTypes = false,
-		private FunctionReflection|ExtendedMethodReflection|null $function = null,
+		private PhpFunctionFromParserNodeReflection|null $function = null,
 		?string $namespace = null,
 		private array $expressionTypes = [],
 		private array $nativeExpressionTypes = [],
@@ -310,9 +310,8 @@ public function getTraitReflection(): ?ClassReflection
 
 	/**
 	 * @api
-	 * @return FunctionReflection|ExtendedMethodReflection|null
 	 */
-	public function getFunction()
+	public function getFunction(): ?PhpFunctionFromParserNodeReflection
 	{
 		return $this->function;
 	}

src/Analyser/NodeScopeResolver.php

@@ -728,7 +728,7 @@ private function processStmtNode(
 				$classReflection = $scope->getClassReflection();
 
 				$methodReflection = $methodScope->getFunction();
-				if (!$methodReflection instanceof ExtendedMethodReflection) {
+				if (!$methodReflection instanceof PhpMethodFromParserNodeReflection) {
 					throw new ShouldNotHappenException();
 				}
 

src/Analyser/Scope.php

@@ -16,6 +16,7 @@
 use PHPStan\Reflection\NamespaceAnswerer;
 use PHPStan\Reflection\ParameterReflection;
 use PHPStan\Reflection\ParametersAcceptor;
+use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use PHPStan\TrinaryLogic;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeWithClassName;
@@ -49,10 +50,7 @@ public function isInTrait(): bool;
 
 	public function getTraitReflection(): ?ClassReflection;
 
-	/**
-	 * @return FunctionReflection|ExtendedMethodReflection|null
-	 */
-	public function getFunction();
+	public function getFunction(): ?PhpFunctionFromParserNodeReflection;
 
 	public function getFunctionName(): ?string;
 

src/Node/FunctionReturnStatementsNode.php

@@ -9,7 +9,7 @@
 use PhpParser\NodeAbstract;
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\StatementResult;
-use PHPStan\Reflection\FunctionReflection;
+use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
 use function count;
 
 /**
@@ -32,7 +32,7 @@ public function __construct(
 		private StatementResult $statementResult,
 		private array $executionEnds,
 		private array $impurePoints,
-		private FunctionReflection $functionReflection,
+		private PhpFunctionFromParserNodeReflection $functionReflection,
 	)
 	{
 		parent::__construct($function->getAttributes());
@@ -91,7 +91,7 @@ public function getSubNodeNames(): array
 		return [];
 	}
 
-	public function getFunctionReflection(): FunctionReflection
+	public function getFunctionReflection(): PhpFunctionFromParserNodeReflection
 	{
 		return $this->functionReflection;
 	}

src/Node/MethodReturnStatementsNode.php

@@ -10,7 +10,7 @@
 use PHPStan\Analyser\ImpurePoint;
 use PHPStan\Analyser\StatementResult;
 use PHPStan\Reflection\ClassReflection;
-use PHPStan\Reflection\ExtendedMethodReflection;
+use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use function count;
 
 /**
@@ -36,7 +36,7 @@ public function __construct(
 		private array $executionEnds,
 		private array $impurePoints,
 		private ClassReflection $classReflection,
-		private ExtendedMethodReflection $methodReflection,
+		private PhpMethodFromParserNodeReflection $methodReflection,
 	)
 	{
 		parent::__construct($method->getAttributes());
@@ -88,7 +88,7 @@ public function getClassReflection(): ClassReflection
 		return $this->classReflection;
 	}
 
-	public function getMethodReflection(): ExtendedMethodReflection
+	public function getMethodReflection(): PhpMethodFromParserNodeReflection
 	{
 		return $this->methodReflection;
 	}

src/Rules/Api/ApiInstanceofRule.php

@@ -84,6 +84,9 @@ private function processCoveredClass(Node\Expr\Instanceof_ $node, Scope $scope,
 		if ($classReflection->getName() === Type::class || $classReflection->isSubclassOf(Type::class)) {
 			return [];
 		}
+		if ($classReflection->isInterface()) {
+			return [];
+		}
 
 		$instanceofType = $scope->getType($node);
 		if ($instanceofType->isTrue()->or($instanceofType->isFalse())->yes()) {

src/Rules/Functions/ReturnTypeRule.php

@@ -5,9 +5,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Return_;
 use PHPStan\Analyser\Scope;
+use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
-use PHPStan\Reflection\Php\PhpFunctionFromParserNodeReflection;
-use PHPStan\Reflection\Php\PhpMethodFromParserNodeReflection;
 use PHPStan\Rules\FunctionReturnTypeCheck;
 use PHPStan\Rules\Rule;
 use function sprintf;
@@ -40,10 +39,7 @@ public function processNode(Node $node, Scope $scope): array
 		}
 
 		$function = $scope->getFunction();
-		if (
-			!($function instanceof PhpFunctionFromParserNodeReflection)
-			|| $function instanceof PhpMethodFromParserNodeReflection
-		) {
+		if ($function instanceof MethodReflection) {
 			return [];
 		}