1 files changed, 50 insertions, 28 deletions
diff --git a/ext/standard/tests/strings/bug40754.phpt b/ext/standard/tests/strings/bug40754.phpt
index 26ea5bc770..b71f28044a 100644
--- a/ext/standard/tests/strings/bug40754.phpt
+++ b/ext/standard/tests/strings/bug40754.phpt
@@ -11,16 +11,52 @@ var_dump(substr_replace("abcde", "x", $v, $v));
 var_dump(strspn("abcde", "abc", $v, $v));
 var_dump(strcspn("abcde", "abc", $v, $v));
 
-var_dump(substr_count("abcde", "abc", $v, $v));
+try {
+    var_dump(substr_count("abcde", "abc", $v, $v));
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 var_dump(substr_compare("abcde", "abc", $v, $v));
 
-var_dump(stripos("abcde", "abc", $v));
-var_dump(substr_count("abcde", "abc", $v, 1));
+try {
+    stripos("abcde", "abc", $v);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    substr_count("abcde", "abc", $v, 1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 var_dump(substr_count("abcde", "abc", 1, $v));
-var_dump(strpos("abcde", "abc", $v));
-var_dump(stripos("abcde", "abc", $v));
-var_dump(strrpos("abcde", "abc", $v));
-var_dump(strripos("abcde", "abc", $v));
+
+try {
+    strpos("abcde", "abc", $v);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    stripos("abcde", "abc", $v);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    strrpos("abcde", "abc", $v);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    strripos("abcde", "abc", $v);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
 var_dump(strncmp("abcde", "abc", $v));
 var_dump(chunk_split("abcde", $v, "abc"));
 var_dump(substr("abcde", $v, $v));
@@ -31,33 +67,19 @@ string(4) "bcde"
 string(6) "abcdex"
 bool(false)
 bool(false)
-
-Warning: substr_count(): Offset not contained in string in %s on line %d
-bool(false)
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 
 Warning: substr_compare(): The start position cannot exceed initial string length in %s on line %d
 bool(false)
-
-Warning: stripos(): Offset not contained in string in %s on line %d
-bool(false)
-
-Warning: substr_count(): Offset not contained in string in %s on line %d
-bool(false)
+stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+substr_count(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
 
 Warning: substr_count(): Invalid length value in %s on line %d
 bool(false)
-
-Warning: strpos(): Offset not contained in string in %s on line %d
-bool(false)
-
-Warning: stripos(): Offset not contained in string in %s on line %d
-bool(false)
-
-Warning: strrpos(): Offset is greater than the length of haystack string in %s on line %d
-bool(false)
-
-Warning: strripos(): Offset is greater than the length of haystack string in %s on line %d
-bool(false)
+strpos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+stripos(): Argument #3 ($offset) must be contained in argument #1 ($haystack)
+strrpos(): 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)