simplify

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -2660,22 +2660,14 @@ static function (): void {
 			) {
 				$arrayArg = $expr->getArgs()[0]->value;
 
-				$arrayArgType = $scope->getType($arrayArg);
-				$arrayArgNativeType = $scope->getNativeType($arrayArg);
-
 				$isArrayPop = $functionReflection->getName() === 'array_pop';
-				$newType = $isArrayPop ? $arrayArgType->popArray() : $arrayArgType->shiftArray();
-				$scope = $scope->invalidateExpression($arrayArg)->assignExpression(
-					$arrayArg,
-					$newType,
-					$isArrayPop ? $arrayArgNativeType->popArray() : $arrayArgNativeType->shiftArray(),
-				);
+				$arrayArgType = $scope->getType($arrayArg);
 
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($newType),
+					new TypeExpr($isArrayPop ? $arrayArgType->popArray() : $arrayArgType->shiftArray()),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;
@@ -2694,17 +2686,13 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 				&& in_array($functionReflection->getName(), ['array_push', 'array_unshift'], true)
 				&& count($expr->getArgs()) >= 2
 			) {
-				$arrayType = $this->getArrayFunctionAppendingType($functionReflection, $scope, $expr);
-				$arrayNativeType = $this->getArrayFunctionAppendingType($functionReflection, $scope->doNotTreatPhpDocTypesAsCertain(), $expr);
-
 				$arrayArg = $expr->getArgs()[0]->value;
-				$scope = $scope->invalidateExpression($arrayArg)->assignExpression($arrayArg, $arrayType, $arrayNativeType);
 
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($arrayType),
+					new TypeExpr($this->getArrayFunctionAppendingType($functionReflection, $scope, $expr)),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;
@@ -2730,18 +2718,12 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 				&& $functionReflection->getName() === 'shuffle'
 			) {
 				$arrayArg = $expr->getArgs()[0]->value;
-				$newType = $scope->getType($arrayArg)->shuffleArray();
-				$scope = $scope->assignExpression(
-					$arrayArg,
-					$newType,
-					$scope->getNativeType($arrayArg)->shuffleArray(),
-				);
 
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($newType),
+					new TypeExpr($scope->getType($arrayArg)->shuffleArray()),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;
@@ -2762,24 +2744,16 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 			) {
 				$arrayArg = $expr->getArgs()[0]->value;
 				$arrayArgType = $scope->getType($arrayArg);
-				$arrayArgNativeType = $scope->getNativeType($arrayArg);
 
 				$offsetType = $scope->getType($expr->getArgs()[1]->value);
 				$lengthType = isset($expr->getArgs()[2]) ? $scope->getType($expr->getArgs()[2]->value) : new NullType();
 				$replacementType = isset($expr->getArgs()[3]) ? $scope->getType($expr->getArgs()[3]->value) : new ConstantArrayType([], []);
 
-				$newType = $arrayArgType->spliceArray($offsetType, $lengthType, $replacementType);
-				$scope = $scope->invalidateExpression($arrayArg)->assignExpression(
-					$arrayArg,
-					$newType,
-					$arrayArgNativeType->spliceArray($offsetType, $lengthType, $replacementType),
-				);
-
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($newType),
+					new TypeExpr($arrayArgType->spliceArray($offsetType, $lengthType, $replacementType)),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;
@@ -2799,18 +2773,12 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 				&& count($expr->getArgs()) >= 1
 			) {
 				$arrayArg = $expr->getArgs()[0]->value;
-				$newType = $this->getArraySortPreserveListFunctionType($scope->getType($arrayArg));
-				$scope = $scope->assignExpression(
-					$arrayArg,
-					$newType,
-					$this->getArraySortPreserveListFunctionType($scope->getNativeType($arrayArg)),
-				);
 
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($newType),
+					new TypeExpr($this->getArraySortPreserveListFunctionType($scope->getType($arrayArg))),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;
@@ -2830,18 +2798,12 @@ static function (Node $node, Scope $scope) use ($nodeCallback): void {
 				&& count($expr->getArgs()) >= 1
 			) {
 				$arrayArg = $expr->getArgs()[0]->value;
-				$newType = $this->getArraySortDoNotPreserveListFunctionType($scope->getType($arrayArg));
-				$scope = $scope->assignExpression(
-					$arrayArg,
-					$newType,
-					$this->getArraySortDoNotPreserveListFunctionType($scope->getNativeType($arrayArg)),
-				);
 
 				$scope = $this->processAssignVar(
 					$scope,
 					$stmt,
 					$arrayArg,
-					new TypeExpr($newType),
+					new TypeExpr($this->getArraySortDoNotPreserveListFunctionType($scope->getType($arrayArg))),
 					static function (Node $node, Scope $scope) use ($nodeCallback): void {
 						if (!$node instanceof PropertyAssignNode && !$node instanceof VariableAssignNode) {
 							return;