Re-use ExpressionTypeHolder

Author: staabm

src/Analyser/MutatingScope.php

@@ -2435,12 +2435,12 @@ private function enterFunctionLike(
 
 					$holder = new ConditionalExpressionHolder([
 						$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), TypeCombinator::intersect($targetParameter->getType(), $parameterType->getTarget())),
-					], new ExpressionTypeHolder(new Variable($parameter->getName()), $ifType, TrinaryLogic::createYes()));
+					], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $ifType));
 					$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;
 
 					$holder = new ConditionalExpressionHolder([
 						$parameterType->getParameterName() => ExpressionTypeHolder::createYes(new Variable($targetParameterName), TypeCombinator::remove($targetParameter->getType(), $parameterType->getTarget())),
-					], new ExpressionTypeHolder(new Variable($parameter->getName()), $elseType, TrinaryLogic::createYes()));
+					], ExpressionTypeHolder::createYes(new Variable($parameter->getName()), $elseType));
 					$conditionalTypes['$' . $parameter->getName()][$holder->getKey()] = $holder;
 				}
 			}
@@ -4250,8 +4250,9 @@ public function processClosureScope(
 				}
 			}
 
-			$expressionTypes[$variableExprString] = ExpressionTypeHolder::createYes($use->var, $variableType);
-			$nativeExpressionTypes[$variableExprString] = ExpressionTypeHolder::createYes($use->var, $variableType);
+			$holder = ExpressionTypeHolder::createYes($use->var, $variableType);
+			$expressionTypes[$variableExprString] = $holder;
+			$nativeExpressionTypes[$variableExprString] = $holder;
 		}
 
 		return $this->scopeFactory->create(

src/Analyser/NodeScopeResolver.php

@@ -6966,13 +6966,15 @@ private function enterForeach(MutatingScope $scope, ExpressionResultStorage $sto
 			$arrayDimFetchConditionalHolders = [];
 			foreach ($constantArrays[0]->getKeyTypes() as $i => $keyType) {
 				$valueType = $constantArrays[0]->getValueTypes()[$i];
+				$keyExpressionTypeHolder = ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType);
+
 				$holder = new ConditionalExpressionHolder([
-					'$' . $stmt->keyVar->name => ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType),
-				], new ExpressionTypeHolder($stmt->valueVar, $valueType, TrinaryLogic::createYes()));
+					'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
+				], ExpressionTypeHolder::createYes($stmt->valueVar, $valueType));
 				$valueConditionalHolders[$holder->getKey()] = $holder;
 				$arrayDimFetchHolder = new ConditionalExpressionHolder([
-					'$' . $stmt->keyVar->name => ExpressionTypeHolder::createYes(new Variable($stmt->keyVar->name), $keyType),
-				], new ExpressionTypeHolder(new ArrayDimFetch($stmt->expr, $stmt->keyVar), $valueType, TrinaryLogic::createYes()));
+					'$' . $stmt->keyVar->name => $keyExpressionTypeHolder,
+				], ExpressionTypeHolder::createYes(new ArrayDimFetch($stmt->expr, $stmt->keyVar), $valueType));
 				$arrayDimFetchConditionalHolders[$arrayDimFetchHolder->getKey()] = $arrayDimFetchHolder;
 			}
 

src/Analyser/TypeSpecifier.php

@@ -1658,7 +1658,7 @@ private function processBooleanSureConditionalTypes(Scope $scope, SpecifiedTypes
 
 				$holder = new ConditionalExpressionHolder(
 					$conditions,
-					new ExpressionTypeHolder($expr, TypeCombinator::intersect($scope->getType($expr), $type), TrinaryLogic::createYes()),
+					ExpressionTypeHolder::createYes($expr, TypeCombinator::intersect($scope->getType($expr), $type)),
 				);
 				$holders[$exprString][$holder->getKey()] = $holder;
 			}
@@ -1725,7 +1725,7 @@ private function processBooleanNotSureConditionalTypes(Scope $scope, SpecifiedTy
 
 				$holder = new ConditionalExpressionHolder(
 					$conditions,
-					new ExpressionTypeHolder($expr, TypeCombinator::remove($scope->getType($expr), $type), TrinaryLogic::createYes()),
+					ExpressionTypeHolder::createYes($expr, TypeCombinator::remove($scope->getType($expr), $type)),
 				);
 				$holders[$exprString][$holder->getKey()] = $holder;
 			}