From 82e98da6a36e8db66d2b45ceff2d797dd956492c Mon Sep 17 00:00:00 2001
From: Markus Staab <maggus.staab@googlemail.com>
Date: Tue, 1 Feb 2022 14:53:10 +0100
Subject: [PATCH] More precise signatures for mb_* functions

---
 resources/functionMap.php                            | 12 ++++++------
 resources/functionMap_php80delta.php                 |  2 ++
 .../PHPStan/Analyser/LegacyNodeScopeResolverTest.php | 10 +++++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/resources/functionMap.php b/resources/functionMap.php
index 287e44428f..a0e7df961f 100644
--- a/resources/functionMap.php
+++ b/resources/functionMap.php
@@ -6345,18 +6345,18 @@
 'mb_split' => ['array|false', 'pattern'=>'string', 'string'=>'string', 'limit='=>'int'],
 'mb_strcut' => ['string', 'str'=>'string', 'start'=>'int', 'length='=>'?int', 'encoding='=>'string'],
 'mb_strimwidth' => ['string', 'str'=>'string', 'start'=>'int', 'width'=>'int', 'trimmarker='=>'string', 'encoding='=>'string'],
-'mb_stripos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
+'mb_stripos' => ['0|positive-int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
 'mb_stristr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'],
-'mb_strlen' => ['int|false', 'str'=>'string', 'encoding='=>'string'],
-'mb_strpos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
+'mb_strlen' => ['0|positive-int|false', 'str'=>'string', 'encoding='=>'string'],
+'mb_strpos' => ['0|positive-int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
 'mb_strrchr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'],
 'mb_strrichr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'],
-'mb_strripos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
-'mb_strrpos' => ['int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
+'mb_strripos' => ['0|positive-int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
+'mb_strrpos' => ['0|positive-int|false', 'haystack'=>'string', 'needle'=>'string', 'offset='=>'int', 'encoding='=>'string'],
 'mb_strstr' => ['string|false', 'haystack'=>'string', 'needle'=>'string', 'part='=>'bool', 'encoding='=>'string'],
 'mb_strtolower' => ['string', 'str'=>'string', 'encoding='=>'string'],
 'mb_strtoupper' => ['string', 'str'=>'string', 'encoding='=>'string'],
-'mb_strwidth' => ['int', 'str'=>'string', 'encoding='=>'string'],
+'mb_strwidth' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
 'mb_substitute_character' => ['mixed', 'substchar='=>'mixed'],
 'mb_substr' => ['string', 'str'=>'string', 'start'=>'int', 'length='=>'?int', 'encoding='=>'string'],
 'mb_substr_count' => ['0|positive-int', 'haystack'=>'string', 'needle'=>'string', 'encoding='=>'string'],
diff --git a/resources/functionMap_php80delta.php b/resources/functionMap_php80delta.php
index d260510eca..e1ef73a8ca 100644
--- a/resources/functionMap_php80delta.php
+++ b/resources/functionMap_php80delta.php
@@ -75,6 +75,7 @@
 		'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_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'],
 		'parse_str' => ['void', 'encoded_string'=>'string', '&w_result'=>'array'],
@@ -206,6 +207,7 @@
 		'ldap_sort' => ['bool', 'link_identifier'=>'resource', 'result_identifier'=>'resource', 'sortfilter'=>'string'],
 		'mb_decode_numericentity' => ['string|false', 'string'=>'string', 'convmap'=>'array', 'encoding='=>'string', 'is_hex='=>'bool'],
 		'mktime' => ['int|false', 'hour='=>'int', 'minute='=>'int', 'second='=>'int', 'month='=>'int', 'day='=>'int', 'year='=>'int'],
+		'mb_strlen' => ['0|positive-int', 'str'=>'string', 'encoding='=>'string'],
 		'odbc_exec' => ['resource|false', 'connection_id'=>'resource', 'query'=>'string', 'flags='=>'int'],
 		'parse_str' => ['void', 'encoded_string'=>'string', '&w_result='=>'array'],
 		'password_hash' => ['string|false|null', 'password'=>'string', 'algo'=>'?string|?int', 'options='=>'array'],
diff --git a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
index 9fb4ac824e..92bdde96ae 100644
--- a/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
+++ b/tests/PHPStan/Analyser/LegacyNodeScopeResolverTest.php
@@ -5302,15 +5302,15 @@ public function dataFunctions(): array
 				'$versionCompare8',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'$mbStrlenWithoutEncoding',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'$mbStrlenWithValidEncoding',
 			],
 			[
-				'int',
+				'int<0, max>',
 				'$mbStrlenWithValidEncodingAlias',
 			],
 			[
@@ -5318,11 +5318,11 @@ public function dataFunctions(): array
 				'$mbStrlenWithInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'int|false' : 'int',
+				PHP_VERSION_ID < 80000 ? 'int<0, max>|false' : 'int<0, max>',
 				'$mbStrlenWithValidAndInvalidEncoding',
 			],
 			[
-				PHP_VERSION_ID < 80000 ? 'int|false' : 'int',
+				PHP_VERSION_ID < 80000 ? 'int<0, max>|false' : 'int<0, max>',
 				'$mbStrlenWithUnknownEncoding',
 			],
 			[