Merge branch 2.2.x into 2.3.x

getReturnTypeWithUnresolvedTemplateArguments(), which only exists on 2.3.x,
narrows the template types in conditional types for parameters too, the same
way getReturnTypeWithUnresolvableTemplateTypes() does.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QU5puXLGJ7aMwLbyhvFkCu

Author: ondrejmirtes

.github/workflows/e2e-tests.yml

@@ -1749,6 +1749,16 @@ jobs:
           # the two dumps are the only errors: count the file:line:message lines
           ../bashunit -a equals '2' "$(echo "$OUTPUT" | grep -Ec '^/.+:[0-9]+:')"
 
+      - name: "Verify conditional types leave memoized types equal to the argument alone"
+        # With the extension active TypeCombinator's results are memoized, so every
+        # `int|false` resolved from a PHPDoc is the same object. ConditionalType
+        # narrowed the types in its branches identical to the argument, which made
+        # `($priority is int ? bool : int|false)` lose the `int` for an `int|false`
+        # argument - https://github.com/phpstan/phpstan/issues/15268
+        run: |
+          cd e2e/bug-15268
+          php ../../bin/phpstan analyse --no-progress --error-format=raw
+
       - name: "Test"
         # The arena is a per-run POSIX shared-memory object: shm_open() plus an
         # ftruncate() to 256 MB that tmpfs honours sparsely, committing pages on

e2e/bug-15268/phpstan.neon

@@ -0,0 +1,4 @@
+parameters:
+	level: 10
+	paths:
+		- .

e2e/bug-15268/test.php

@@ -0,0 +1,36 @@
+<?php declare(strict_types = 1);
+
+use function PHPStan\Testing\assertType;
+
+/**
+ * @param int|false $priority
+ * @return ($priority is int ? bool : int|false)
+ */
+function leaf($priority = false) {
+	return is_int($priority) ? true : 5;
+}
+
+/**
+ * @param int|false $priority
+ * @return ($priority is int ? bool : int|false)
+ */
+function wrapper($priority = false) {
+	// $priority is int|false, so the condition selects neither branch and the result
+	// should be their union. This assertion passes when PHPStan runs on PHP 8.2, and
+	// fails with "Expected type bool|int, actual: bool" on PHP 8.3, 8.4 and 8.5.
+	assertType('bool|int', leaf($priority));
+
+	// Because the type above lost its int, PHP 8.3+ additionally reports
+	// "Function wrapper() never returns int so it can be removed from the return type."
+	// It does return int: leaf(false) returns 5. No such error on PHP 8.2.
+	return leaf($priority);
+}
+
+// These hold on every PHP version: when the argument type selects a branch, the
+// conditional resolves correctly.
+assertType('int|false', leaf());
+assertType('bool', leaf(10));
+assertType('int|false', wrapper());
+
+// Playground result on PHP 8.2 (its own runtime): No errors.
+// Run locally on PHP 8.3+: two errors, the failed assertion and return.unusedType.

src/Analyser/Traverser/GenericTypeTemplateTraverser.php

@@ -9,6 +9,7 @@
 use PHPStan\Type\Generic\TemplateTypeHelper;
 use PHPStan\Type\Generic\TemplateTypeMap;
 use PHPStan\Type\Generic\UnresolvedTemplateArgumentType;
+use PHPStan\Type\NarrowedSubjectType;
 use PHPStan\Type\Type;
 use PHPStan\Type\TypeTraverserCallable;
 
