summaryrefslogtreecommitdiff
path: root/ext/pcre/tests
diff options
context:
space:
mode:
authorMáté Kocsis <kocsismate@woohoolabs.com>2020-02-25 20:58:33 +0100
committerMáté Kocsis <kocsismate@woohoolabs.com>2020-02-26 15:00:08 +0100
commit960318ed95d17bd30c2896e2f3189ebffb965dce (patch)
tree2890972c266dabe649a44b540869a49e41a3e450 /ext/pcre/tests
parentc7094d892639fedffb67c273f8fd44f3ffff86d6 (diff)
downloadphp-git-960318ed95d17bd30c2896e2f3189ebffb965dce.tar.gz
Change argument error message format
Closes GH-5211
Diffstat (limited to 'ext/pcre/tests')
-rw-r--r--ext/pcre/tests/preg_grep_error1.phpt4
-rw-r--r--ext/pcre/tests/preg_match_all_error1.phpt4
-rw-r--r--ext/pcre/tests/preg_match_all_error2.phpt2
-rw-r--r--ext/pcre/tests/preg_match_error1.phpt4
-rw-r--r--ext/pcre/tests/preg_match_error2.phpt4
-rw-r--r--ext/pcre/tests/preg_split_error1.phpt4
6 files changed, 11 insertions, 11 deletions
diff --git a/ext/pcre/tests/preg_grep_error1.phpt b/ext/pcre/tests/preg_grep_error1.phpt
index 5b191a72dc..b3450beff7 100644
--- a/ext/pcre/tests/preg_grep_error1.phpt
+++ b/ext/pcre/tests/preg_grep_error1.phpt
@@ -57,7 +57,7 @@ Warning: preg_grep(): Unknown modifier 'F' in %spreg_grep_error1.php on line %d
bool(false)
Arg value is Array
-preg_grep() expects argument #1 ($regex) to be of type string, array given
+preg_grep(): Argument #1 ($regex) must be of type string, array given
Arg value is /[a-zA-Z]/
array(2) {
@@ -66,5 +66,5 @@ array(2) {
[2]=>
string(4) "test"
}
-preg_grep() expects argument #1 ($regex) to be of type string, object given
+preg_grep(): Argument #1 ($regex) must be of type string, object given
Done
diff --git a/ext/pcre/tests/preg_match_all_error1.phpt b/ext/pcre/tests/preg_match_all_error1.phpt
index 3a65fca852..e052327cea 100644
--- a/ext/pcre/tests/preg_match_all_error1.phpt
+++ b/ext/pcre/tests/preg_match_all_error1.phpt
@@ -62,7 +62,7 @@ bool(false)
NULL
Arg value is Array
-preg_match_all() expects argument #1 ($pattern) to be of type string, array given
+preg_match_all(): Argument #1 ($pattern) must be of type string, array given
NULL
Arg value is /[a-zA-Z]/
@@ -80,5 +80,5 @@ array(1) {
string(1) "t"
}
}
-preg_match_all() expects argument #1 ($pattern) to be of type string, object given
+preg_match_all(): Argument #1 ($pattern) must be of type string, object given
NULL
diff --git a/ext/pcre/tests/preg_match_all_error2.phpt b/ext/pcre/tests/preg_match_all_error2.phpt
index 98e70385c0..a2254555bb 100644
--- a/ext/pcre/tests/preg_match_all_error2.phpt
+++ b/ext/pcre/tests/preg_match_all_error2.phpt
@@ -27,7 +27,7 @@ echo "Done";
*** Testing preg_match_all() : error conditions ***
Arg value is: Array
-preg_match_all() expects argument #2 ($subject) to be of type string, array given
+preg_match_all(): Argument #2 ($subject) must be of type string, array given
NULL
Arg value is: test
diff --git a/ext/pcre/tests/preg_match_error1.phpt b/ext/pcre/tests/preg_match_error1.phpt
index 3dbb7c2f03..b4540bf5da 100644
--- a/ext/pcre/tests/preg_match_error1.phpt
+++ b/ext/pcre/tests/preg_match_error1.phpt
@@ -56,8 +56,8 @@ Warning: preg_match(): Unknown modifier 'F' in %spreg_match_error1.php on line %
bool(false)
Arg value is Array
-preg_match() expects argument #1 ($pattern) to be of type string, array given
+preg_match(): Argument #1 ($pattern) must be of type string, array given
Arg value is /[a-zA-Z]/
int(1)
-preg_match() expects argument #1 ($pattern) to be of type string, object given
+preg_match(): Argument #1 ($pattern) must be of type string, object given
diff --git a/ext/pcre/tests/preg_match_error2.phpt b/ext/pcre/tests/preg_match_error2.phpt
index bc48facc0a..a03bcf4417 100644
--- a/ext/pcre/tests/preg_match_error2.phpt
+++ b/ext/pcre/tests/preg_match_error2.phpt
@@ -35,6 +35,6 @@ Arg value is: this is a string
int(1)
Arg value is: Array
-preg_match() expects argument #2 ($subject) to be of type string, array given
-preg_match() expects argument #2 ($subject) to be of type string, object given
+preg_match(): Argument #2 ($subject) must be of type string, array given
+preg_match(): Argument #2 ($subject) must be of type string, object given
Done
diff --git a/ext/pcre/tests/preg_split_error1.phpt b/ext/pcre/tests/preg_split_error1.phpt
index 0ec80d99f1..daf7852767 100644
--- a/ext/pcre/tests/preg_split_error1.phpt
+++ b/ext/pcre/tests/preg_split_error1.phpt
@@ -56,7 +56,7 @@ Warning: preg_split(): Unknown modifier 'F' in %spreg_split_error1.php on line %
bool(false)
Arg value is Array
-preg_split() expects argument #1 ($pattern) to be of type string, array given
+preg_split(): Argument #1 ($pattern) must be of type string, array given
Arg value is /[a-zA-Z]/
array(3) {
@@ -67,4 +67,4 @@ array(3) {
[2]=>
string(4) " 5 6"
}
-preg_split() expects argument #1 ($pattern) to be of type string, object given
+preg_split(): Argument #1 ($pattern) must be of type string, object given