Simplify

Author: VincentLanglet

src/Analyser/TypeSpecifier.php

@@ -892,7 +892,7 @@ public function specifyTypesInCondition(
 						return $exprType->unionWith($this->create(
 							new IssetExpr($issetExpr),
 							new NullType(),
-							$context,
+							TypeSpecifierContext::createFalse(),
 							$scope,
 						))->setRootExpr($expr);
 					}
@@ -902,7 +902,7 @@ public function specifyTypesInCondition(
 						return $exprType->unionWith($this->create(
 							new IssetExpr($issetExpr),
 							new NullType(),
-							$context->negate(),
+							TypeSpecifierContext::createTruthy(),
 							$scope,
 						))->setRootExpr($expr);
 					}
@@ -929,23 +929,24 @@ public function specifyTypesInCondition(
 						$dimType = $scope->getType($issetExpr->dim);
 
 						if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
-							$types = $varType instanceof UnionType ? $varType->getTypes() : [$varType];
+							$constantArrays = $varType->getConstantArrays();
 							$typesToRemove = [];
-							foreach ($types as $innerType) {
-								$hasOffset = $innerType->hasOffsetValueType($dimType);
-								if (!$hasOffset->yes() || !$innerType->getOffsetValueType($dimType)->isNull()->no()) {
+							foreach ($constantArrays as $constantArray) {
+								$hasOffset = $constantArray->hasOffsetValueType($dimType);
+								if (!$hasOffset->yes() || !$constantArray->getOffsetValueType($dimType)->isNull()->no()) {
 									continue;
 								}
 
-								$typesToRemove[] = $innerType;
+								$typesToRemove[] = $constantArray;
 							}
 
 							if ($typesToRemove !== []) {
 								$typeToRemove = TypeCombinator::union(...$typesToRemove);
+
 								$result = $this->create(
 									$issetExpr->var,
 									$typeToRemove,
-									TypeSpecifierContext::createFalse(),
+									$context,
 									$scope,
 								)->setRootExpr($expr);
 
@@ -954,7 +955,7 @@ public function specifyTypesInCondition(
 										$this->create(
 											new IssetExpr($issetExpr->var),
 											new NullType(),
-											TypeSpecifierContext::createTruthy(),
+											$context->negate(),
 											$scope,
 										)->setRootExpr($expr),
 									);