fix more variants

Author: staabm

src/Analyser/NodeScopeResolver.php

@@ -5392,6 +5392,7 @@ private function processAssignVar(
 				}
 			}
 
+			$scopeBeforeAssignEval = $scope;
 			$scope = $result->getScope();
 			$truthySpecifiedTypes = $this->typeSpecifier->specifyTypesInCondition($scope, $assignedExpr, TypeSpecifierContext::createTruthy());
 			$falseySpecifiedTypes = $this->typeSpecifier->specifyTypesInCondition($scope, $assignedExpr, TypeSpecifierContext::createFalsey());
@@ -5404,7 +5405,7 @@ private function processAssignVar(
 			$conditionalExpressions = $this->processSureTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);
 			$conditionalExpressions = $this->processSureNotTypesForConditionalExpressionsAfterAssign($scope, $var->name, $conditionalExpressions, $falseySpecifiedTypes, $falseyType);
 
-			$nodeCallback(new VariableAssignNode($var, $assignedExpr), $result->getScope());
+			$nodeCallback(new VariableAssignNode($var, $assignedExpr), $scopeBeforeAssignEval);
 			$scope = $scope->assignVariable($var->name, $type, $scope->getNativeType($assignedExpr), TrinaryLogic::createYes());
 			foreach ($conditionalExpressions as $exprString => $holders) {
 				$scope = $scope->addConditionalExpressions($exprString, $holders);
@@ -5575,9 +5576,9 @@ private function processAssignVar(
 				}
 			} else {
 				if ($var instanceof Variable) {
-					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scope);
+					$nodeCallback(new VariableAssignNode($var, $assignedPropertyExpr), $scopeBeforeAssignEval);
 				} elseif ($var instanceof PropertyFetch || $var instanceof StaticPropertyFetch) {
-					$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scope);
+					$nodeCallback(new PropertyAssignNode($var, $assignedPropertyExpr, $isAssignOp), $scopeBeforeAssignEval);
 					if ($var instanceof PropertyFetch && $var->name instanceof Node\Identifier && !$isAssignOp) {
 						$scope = $scope->assignInitializedProperty($scope->getType($var->var), $var->name->toString());
 					}

tests/PHPStan/Rules/Variables/ParameterOutAssignedTypeRuleTest.php

@@ -69,4 +69,9 @@ public function testBug13093(): void
 		$this->analyse([__DIR__ . '/data/bug-13093.php'], []);
 	}
 
+	public function testBug13093b(): void
+	{
+		$this->analyse([__DIR__ . '/data/bug-13093b.php'], []);
+	}
+
 }

tests/PHPStan/Rules/Variables/data/bug-13093b.php

@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Bug13093b;
+
+use function array_shift;
+
+final class ParallelProcessRunner
+{
+	/**
+	 * @var array<int, string>
+	 */
+	private array $nextMutantProcessKillerContainer = [];
+
+	public function fillBucketOnce(string &$killer): int
+	{
+		if ($this->nextMutantProcessKillerContainer !== []) {
+			$killer = array_shift($this->nextMutantProcessKillerContainer);
+		}
+
+		return 0;
+	}
+
+}
+