@@ -42,7 +43,7 @@ public function __construct(
 	 */
 	public function traverse(Type $type, callable $traverse): Type
 	{
-		if ($type instanceof TemplateType && !$type->isArgument()) {
+		if ($type instanceof TemplateType && !$type instanceof NarrowedSubjectType && !$type->isArgument()) {
 			$newType = $this->resolvedTemplateTypeMap->getType($type->getName());
 			if ($this->frame === null) {
 				if ($newType === null || $newType instanceof ErrorType) {

src/Dependency/DependencyResolver.php

@@ -36,6 +36,7 @@
 use PHPStan\Type\Type;
 use function array_key_exists;
 use function count;
+use function get_class;
 use function in_array;
 use function is_file;
 use function spl_object_id;
@@ -44,9 +45,74 @@
 final class DependencyResolver
 {
 
+	private const PROFILE_VAR_TAGS = 1;
+
+	private const PROFILE_CHAIN = 2;
+
+	private const PROFILE_EXPORT = 4;
+
+	private const PROFILE_NAME_SCOPE = 8;
+
+	/** Node classes the branch chain in collectNodeDependencies() reacts to */
+	private const CHAIN_NODE_TYPES = [
+		Node\Stmt\Class_::class,
+		Node\Stmt\Interface_::class,
+		Node\Stmt\Enum_::class,
+		InClassMethodNode::class,
+		InPropertyHookNode::class,
+		ClassPropertyNode::class,
+		InFunctionNode::class,
+		Closure::class,
+		Node\Expr\ArrowFunction::class,
+		Node\Expr\FuncCall::class,
+		Node\Expr\MethodCall::class,
+		Node\Expr\PropertyFetch::class,
+		Node\Expr\StaticCall::class,
+		Node\Expr\ClassConstFetch::class,
+		Node\Expr\ConstFetch::class,
+		Node\Expr\StaticPropertyFetch::class,
+		Node\Expr\New_::class,
+		Node\Stmt\Trait_::class,
+		Node\Stmt\TraitUse::class,
+		Node\Expr\Instanceof_::class,
+		Node\Expr\Include_::class,
+		Node\Stmt\Catch_::class,
+		ArrayDimFetch::class,
+		Foreach_::class,
+		Array_::class,
+		StaticMethodCallableNode::class,
+		MethodCallableNode::class,
+		FunctionCallableNode::class,
+		InstantiationCallableNode::class,
+	];
+
+	/**
+	 * Node classes ExportedNodeResolver::resolve() reacts to. A class member is not among them: it is
+	 * exported as part of the class declaring it, through exportClassStatement(), never on its own.
+	 */
+	private const EXPORT_NODE_TYPES = [
+		Node\Stmt\Class_::class,
+		Node\Stmt\Interface_::class,
+		Node\Stmt\Enum_::class,
+		Node\Stmt\Trait_::class,
+		Node\Stmt\Function_::class,
+		Node\Stmt\Const_::class,
+		Node\Expr\FuncCall::class,
+	];
+
+	/** Node classes ExportedNameScopeTracker::enterNode() reacts to */
+	private const NAME_SCOPE_NODE_TYPES = [
+		Node\Stmt\Namespace_::class,
+		Node\Stmt\Use_::class,
+		Node\Stmt\GroupUse::class,
+	];
+
 	/** @var array<string, array<int, ClassReflection|FunctionReflection|ConstantReflection>> reflections keyed by spl_object_id() */
 	private array $classDependencies = [];
 
+	/** @var array<class-string, int> */
+	private array $nodeProfiles = [];
+
 	private ExportedNameScopeTracker $nameScopeTracker;
 
 	private ?string $nameScopeFile = null;
@@ -72,27 +138,42 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 			$this->nameScopeFile = $file;
 			$this->nameScopeTracker->reset();
 		}
-		$this->nameScopeTracker->enterNode($node);
+		$nodeClass = get_class($node);
+		$nodeProfile = $this->nodeProfiles[$nodeClass] ??= $this->resolveNodeProfile($node);
+
+		if (($nodeProfile & self::PROFILE_NAME_SCOPE) !== 0) {
+			$this->nameScopeTracker->enterNode($node);
+		}
 
 		// Keyed by spl_object_id(), so that a reflection collected again - every level of a class hierarchy
 		// repeats the interfaces it inherits, and the classes a node references share most of their
 		// ancestors - is kept only once instead of being resolved to its file and package once more.
 		$dependenciesReflections = [];
 		$dependenciesFilePaths = [];
 
-		if (
-			$node instanceof Node\Stmt
-			&& !$node instanceof VirtualNode
-			&& !$node instanceof Node\Stmt\ClassLike
-			&& !$node instanceof Node\Stmt\ClassMethod
-			&& !$node instanceof Node\Stmt\Function_
-			&& !$node instanceof Node\Stmt\Property
-			&& !$node instanceof Node\Stmt\ClassConst
-			&& !$node instanceof Node\Stmt\Const_
-		) {
+		if (($nodeProfile & self::PROFILE_VAR_TAGS) !== 0 && $node instanceof Node\Stmt) {
 			$this->extractStmtVarTags($node, $scope, $dependenciesReflections);
 		}
 
+		if (($nodeProfile & self::PROFILE_CHAIN) !== 0) {
+			$this->collectNodeDependencies($node, $scope, $dependenciesReflections, $dependenciesFilePaths);
+		}
+
+		$exportedNode = ($nodeProfile & self::PROFILE_EXPORT) !== 0
+			? $this->exportedNodeResolver->resolve($node, $this->nameScopeTracker->getNameScope())
+			: null;
+
+		return new NodeDependencies($this->fileHelper, $dependenciesReflections, $exportedNode, $dependenciesFilePaths);
+	}
+
+	/**
+	 * The node-kind branches. Only entered when resolveNodeProfile() says a branch can match.
+	 *
+	 * @param array<ClassReflection|FunctionReflection|ConstantReflection> $dependenciesReflections
+	 * @param list<string> $dependenciesFilePaths
+	 */
+	private function collectNodeDependencies(Node $node, Scope $scope, array &$dependenciesReflections, array &$dependenciesFilePaths): void
+	{
 		if ($node instanceof Node\Stmt\Class_) {
 			if (isset($node->namespacedName)) {
 				$this->addClassToDependencies($node->namespacedName->toString(), $dependenciesReflections);
@@ -562,8 +643,6 @@ public function resolveDependencies(Node $node, Scope $scope): NodeDependencies
 		} elseif ($node instanceof InstantiationCallableNode) {
 			$dependenciesReflections += $this->resolveDependencies(new Node\Expr\New_($node->getClass()), $scope)->getReflections();
 		}
-
-		return new NodeDependencies($this->fileHelper, $dependenciesReflections, $this->exportedNodeResolver->resolve($node, $this->nameScopeTracker->getNameScope()), $dependenciesFilePaths);
 	}
 
 	public function resolveUsedTraitDependencies(InClassNode $inClassNode): NodeDependencies
@@ -606,6 +685,45 @@ private function getClassNamesFromClassString(Type $type): array
 		return $classNames;
 	}
 
+	/**
+	 * Which parts of resolveDependencies() a node of this class can reach. Depends only on the class,
+	 * so it is computed once per class and reused for every node of it.
+	 */
+	private function resolveNodeProfile(Node $node): int
+	{
+		$profile = 0;
+		if (
+			$node instanceof Node\Stmt
+			&& !$node instanceof VirtualNode
+			&& !$node instanceof Node\Stmt\ClassLike
+			&& !$node instanceof Node\Stmt\ClassMethod
+			&& !$node instanceof Node\Stmt\Function_
+			&& !$node instanceof Node\Stmt\Property
+			&& !$node instanceof Node\Stmt\ClassConst
+			&& !$node instanceof Node\Stmt\Const_
+		) {
+			$profile |= self::PROFILE_VAR_TAGS;
+		}
+
+		$lists = [
+			self::PROFILE_CHAIN => self::CHAIN_NODE_TYPES,
+			self::PROFILE_EXPORT => self::EXPORT_NODE_TYPES,
+			self::PROFILE_NAME_SCOPE => self::NAME_SCOPE_NODE_TYPES,
+		];
+		foreach ($lists as $bit => $nodeTypes) {
+			foreach ($nodeTypes as $nodeType) {
+				if (!$node instanceof $nodeType) {
+					continue;
+				}
+
+				$profile |= $bit;
+				break;
+			}
+		}
+
+		return $profile;
+	}
+
 	/**
 	 * Extracts the classes referenced from a variable-level var-tag PHPDoc attached to a statement.
 	 *