Get rid of unnecessary instanceof self in ConstantArrayType

Author: herndlm

phpstan-baseline.neon

@@ -882,7 +882,7 @@ parameters:
 		-
 			message: '#^Doing instanceof PHPStan\\Type\\Constant\\ConstantArrayType is error\-prone and deprecated\. Use Type\:\:getConstantArrays\(\) instead\.$#'
 			identifier: phpstanApi.instanceofType
-			count: 7
+			count: 5
 			path: src/Type/Constant/ConstantArrayType.php
 
 		-

src/Type/Constant/ConstantArrayType.php

@@ -52,7 +52,6 @@
 use function array_merge;
 use function array_pop;
 use function array_push;
-use function array_reverse;
 use function array_slice;
 use function array_unique;
 use function array_values;
@@ -242,7 +241,7 @@ public function getAllArrays(): array
 			}
 
 			$array = $builder->getArray();
-			if (!$array instanceof ConstantArrayType) {
+			if (!$array instanceof self) {
 				throw new ShouldNotHappenException();
 			}
 
@@ -858,14 +857,16 @@ public function popArray(): Type
 
 	public function reverseArray(TrinaryLogic $preserveKeys): Type
 	{
-		$keyTypesReversed = array_reverse($this->keyTypes, true);
-		$keyTypes = array_values($keyTypesReversed);
-		$keyTypesReversedKeys = array_keys($keyTypesReversed);
-		$optionalKeys = array_map(static fn (int $optionalKey): int => $keyTypesReversedKeys[$optionalKey], $this->optionalKeys);
+		$builder = ConstantArrayTypeBuilder::createEmpty();
 
-		$reversed = new self($keyTypes, array_reverse($this->valueTypes), $this->nextAutoIndexes, $optionalKeys, TrinaryLogic::createNo());
+		for ($i = count($this->keyTypes) - 1; $i >= 0; $i--) {
+			$offsetType = $preserveKeys->yes() || $this->keyTypes[$i]->isInteger()->no()
+				? $this->keyTypes[$i]
+				: null;
+			$builder->setOffsetValueType($offsetType, $this->valueTypes[$i], $this->isOptionalKey($i));
+		}
 
-		return $preserveKeys->yes() ? $reversed : $reversed->reindex();
+		return $builder->getArray();
 	}
 
 	public function searchArray(Type $needleType): Type
@@ -994,15 +995,14 @@ public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $pre
 				$isOptional = true;
 			}
 
-			$builder->setOffsetValueType($this->keyTypes[$i], $this->valueTypes[$i], $isOptional);
-		}
+			$offsetType = $preserveKeys->yes() || $this->keyTypes[$i]->isInteger()->no()
+				? $this->keyTypes[$i]
+				: null;
 
-		$slice = $builder->getArray();
-		if (!$slice instanceof self) {
-			throw new ShouldNotHappenException();
+			$builder->setOffsetValueType($offsetType, $this->valueTypes[$i], $isOptional);
 		}
 
-		return $preserveKeys->yes() ? $slice : $slice->reindex();
+		return $builder->getArray();
 	}
 
 	public function isIterableAtLeastOnce(): TrinaryLogic
@@ -1148,7 +1148,7 @@ private function removeLastElements(int $length): self
 	}
 
 	/** @param positive-int $length */
-	private function removeFirstElements(int $length, bool $reindex = true): self
+	private function removeFirstElements(int $length, bool $reindex = true): Type
 	{
 		$builder = ConstantArrayTypeBuilder::createEmpty();
 
@@ -1175,30 +1175,7 @@ private function removeFirstElements(int $length, bool $reindex = true): self
 			$builder->setOffsetValueType($keyType, $valueType, $isOptional);
 		}
 
-		$array = $builder->getArray();
-		if (!$array instanceof self) {
-			throw new ShouldNotHappenException();
-		}
-
-		return $array;
-	}
-
-	private function reindex(): self
-	{
-		$keyTypes = [];
-		$autoIndex = 0;
-
-		foreach ($this->keyTypes as $keyType) {
-			if (!$keyType instanceof ConstantIntegerType) {
-				$keyTypes[] = $keyType;
-				continue;
-			}
-
-			$keyTypes[] = new ConstantIntegerType($autoIndex);
-			$autoIndex++;
-		}
-
-		return new self($keyTypes, $this->valueTypes, [$autoIndex], $this->optionalKeys, TrinaryLogic::createYes());
+		return $builder->getArray();
 	}
 
 	public function toBoolean(): BooleanType