Fix array_slice() edge cases

Author: herndlm

src/Type/Accessory/NonEmptyArrayType.php

@@ -216,10 +216,7 @@ public function shuffleArray(): Type
 
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
-		if (
-			(new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes()
-			&& ($lengthType->isNull()->yes() || IntegerRangeType::fromInterval(1, null)->isSuperTypeOf($lengthType)->yes())
-		) {
+		if ((new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes() && $lengthType->isNull()->yes()) {
 			return $this;
 		}
 

src/Type/ArrayType.php

@@ -442,6 +442,10 @@ public function shuffleArray(): Type
 
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
+		if ((new ConstantIntegerType(0))->isSuperTypeOf($lengthType)->yes()) {
+			return new ConstantArrayType([], []);
+		}
+
 		if ($preserveKeys->no() && $this->keyType->isInteger()->yes()) {
 			return TypeCombinator::intersect(new self(new IntegerType(), $this->itemType), new AccessoryArrayListType());
 		}

src/Type/IntersectionType.php

@@ -896,7 +896,18 @@ public function shuffleArray(): Type
 
 	public function sliceArray(Type $offsetType, Type $lengthType, TrinaryLogic $preserveKeys): Type
 	{
-		return $this->intersectTypes(static fn (Type $type): Type => $type->sliceArray($offsetType, $lengthType, $preserveKeys));
+		$result = $this->intersectTypes(static fn (Type $type): Type => $type->sliceArray($offsetType, $lengthType, $preserveKeys));
+
+		if (
+			$this->isList()->yes()
+			&& $this->isIterableAtLeastOnce()->yes()
+			&& (new ConstantIntegerType(0))->isSuperTypeOf($offsetType)->yes()
+			&& ($lengthType->isNull()->yes() || IntegerRangeType::fromInterval(1, null)->isSuperTypeOf($lengthType)->yes())
+		) {
+			$result = TypeCombinator::intersect($result, new NonEmptyArrayType());
+		}
+
+		return $result;
 	}
 
 	public function getEnumCases(): array

tests/PHPStan/Analyser/nsrt/array-slice.php

@@ -36,6 +36,22 @@ public function normalArrays(array $arr): void
 		/** @var array<string, int> $arr */
 		assertType('array<string, int>', array_slice($arr, 1, 2));
 		assertType('array<string, int>', array_slice($arr, 1, 2, true));
+
+		/** @var non-empty-array<string> $arr */
+		assertType('array{}', array_slice($arr, 0, 0));
+		assertType('array{}', array_slice($arr, 0, 0, true));
+
+		/** @var non-empty-array<string> $arr */
+		assertType('array<string>', array_slice($arr, 0, 1));
+		assertType('array<string>', array_slice($arr, 0, 1, true));
+
+		/** @var list<string> $arr */
+		assertType('list<string>', array_slice($arr, 0, 1));
+		assertType('list<string>', array_slice($arr, 0, 1, true));
+
+		/** @var non-empty-list<string> $arr */
+		assertType('non-empty-list<string>', array_slice($arr, 0, 1));
+		assertType('non-empty-list<string>', array_slice($arr, 0, 1, true));
 	}
 
 	public function constantArrays(array $arr): void

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

@@ -15,7 +15,7 @@ public function doFoo()
 			assertType('non-empty-array<0|1|2|3|4, 0|1|2|3|4>', $items);
 			$batch = array_splice($items, 0, 2);
 			assertType('array<0|1|2|3|4, 0|1|2|3|4>', $items);
-			assertType('non-empty-list<0|1|2|3|4>', $batch);
+			assertType('list<0|1|2|3|4>', $batch);
 		}
 	}
 
@@ -28,7 +28,7 @@ public function doBar($items)
 			assertType('non-empty-array<int>', $items);
 			$batch = array_splice($items, 0, 2);
 			assertType('array<int>', $items);
-			assertType('non-empty-array<int>', $batch);
+			assertType('array<int>', $batch);
 		}
 	}