Cover non-empty-array in array_combine

Author: staabm

src/Type/Php/ArrayCombineFunctionReturnTypeExtension.php

@@ -8,13 +8,15 @@
 use PHPStan\Php\PhpVersion;
 use PHPStan\Reflection\FunctionReflection;
 use PHPStan\Reflection\ParametersAcceptorSelector;
+use PHPStan\Type\Accessory\NonEmptyArrayType;
 use PHPStan\Type\ArrayType;
 use PHPStan\Type\Constant\ConstantArrayType;
 use PHPStan\Type\Constant\ConstantBooleanType;
 use PHPStan\Type\Constant\ConstantIntegerType;
 use PHPStan\Type\Constant\ConstantStringType;
 use PHPStan\Type\MixedType;
 use PHPStan\Type\Type;
+use PHPStan\Type\TypeCombinator;
 use PHPStan\Type\UnionType;
 
 class ArrayCombineFunctionReturnTypeExtension implements \PHPStan\Type\DynamicFunctionReturnTypeExtension
@@ -69,6 +71,10 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			$valuesParamType instanceof ArrayType ? $valuesParamType->getItemType() : new MixedType()
 		);
 
+		if ($keysParamType->isIterableAtLeastOnce()->yes() && $valuesParamType->isIterableAtLeastOnce()->yes()) {
+			$arrayType = TypeCombinator::intersect($arrayType, new NonEmptyArrayType());
+		}
+
 		if ($this->phpVersion->throwsTypeErrorForInternalFunctions()) {
 			return $arrayType;
 		}

tests/PHPStan/Analyser/data/non-empty-array.php

@@ -34,4 +34,13 @@ public function doFoo(
 		assertType('mixed', $invalidList2);
 	}
 
+	/**
+	 * @param non-empty-array $array
+	 * @param non-empty-list $list
+	 */
+	public function arrayFunctions($array, $list): void
+	{
+		assertType('array&nonEmpty', array_combine($array, $array));
+		assertType('array&nonEmpty', array_combine($list, $list));
+	}
 }