diff --git a/build/baseline-8.0.neon b/build/baseline-8.0.neon
index 33bae32309..79d183a1e4 100644
--- a/build/baseline-8.0.neon
+++ b/build/baseline-8.0.neon
@@ -16,7 +16,7 @@ parameters:
 			path: ../src/Type/Php/MbStrlenFunctionReturnTypeExtension.php
 
 		-
-			message: "#^Strict comparison using \\=\\=\\= between non-empty-array<int, string> and false will always evaluate to false\\.$#"
+			message: "#^Strict comparison using \\=\\=\\= between array<int, string> and false will always evaluate to false\\.$#"
 			count: 1
 			path: ../src/Type/Php/StrSplitFunctionReturnTypeExtension.php
 
diff --git a/resources/functionMap_php74delta.php b/resources/functionMap_php74delta.php
index ff3f99ba0d..f86a9c1db2 100644
--- a/resources/functionMap_php74delta.php
+++ b/resources/functionMap_php74delta.php
@@ -39,7 +39,7 @@
 		'FFI::typeof' => ['FFI\CType', '&ptr'=>'FFI\CData'],
 		'FFI::type' => ['FFI\CType', 'type'=>'string'],
 		'get_mangled_object_vars' => ['array', 'obj'=>'object'],
-		'mb_str_split' => ['non-empty-array<int,string>|false', 'str'=>'string', 'split_length='=>'int', 'encoding='=>'string'],
+		'mb_str_split' => ['array<int,string>|false', 'str'=>'string', 'split_length='=>'int', 'encoding='=>'string'],
 		'password_algos' => ['array<int, string>'],
 		'password_hash' => ['string|false', 'password'=>'string', 'algo'=>'string|null', 'options='=>'array'],
 		'password_needs_rehash' => ['bool', 'hash'=>'string', 'algo'=>'string|null', 'options='=>'array'],
diff --git a/resources/functionMap_php80delta.php b/resources/functionMap_php80delta.php
index fb557075d8..9a7059ec6f 100644
--- a/resources/functionMap_php80delta.php
+++ b/resources/functionMap_php80delta.php
@@ -74,7 +74,7 @@
 		'imagescale' => ['false|object', 'im'=>'resource', 'new_width'=>'int', 'new_height='=>'int', 'method='=>'int'],
 		'ldap_set_rebind_proc' => ['bool', 'ldap'=>'resource', 'callback'=>'?callable'],
 		'mb_decode_numericentity' => ['string|false', 'string'=>'string', 'convmap'=>'array', 'encoding='=>'string'],
-		'mb_str_split' => ['non-empty-array<int,string>', 'str'=>'string', 'split_length='=>'positive-int', 'encoding='=>'string'],
+		'mb_str_split' => ['array<int,string>', 'str'=>'string', 'split_length='=>'positive-int', 'encoding='=>'string'],
 		'mb_strlen' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
 		'mktime' => ['int|false', 'hour'=>'int', 'minute='=>'int', 'second='=>'int', 'month='=>'int', 'day='=>'int', 'year='=>'int'],
 		'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string'],
diff --git a/src/Type/Php/StrSplitFunctionReturnTypeExtension.php b/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
index 31a6fdfe2b..b756c22a4b 100644
--- a/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
+++ b/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
@@ -96,17 +96,18 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			}
 
 			if (!$type instanceof ConstantStringType) {
-				return TypeCombinator::intersect(
-					new ArrayType(new IntegerType(), new StringType()),
-					new NonEmptyArrayType(),
-				);
+				$returnType = new ArrayType(new IntegerType(), new StringType());
+
+				return $encoding === null
+					? TypeCombinator::intersect($returnType, new NonEmptyArrayType())
+					: $returnType;
 			}
 
 			$stringValue = $type->getValue();
 
-			$items = $encoding !== null
-				? mb_str_split($stringValue, $splitLength, $encoding)
-				: str_split($stringValue, $splitLength);
+			$items = $encoding === null
+				? str_split($stringValue, $splitLength)
+				: mb_str_split($stringValue, $splitLength, $encoding);
 			if ($items === false) {
 				throw new ShouldNotHappenException();
 			}
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
index 55bb51b381..8ce2b2fa38 100644
--- a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
+++ b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -8716,7 +8716,7 @@ public function dataPhp74Functions(): array
 	{
 		return [
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithoutDefinedParameters',
 			],
 			[
@@ -8724,7 +8724,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithoutDefinedSplitLength',
 			],
 			[
-				'non-empty-array<int, string>',
+				'array<int, string>',
 				'$mbStrSplitStringWithoutDefinedSplitLength',
 			],
 			[
@@ -8740,7 +8740,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithFailureSplitLength',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithInvalidSplitLengthType',
 			],
 			[
@@ -8748,7 +8748,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithVariableStringAndConstantSplitLength',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithVariableStringAndVariableSplitLength',
 			],
 			[
@@ -8760,7 +8760,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithOneSplitLengthAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithOneSplitLengthAndVariableEncoding',
 			],
 			[
@@ -8772,7 +8772,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithGreaterSplitLengthThanStringLengthAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithGreaterSplitLengthThanStringLengthAndVariableEncoding',
 			],
 			[
@@ -8788,7 +8788,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithFailureSplitLengthAndVariableEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithInvalidSplitLengthTypeAndValidEncoding',
 			],
 			[
@@ -8796,7 +8796,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithInvalidSplitLengthTypeAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithInvalidSplitLengthTypeAndVariableEncoding',
 			],
 			[
@@ -8808,11 +8808,11 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithVariableStringAndConstantSplitLengthAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithVariableStringAndConstantSplitLengthAndVariableEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithVariableStringAndVariableSplitLengthAndValidEncoding',
 			],
 			[
@@ -8820,7 +8820,7 @@ public function dataPhp74Functions(): array
 				'$mbStrSplitConstantStringWithVariableStringAndVariableSplitLengthAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80000 ? 'array<int, string>|false' : 'array<int, string>',
 				'$mbStrSplitConstantStringWithVariableStringAndVariableSplitLengthAndVariableEncoding',
 			],
 		];
diff --git a/tests/PHPStan/Analyser/data/bug-7580.php b/tests/PHPStan/Analyser/data/bug-7580.php
index a832f24f6e..e516bffe7d 100644
--- a/tests/PHPStan/Analyser/data/bug-7580.php
+++ b/tests/PHPStan/Analyser/data/bug-7580.php
@@ -15,4 +15,4 @@
 function x(): string { throw new \Exception(); };
 $v = x();
 assertType('string', $v);
-assertType('non-empty-array<int, string>', mb_str_split($v, 1));
+assertType('array<int, string>', mb_str_split($v, 1));
diff --git a/tests/PHPStan/Rules/Comparison/TernaryOperatorConstantConditionRuleTest.php b/tests/PHPStan/Rules/Comparison/TernaryOperatorConstantConditionRuleTest.php
index a53e0ebd59..d54153136c 100644
--- a/tests/PHPStan/Rules/Comparison/TernaryOperatorConstantConditionRuleTest.php
+++ b/tests/PHPStan/Rules/Comparison/TernaryOperatorConstantConditionRuleTest.php
@@ -104,10 +104,6 @@ public function testBug7580(): void
 				'Ternary operator condition is always true.',
 				9,
 			],
-			[
-				'Ternary operator condition is always true.',
-				20,
-			],
 		]);
 	}