Lazier type-resolving in isset-checks

Author: staabm

src/Analyser/MutatingScope.php

@@ -1995,17 +1995,17 @@ public function issetCheck(Expr $expr, callable $typeCallback, ?bool $result = n
 			return $result;
 		} elseif ($expr instanceof Node\Expr\ArrayDimFetch && $expr->dim !== null) {
 			$type = $this->getType($expr->var);
-			$dimType = $this->getType($expr->dim);
-			$hasOffsetValue = $type->hasOffsetValueType($dimType);
 			if (!$type->isOffsetAccessible()->yes()) {
 				return $result ?? $this->issetCheckUndefined($expr->var);
 			}
 
+			$dimType = $this->getType($expr->dim);
+			$hasOffsetValue = $type->hasOffsetValueType($dimType);
 			if ($hasOffsetValue->no()) {
 				return false;
 			}
 
-			// If offset is cannot be null, store this error message and see if one of the earlier offsets is.
+			// If offset cannot be null, store this error message and see if one of the earlier offsets is.
 			// E.g. $array['a']['b']['c'] ?? null; is a valid coalesce if a OR b or C might be null.
 			if ($hasOffsetValue->yes()) {
 				$result = $typeCallback($type->getOffsetValueType($dimType));

src/Rules/IssetCheck.php

@@ -59,14 +59,14 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, cal
 			$type = $this->treatPhpDocTypesAsCertain
 				? $scope->getType($expr->var)
 				: $scope->getNativeType($expr->var);
-			$dimType = $this->treatPhpDocTypesAsCertain
-				? $scope->getType($expr->dim)
-				: $scope->getNativeType($expr->dim);
-			$hasOffsetValue = $type->hasOffsetValueType($dimType);
 			if (!$type->isOffsetAccessible()->yes()) {
 				return $error ?? $this->checkUndefined($expr->var, $scope, $operatorDescription);
 			}
 
+			$dimType = $this->treatPhpDocTypesAsCertain
+				? $scope->getType($expr->dim)
+				: $scope->getNativeType($expr->dim);
+			$hasOffsetValue = $type->hasOffsetValueType($dimType);
 			if ($hasOffsetValue->no()) {
 				if (!$this->checkAdvancedIsset) {
 					return null;
@@ -82,7 +82,7 @@ public function check(Expr $expr, Scope $scope, string $operatorDescription, cal
 				)->build();
 			}
 
-			// If offset is cannot be null, store this error message and see if one of the earlier offsets is.
+			// If offset cannot be null, store this error message and see if one of the earlier offsets is.
 			// E.g. $array['a']['b']['c'] ?? null; is a valid coalesce if a OR b or C might be null.
 			if ($hasOffsetValue->yes() || $scope->hasExpressionType($expr)->yes()) {
 				if (!$this->checkAdvancedIsset) {