fix multi-byte handling

phpstan · May 8, 2024 · 31edc40 · 31edc40
1 parent 52511e2
commit 31edc40
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/src/Type/Php/SubstrDynamicReturnTypeExtension.php b/src/Type/Php/SubstrDynamicReturnTypeExtension.php
@@ -19,6 +19,7 @@
 use function count;
 use function in_array;
 use function is_bool;
+use function mb_substr;
 use function substr;
 
 class SubstrDynamicReturnTypeExtension implements DynamicFunctionReturnTypeExtension
@@ -63,16 +64,17 @@ public function getTypeFromFunctionCall(
 				$results = [];
 				foreach ($constantStrings as $constantString) {
 					if ($length !== null) {
-						$substr = substr(
-							$constantString->getValue(),
-							$offset->getValue(),
-							$length->getValue(),
-						);
+						if ($functionReflection->getName() === 'mb_substr') {
+							$substr = mb_substr($constantString->getValue(), $offset->getValue(), $length->getValue());
+						} else {
+							$substr = substr($constantString->getValue(), $offset->getValue(), $length->getValue());
+						}
 					} else {
-						$substr = substr(
-							$constantString->getValue(),
-							$offset->getValue(),
-						);
+						if ($functionReflection->getName() === 'mb_substr') {
+							$substr = mb_substr($constantString->getValue(), $offset->getValue());
+						} else {
+							$substr = substr($constantString->getValue(), $offset->getValue());
+						}
 					}
 
 					if (is_bool($substr)) {

diff --git a/tests/PHPStan/Analyser/data/non-empty-string-substr.php b/tests/PHPStan/Analyser/data/non-empty-string-substr.php
@@ -53,6 +53,10 @@ public function doMbSubstr(string $s, $nonEmpty, $positiveInt, $postiveRange, $n
 
 		assertType('string', mb_substr($s, 0, $positiveInt));
 		assertType('non-empty-string', mb_substr($nonEmpty, 0, $positiveInt));
+
+		assertType('non-falsy-string', mb_substr("déjà_vu", 0, $positiveInt));
+		assertType("'déjà_vu'", mb_substr("déjà_vu", 0));
+		assertType("'déj'", mb_substr("déjà_vu", 0, 3));
 	}
 
 }