Use pre-args scope for value types in array_push/array_unshift (#5579)

Author: predictor2718

src/Analyser/ExprHandler/FuncCallHandler.php

@@ -265,6 +265,7 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 			}
 		}
 
+		$scopeBeforeArgs = $scope;
 		$argsResult = $nodeScopeResolver->processArgs($stmt, $functionReflection, null, $parametersAcceptor, $normalizedExpr, $scope, $storage, $nodeCallbackForArgs, $context);
 		$scope = $argsResult->getScope();
 		$hasYield = $argsResult->hasYield();
@@ -395,8 +396,8 @@ public function processExpr(NodeScopeResolver $nodeScopeResolver, Stmt $stmt, Ex
 				$stmt,
 				$arrayArg,
 				new NativeTypeExpr(
-					$this->getArrayFunctionAppendingType($functionReflection, $scope, $normalizedExpr),
-					$this->getArrayFunctionAppendingType($functionReflection, $scope->doNotTreatPhpDocTypesAsCertain(), $normalizedExpr),
+					$this->getArrayFunctionAppendingType($functionReflection, $scopeBeforeArgs, $normalizedExpr),
+					$this->getArrayFunctionAppendingType($functionReflection, $scopeBeforeArgs->doNotTreatPhpDocTypesAsCertain(), $normalizedExpr),
 				),
 				$nodeCallback,
 			)->getScope();

tests/PHPStan/Analyser/nsrt/bug-13510.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Bug13510;
+
+use function PHPStan\Testing\assertType;
+
+final class Foo
+{
+
+	/** @param non-empty-list<int> $arr */
+	public function test(array $arr): void
+	{
+		array_unshift($arr, array_pop($arr));
+		assertType('non-empty-list<int>', $arr);
+	}
+
+	/** @param non-empty-list<int> $arr */
+	public function testTwoLines(array $arr): void
+	{
+		$popped = array_pop($arr);
+		array_unshift($arr, $popped);
+		assertType('non-empty-list<int>', $arr);
+	}
+
+}