Easier solution

ondrejmirtes · ondrejmirtes · commit 9e84671c475f · 2023-06-18T12:06:57.000+02:00
diff --git a/src/Type/Php/ArraySliceFunctionReturnTypeExtension.php b/src/Type/Php/ArraySliceFunctionReturnTypeExtension.php
@@ -5,8 +5,7 @@
 use PhpParser\Node\Expr\FuncCall;
 use PHPStan\Analyser\Scope;
 use PHPStan\Reflection\FunctionReflection;
-use PHPStan\Type\Accessory\AccessoryArrayListType;
-use PHPStan\Type\Accessory\NonEmptyArrayType;
+use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\DynamicFunctionReturnTypeExtension;
 use PHPStan\Type\Type;
@@ -52,14 +51,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		}
 
 		if ($valueType->isIterableAtLeastOnce()->yes()) {
-			$valueType = $valueType->toArray();
-			if ((new NonEmptyArrayType())->isSuperTypeOf($valueType)->yes()) {
-				$arrays = $valueType->getArrays();
-				if (count($arrays) === 1) {
-					$newArrayType = $arrays[0];
-					return $valueType->isList()->yes() ? AccessoryArrayListType::intersectWith($newArrayType) : $newArrayType;
-				}
-			}
+			return TypeCombinator::union($valueType, new ConstantArrayType([], []));
 		}
 
 		return $valueType;
