fix

Author: staabm

src/Analyser/TypeSpecifier.php

@@ -1065,18 +1065,6 @@ public function specifyTypesInCondition(
 					&& !$scope->getType($var->var) instanceof MixedType
 				) {
 					$dimType = $scope->getType($var->dim);
-					$varType = $scope->getType($var->var);
-
-					if ($varType->isArray()->yes()) {
-						$types = $types->unionWith(
-							$this->create(
-								$var->var,
-								new NonEmptyArrayType(),
-								$context,
-								$scope,
-							)->setRootExpr($expr),
-						);
-					}
 
 					if ($dimType instanceof ConstantIntegerType || $dimType instanceof ConstantStringType) {
 						$types = $types->unionWith(
@@ -1089,6 +1077,18 @@ public function specifyTypesInCondition(
 						);
 					} else {
 						$varType = $scope->getType($var->var);
+
+						if ($varType->isArray()->yes() && $dimType->isConstantScalarValue()->no()) {
+							$types = $types->unionWith(
+								$this->create(
+									$var->var,
+									new NonEmptyArrayType(),
+									$context,
+									$scope,
+								)->setRootExpr($expr),
+							);
+						}
+
 						$narrowedKey = AllowedArrayKeysTypes::narrowOffsetKeyType($varType, $dimType);
 						if ($narrowedKey !== null) {
 							$types = $types->unionWith(

tests/PHPStan/Analyser/nsrt/bug-7000.php

@@ -12,7 +12,7 @@ public function doBar(): void
 		$composer = array();
 		foreach (array('require', 'require-dev') as $linkType) {
 			if (isset($composer[$linkType])) {
-				assertType('non-empty-array{require?: array<string, string>, require-dev?: array<string, string>}', $composer);
+				assertType('array{require?: array<string, string>, require-dev?: array<string, string>}', $composer);
 				foreach ($composer[$linkType] as $x) {}
 			}
 		}

tests/PHPStan/Rules/Variables/NullCoalesceRuleTest.php

@@ -280,7 +280,7 @@ public function testBug7190(): void
 	{
 		$this->analyse([__DIR__ . '/../Properties/data/bug-7190.php'], [
 			[
-				'Offset int on array<int, int> on left side of ?? always exists and is not nullable.',
+				'Offset int on non-empty-array<int, int> on left side of ?? always exists and is not nullable.',
 				20,
 			],
 		]);