Rework extension

Author: VincentLanglet

src/Type/Php/StrSplitFunctionReturnTypeExtension.php

@@ -57,7 +57,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			if ($splitLengthType instanceof ConstantIntegerType) {
 				$splitLength = $splitLengthType->getValue();
 				if ($splitLength < 1) {
-					return new ConstantBooleanType(false);
+					return $this->phpVersion->throwsValueErrorForInternalFunctions() ? null : new ConstantBooleanType(false);
 				}
 			}
 		} else {
@@ -70,21 +70,19 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 				$strings = $scope->getType($functionCall->getArgs()[2]->value)->getConstantStrings();
 				$values = array_unique(array_map(static fn (ConstantStringType $encoding): string => $encoding->getValue(), $strings));
 
-				if (count($values) !== 1) {
-					return null;
-				}
-
-				$encoding = $values[0];
-				if (!$this->isSupportedEncoding($encoding)) {
-					return new ConstantBooleanType(false);
+				if (count($values) === 1) {
+					$encoding = $values[0];
+					if (!$this->isSupportedEncoding($encoding)) {
+						return $this->phpVersion->throwsValueErrorForInternalFunctions() ? null : new ConstantBooleanType(false);
+					}
 				}
 			} else {
 				$encoding = mb_internal_encoding();
 			}
 		}
 
 		$stringType = $scope->getType($functionCall->getArgs()[0]->value);
-		if (isset($splitLength)) {
+		if (isset($splitLength) && ($functionReflection->getName() === 'str_split' || null !== $encoding)) {
 			$constantStrings = $stringType->getConstantStrings();
 			if (count($constantStrings) > 0) {
 				$results = [];
@@ -118,10 +116,14 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 		$returnValueType = TypeCombinator::intersect(new StringType(), ...$valueTypes);
 
 		$returnType = AccessoryArrayListType::intersectWith(TypeCombinator::intersect(new ArrayType(new IntegerType(), $returnValueType)));
+		if ($isInputNonEmptyString || ($encoding === null && !$this->phpVersion->strSplitReturnsEmptyArray())) {
+			$returnType = TypeCombinator::intersect($returnType, new NonEmptyArrayType());
+		}
+		if (!isset($splitLength) && !$this->phpVersion->throwsValueErrorForInternalFunctions()) {
+			$returnType = TypeCombinator::union($returnType, new ConstantBooleanType(false));
+		}
 
-		return $isInputNonEmptyString || ($encoding === null && !$this->phpVersion->strSplitReturnsEmptyArray())
-			? TypeCombinator::intersect($returnType, new NonEmptyArrayType())
-			: $returnType;
+		return $returnType;
 	}
 
 	/**

tests/PHPStan/Analyser/data/str-split-php74.php

@@ -28,13 +28,13 @@ public function legacyTest() {
 		assertType('false', $strSplitConstantStringWithFailureSplitLength);
 
 		$strSplitConstantStringWithInvalidSplitLengthType = str_split('abcdef', []);
-		assertType('non-empty-list<lowercase-string&non-empty-string>|false', $strSplitConstantStringWithInvalidSplitLengthType);
+		assertType('non-empty-list<lowercase-string&non-empty-string>', $strSplitConstantStringWithInvalidSplitLengthType);
 
 		$strSplitConstantStringWithVariableStringAndConstantSplitLength = str_split(doFoo() ? 'abcdef' : 'ghijkl', 1);
 		assertType("array{'a', 'b', 'c', 'd', 'e', 'f'}|array{'g', 'h', 'i', 'j', 'k', 'l'}", $strSplitConstantStringWithVariableStringAndConstantSplitLength);
 
 		$strSplitConstantStringWithVariableStringAndVariableSplitLength = str_split(doFoo() ? 'abcdef' : 'ghijkl', doFoo() ? 1 : 2);
-		assertType('non-empty-list<lowercase-string&non-empty-string>|false', $strSplitConstantStringWithVariableStringAndVariableSplitLength);
+		assertType('non-empty-list<lowercase-string&non-empty-string>', $strSplitConstantStringWithVariableStringAndVariableSplitLength);
 
 	}
 }

tests/PHPStan/Analyser/nsrt/bug-7580-php82.php

@@ -0,0 +1,20 @@
+<?php // lint >= 8.2
+
+declare(strict_types = 1);
+
+namespace Bug7580Types;
+
+use function PHPStan\Testing\assertType;
+
+assertType('array{}', mb_str_split('', 1));
+
+assertType('array{\'x\'}', mb_str_split('x', 1));
+
+$v = (string) (mt_rand() === 0 ? '' : 'x');
+assertType('\'\'|\'x\'', $v);
+assertType('array{}|array{\'x\'}', mb_str_split($v, 1));
+
+function x(): string { throw new \Exception(); };
+$v = x();
+assertType('string', $v);
+assertType('list<non-empty-string>', mb_str_split($v, 1));

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

@@ -1,4 +1,6 @@
-<?php declare(strict_types = 1);
+<?php // lint < 8.2
+
+declare(strict_types = 1);
 
 namespace Bug7580Types;