Normalize strpos() behavior

Author: nikic

ext/iconv/tests/iconv_substr.phpt

@@ -45,7 +45,7 @@ var_dump(iconv("ISO-2022-JP", "EUC-JP", iconv_substr(iconv("EUC-JP", "ISO-2022-J
 666768696a6b6c
 a6a4a8a4aaa4ab
 a4aba4ada4afa4b1a4b3a4b5a4b7
-bool(false)
+string(0) ""
 bool(false)
 string(14) "This is a test"
 string(14) "This is a test"
@@ -55,8 +55,8 @@ string(3) "est"
 string(3) "est"
 string(5) "This "
 string(5) "This "
+string(0) ""
 bool(false)
-bool(false)
-bool(false)
+string(0) ""
 bool(false)
 string(10) "ちは ISO-2"

ext/intl/tests/bug62759.phpt

@@ -14,7 +14,7 @@ var_dump(intl_get_error_message());
 var_dump(grapheme_substr('déjà', -1, 0));
 ?>
 --EXPECT--
-bool(false)
+string(0) ""
 string(0) ""
 bool(false)
 string(61) "grapheme_substr: invalid parameters: U_ILLEGAL_ARGUMENT_ERROR"

ext/standard/basic_functions.stub.php

@@ -607,7 +607,7 @@ function str_ends_with(string $haystack, string $needle): bool {}
 
 function chunk_split(string $str, int $chunklen = 76, string $ending = "\r\n"): string {}
 
-function substr(string $str, int $start, ?int $length = null): string|false {}
+function substr(string $str, int $start, ?int $length = null): string {}
 
 function substr_replace(array|string $str, array|string $replace, array|int $start, array|int|null $length = null): string|array {}
 

ext/standard/basic_functions_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: 56fb3ef4c53a1ed7abf6a115567bca47e1a14cda */
+ * Stub hash: 2c44d43410b90a94af4057ca99274f9262744298 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_set_time_limit, 0, 1, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO(0, seconds, IS_LONG, 0)
@@ -924,7 +924,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_chunk_split, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, ending, IS_STRING, 0, "\"\\r\\n\"")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_substr, 0, 2, MAY_BE_STRING|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_substr, 0, 2, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, str, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO(0, start, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, length, IS_LONG, 1, "null")

ext/standard/string.c

@@ -2170,9 +2170,7 @@ PHP_FUNCTION(substr)
 		Z_PARAM_LONG_OR_NULL(l, len_is_null)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (f > (zend_long)ZSTR_LEN(str)) {
-		RETURN_FALSE;
-	} else if (f < 0) {
+	if (f < 0) {
 		/* if "from" position is negative, count start position from the end
 		 * of the string
 		 */
@@ -2181,41 +2179,24 @@ PHP_FUNCTION(substr)
 		} else {
 			f = (zend_long)ZSTR_LEN(str) + f;
 		}
-		if (!len_is_null) {
-			if (l < 0) {
-				/* if "length" position is negative, set it to the length
-				 * needed to stop that many chars from the end of the string
-				 */
-				if ((size_t)(-l) > ZSTR_LEN(str) - (size_t)f) {
-					if ((size_t)(-l) > ZSTR_LEN(str)) {
-						RETURN_FALSE;
-					} else {
-						l = 0;
-					}
-				} else {
-					l = (zend_long)ZSTR_LEN(str) - f + l;
-				}
-			} else if ((size_t)l > ZSTR_LEN(str) - (size_t)f) {
-				goto truncate_len;
-			}
-		} else {
-			goto truncate_len;
-		}
-	} else if (!len_is_null) {
+	} else if ((size_t)f > ZSTR_LEN(str)) {
+		RETURN_EMPTY_STRING();
+	}
+
+	if (!len_is_null) {
 		if (l < 0) {
 			/* if "length" position is negative, set it to the length
 			 * needed to stop that many chars from the end of the string
 			 */
 			if ((size_t)(-l) > ZSTR_LEN(str) - (size_t)f) {
-				RETURN_FALSE;
+				l = 0;
 			} else {
 				l = (zend_long)ZSTR_LEN(str) - f + l;
 			}
 		} else if ((size_t)l > ZSTR_LEN(str) - (size_t)f) {
-			goto truncate_len;
+			l = (zend_long)ZSTR_LEN(str) - f;
 		}
 	} else {
-truncate_len:
 		l = (zend_long)ZSTR_LEN(str) - f;
 	}
 

ext/standard/tests/strings/bug40754.phpt

@@ -102,4 +102,4 @@ strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 strripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 int(2)
 string(8) "abcdeabc"
-bool(false)
+string(0) ""