diff --git a/resources/functionMap_php82delta.php b/resources/functionMap_php82delta.php
new file mode 100644
index 0000000000..72c613a4d8
--- /dev/null
+++ b/resources/functionMap_php82delta.php
@@ -0,0 +1,29 @@
+<?php // phpcs:ignoreFile
+
+/**
+ * Copied over from https://github.com/phan/phan/blob/8866d6b98be94b37996390da226e8c4befea29aa/src/Phan/Language/Internal/FunctionSignatureMap_php80_delta.php
+ * Copyright (c) 2015 Rasmus Lerdorf
+ * Copyright (c) 2015 Andrew Morrison
+ */
+
+/**
+ * This contains the information needed to convert the function signatures for php 8.0 to php 7.4 (and vice versa)
+ *
+ * This has two sections.
+ * The 'new' section contains function/method names from FunctionSignatureMap (And alternates, if applicable) that do not exist in php7.4 or have different signatures in php 8.0.
+ *   If they were just updated, the function/method will be present in the 'added' signatures.
+ * The 'old' signatures contains the signatures that are different in php 7.4.
+ *   Functions are expected to be removed only in major releases of php.
+ *
+ * @see FunctionSignatureMap.php
+ *
+ * @phan-file-suppress PhanPluginMixedKeyNoKey (read by Phan when analyzing this file)
+ */
+return [
+	'new' => [
+		'str_split' => ['array<int,string>', 'str'=>'string', 'split_length='=>'positive-int'],
+	],
+	'old' => [
+
+	]
+];
diff --git a/src/Php/PhpVersion.php b/src/Php/PhpVersion.php
index 89dc2dddc7..d9c63aa40d 100644
--- a/src/Php/PhpVersion.php
+++ b/src/Php/PhpVersion.php
@@ -196,4 +196,9 @@ public function deprecatesDynamicProperties(): bool
 		return $this->versionId >= 80200;
 	}
 
+	public function strSplitReturnsEmptyArray(): bool
+	{
+		return $this->versionId >= 80200;
+	}
+
 }
diff --git a/src/Reflection/SignatureMap/FunctionSignatureMapProvider.php b/src/Reflection/SignatureMap/FunctionSignatureMapProvider.php
index 6789bb7833..cc9a8a347f 100644
--- a/src/Reflection/SignatureMap/FunctionSignatureMapProvider.php
+++ b/src/Reflection/SignatureMap/FunctionSignatureMapProvider.php
@@ -204,6 +204,15 @@ public function getSignatureMap(): array
 				$signatureMap = $this->computeSignatureMap($signatureMap, $php81MapDelta);
 			}
 
+			if ($this->phpVersion->getVersionId() >= 80200) {
+				$php82MapDelta = require __DIR__ . '/../../../resources/functionMap_php82delta.php';
+				if (!is_array($php82MapDelta)) {
+					throw new ShouldNotHappenException('Signature map could not be loaded.');
+				}
+
+				$signatureMap = $this->computeSignatureMap($signatureMap, $php82MapDelta);
+			}
+
 			$this->signatureMap = $signatureMap;
 		}
 
diff --git a/src/Type/Php/StrSplitFunctionReturnTypeExtension.php b/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
index a3986fafb5..a61c897864 100644
--- a/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
+++ b/src/Type/Php/StrSplitFunctionReturnTypeExtension.php
@@ -90,7 +90,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 
 		$stringType = $scope->getType($functionCall->getArgs()[0]->value);
 
-		return TypeTraverser::map($stringType, static function (Type $type, callable $traverse) use ($encoding, $splitLength, $scope): Type {
+		return TypeTraverser::map($stringType, function (Type $type, callable $traverse) use ($encoding, $splitLength, $scope): Type {
 			if ($type instanceof UnionType || $type instanceof IntersectionType) {
 				return $traverse($type);
 			}
@@ -98,7 +98,7 @@ public function getTypeFromFunctionCall(FunctionReflection $functionReflection,
 			if (!$type instanceof ConstantStringType) {
 				$returnType = new ArrayType(new IntegerType(), new StringType());
 
-				return $encoding === null
+				return $encoding === null && !$this->phpVersion->strSplitReturnsEmptyArray()
 					? TypeCombinator::intersect($returnType, new NonEmptyArrayType())
 					: $returnType;
 			}
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
index 8ce2b2fa38..6d45933547 100644
--- a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
+++ b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -5138,6 +5138,14 @@ public function testArrayFunctions(
 
 	public function dataFunctions(): array
 	{
+		$strSplitDefaultReturnType = 'non-empty-array<int, string>|false';
+		if (PHP_VERSION_ID >= 80000) {
+			$strSplitDefaultReturnType = 'non-empty-array<int, string>';
+		}
+		if (PHP_VERSION_ID >= 80200) {
+			$strSplitDefaultReturnType = 'array<int, string>';
+		}
+
 		return [
 			[
 				'string',
@@ -5328,7 +5336,7 @@ public function dataFunctions(): array
 				'$gettimeofdayBenevolent',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				$strSplitDefaultReturnType,
 				'$strSplitConstantStringWithoutDefinedParameters',
 			],
 			[
@@ -5336,7 +5344,7 @@ public function dataFunctions(): array
 				'$strSplitConstantStringWithoutDefinedSplitLength',
 			],
 			[
-				'non-empty-array<int, string>',
+				PHP_VERSION_ID < 80200 ? 'non-empty-array<int, string>' : 'array<int, string>',
 				'$strSplitStringWithoutDefinedSplitLength',
 			],
 			[
@@ -5352,7 +5360,7 @@ public function dataFunctions(): array
 				'$strSplitConstantStringWithFailureSplitLength',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				$strSplitDefaultReturnType,
 				'$strSplitConstantStringWithInvalidSplitLengthType',
 			],
 			[
@@ -5360,7 +5368,7 @@ public function dataFunctions(): array
 				'$strSplitConstantStringWithVariableStringAndConstantSplitLength',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'non-empty-array<int, string>|false' : 'non-empty-array<int, string>',
+				$strSplitDefaultReturnType,
 				'$strSplitConstantStringWithVariableStringAndVariableSplitLength',
 			],
 			// parse_url