Narrow array to non-empty for array_search, narrow $arr[$key] to needle type for strict array_search

Both array_search and array_find_key now narrow the array to non-empty
when the result is not the sentinel value (false/null respectively).

For array_search with strict mode (third argument true), $arr[$key] is
narrowed to the intersection of the needle type and the value type,
since strict comparison guarantees the found value has the same type as
the needle.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: 2 people

src/Analyser/TypeSpecifier.php

@@ -875,15 +875,15 @@ public function specifyTypesInCondition(
 				$funcName = $expr->expr->name->toLowerString();
 				$arrayArgIndex = null;
 				$sentinelType = null;
-				$narrowToNonEmpty = false;
+				$needleArgIndex = null;
 
 				if ($funcName === 'array_search') {
 					$arrayArgIndex = 1;
 					$sentinelType = new ConstantBooleanType(false);
+					$needleArgIndex = 0;
 				} elseif ($funcName === 'array_find_key') {
 					$arrayArgIndex = 0;
 					$sentinelType = new NullType();
-					$narrowToNonEmpty = true;
 				}
 
 				if ($arrayArgIndex !== null) {
@@ -892,23 +892,40 @@ public function specifyTypesInCondition(
 
 					if ($arrayType->isArray()->yes()) {
 						if ($context->true()) {
-							if ($narrowToNonEmpty) {
-								$specifiedTypes = $specifiedTypes->unionWith(
-									$this->create($arrayArg, new NonEmptyArrayType(), TypeSpecifierContext::createTrue(), $scope),
-								);
-							}
+							$specifiedTypes = $specifiedTypes->unionWith(
+								$this->create($arrayArg, new NonEmptyArrayType(), TypeSpecifierContext::createTrue(), $scope),
+							);
 
 							$dimFetch = new ArrayDimFetch($arrayArg, $expr->var);
 
+							$dimFetchType = $arrayType->getIterableValueType();
+							if (
+								$needleArgIndex !== null
+								&& count($expr->expr->getArgs()) >= 3
+								&& $scope->getType($expr->expr->getArgs()[2]->value)->isTrue()->yes()
+							) {
+								$needleType = $scope->getType($expr->expr->getArgs()[$needleArgIndex]->value);
+								$dimFetchType = TypeCombinator::intersect($needleType, $dimFetchType);
+							}
+
 							$specifiedTypes = $specifiedTypes->unionWith(
-								$this->create($dimFetch, $arrayType->getIterableValueType(), TypeSpecifierContext::createTrue(), $scope),
+								$this->create($dimFetch, $dimFetchType, TypeSpecifierContext::createTrue(), $scope),
 							);
 						} elseif ($expr->var instanceof Expr\Variable && is_string($expr->var->name)) {
 							$keyType = $scope->getType($expr->expr);
 							$narrowedKeyType = TypeCombinator::remove($keyType, $sentinelType);
 							if (!$narrowedKeyType instanceof NeverType) {
+								$dimFetchType = null;
+								if (
+									$needleArgIndex !== null
+									&& count($expr->expr->getArgs()) >= 3
+									&& $scope->getType($expr->expr->getArgs()[2]->value)->isTrue()->yes()
+								) {
+									$needleType = $scope->getType($expr->expr->getArgs()[$needleArgIndex]->value);
+									$dimFetchType = TypeCombinator::intersect($needleType, $arrayType->getIterableValueType());
+								}
 								$specifiedTypes = $specifiedTypes->unionWith(
-									$this->createArrayDimFetchConditionalExpressionHolder($expr->var, $arrayArg, $arrayType, $narrowedKeyType),
+									$this->createArrayDimFetchConditionalExpressionHolder($expr->var, $arrayArg, $arrayType, $narrowedKeyType, $dimFetchType),
 								);
 							}
 						}
@@ -2421,6 +2438,7 @@ private function createArrayDimFetchConditionalExpressionHolder(
 		Expr $arrayArg,
 		Type $arrayType,
 		Type $narrowedKeyType,
+		?Type $dimFetchType = null,
 	): SpecifiedTypes
 	{
 		$dimFetch = new ArrayDimFetch($arrayArg, $keyVar);
@@ -2429,7 +2447,7 @@ private function createArrayDimFetchConditionalExpressionHolder(
 
 		$holder = new ConditionalExpressionHolder(
 			[$keyExprString => ExpressionTypeHolder::createYes($keyVar, $narrowedKeyType)],
-			ExpressionTypeHolder::createYes($dimFetch, $arrayType->getIterableValueType()),
+			ExpressionTypeHolder::createYes($dimFetch, $dimFetchType ?? $arrayType->getIterableValueType()),
 		);
 
 		return (new SpecifiedTypes([], []))->setNewConditionalExpressionHolders([

tests/PHPStan/Analyser/nsrt/array-search-existing.php

@@ -37,3 +37,35 @@ function arraySearchReversedComparison(array $list, string $s): void
 		assertType('string', $list[$key]);
 	}
 }
+
+/**
+ * @param array<string, int|string> $arr
+ */
+function arraySearchStrictNarrowsToNeedle(array $arr, int $needle): void
+{
+	$key = array_search($needle, $arr, true);
+	if ($key !== false) {
+		assertType('int', $arr[$key]);
+	}
+}
+
+/**
+ * @param array<string, int|string> $arr
+ */
+function arraySearchLooseKeepsValueType(array $arr, int $needle): void
+{
+	$key = array_search($needle, $arr);
+	if ($key !== false) {
+		assertType('int|string', $arr[$key]);
+	}
+}
+
+/**
+ * @param array<string, int|string> $arr
+ */
+function arraySearchStrictInlineAssign(array $arr, int $needle): void
+{
+	if (($key = array_search($needle, $arr, true)) !== false) {
+		assertType('int', $arr[$key]);
+	}
+}