Rework

Author: VincentLanglet

src/Php/PhpVersion.php

@@ -516,9 +516,9 @@ public function updatesAutoIncrementKeyForNegativeValues(): bool
 		return $this->versionId >= 80300;
 	}
 
-	public function updatesAutoIncrementKeyForNegativeValuesInNonEmptyInitializer(): bool
+	public function updatesAutoIncrementKeyForNegativeValuesOnlyInNonEmptyInitializer(): bool
 	{
-		return $this->versionId >= 80000;
+		return $this->versionId >= 80000 && $this->versionId < 80300;
 	}
 
 }

src/Type/Constant/ConstantArrayTypeBuilder.php

@@ -42,7 +42,7 @@ final class ConstantArrayTypeBuilder
 
 	private bool $oversized = false;
 
-	private bool $initializedEmpty = false;
+	private bool $forceUpdatesAutoIncrementKeyForNegativeValues = false;
 
 	/**
 	 * @param list<Type> $keyTypes
@@ -76,20 +76,8 @@ public static function createFromConstantArray(ConstantArrayType $startArrayType
 		);
 
 		$phpVersion = PhpVersionStaticAccessor::getInstance();
-		if (
-			!$phpVersion->updatesAutoIncrementKeyForNegativeValues()
-			&& $phpVersion->updatesAutoIncrementKeyForNegativeValuesInNonEmptyInitializer()
-		) {
-			if (count($startArrayType->getKeyTypes()) === 0) {
-				$builder->initializedEmpty = true;
-			} elseif (max($startArrayType->getNextAutoIndexes()) === 0) {
-				foreach ($startArrayType->getKeyTypes() as $keyType) {
-					if ($keyType instanceof ConstantIntegerType && $keyType->getValue() < 0) {
-						$builder->initializedEmpty = true;
-						break;
-					}
-				}
-			}
+		if ($phpVersion->updatesAutoIncrementKeyForNegativeValuesOnlyInNonEmptyInitializer()) {
+			$builder->forceUpdatesAutoIncrementKeyForNegativeValues = !self::wasInitializedEmpty($startArrayType);
 		}
 
 		if (count($startArrayType->getKeyTypes()) > self::ARRAY_COUNT_LIMIT) {
@@ -450,12 +438,28 @@ private function shouldUpdateAutoIndex(int $offsetValue, int $max): bool
 		}
 
 		$phpVersion = PhpVersionStaticAccessor::getInstance();
-
 		if ($phpVersion->updatesAutoIncrementKeyForNegativeValues()) {
 			return true;
 		}
 
-		return !$this->initializedEmpty && $phpVersion->updatesAutoIncrementKeyForNegativeValuesInNonEmptyInitializer();
+		return !$this->forceUpdatesAutoIncrementKeyForNegativeValues;
+	}
+
+	private static function wasInitializedEmpty(ConstantArrayType $startArrayType): bool
+	{
+		if (count($startArrayType->getKeyTypes()) === 0) {
+			return true;
+		}
+
+		if (max($startArrayType->getNextAutoIndexes()) === 0) {
+			foreach ($startArrayType->getKeyTypes() as $keyType) {
+				if ($keyType instanceof ConstantIntegerType && $keyType->getValue() < 0) {
+					return true;
+				}
+			}
+		}
+
+		return false;
 	}
 
 }