Update TypeSpecifier.php

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -1078,28 +1078,29 @@ public function specifyTypesInCondition(
 					} else {
 						$varType = $scope->getType($var->var);
 
-						if ($varType->isArray()->yes() && count($dimType->getConstantScalarTypes()) <= 1) {
+						$narrowedKey = AllowedArrayKeysTypes::narrowOffsetKeyType($varType, $dimType);
+						if ($narrowedKey !== null) {
 							$types = $types->unionWith(
 								$this->create(
-									$var->var,
-									new NonEmptyArrayType(),
+									$var->dim,
+									$narrowedKey,
 									$context,
 									$scope,
 								)->setRootExpr($expr),
 							);
 						}
 
-						$narrowedKey = AllowedArrayKeysTypes::narrowOffsetKeyType($varType, $dimType);
-						if ($narrowedKey !== null) {
+						if ($scope->getNativeType($var->var)->isArray()->yes()) {
 							$types = $types->unionWith(
 								$this->create(
-									$var->dim,
-									$narrowedKey,
+									$var->var,
+									new NonEmptyArrayType(),
 									$context,
 									$scope,
 								)->setRootExpr($expr),
 							);
 						}
+
 					}
 				}