8 files changed, 13 insertions, 13 deletions
diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt
index 4875b1dc17..fcb41dd7c9 100644
--- a/ext/oci8/tests/bug51291_1.phpt
+++ b/ext/oci8/tests/bug51291_1.phpt
@@ -165,7 +165,7 @@ array(4) {
 
 Test 2 - Parse
 
-Warning: oci_error() expects argument #1 to be of type resource, bool%sgiven in %sbug51291_1.php on line %d
+Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d
 bool(false)
 array(4) {
   ["code"]=>
@@ -180,7 +180,7 @@ array(4) {
 NULL
 2nd call
 
-Warning: oci_error() expects argument #1 to be of type resource, bool%sgiven in %sbug51291_1.php on line %d
+Warning: oci_error(): Argument #1 must be of type resource, bool%sgiven in %sbug51291_1.php on line %d
 bool(false)
 array(4) {
   ["code"]=>
diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt
index 14bdfb73d6..72ed493d8a 100644
--- a/ext/oci8/tests/conn_attr_4.phpt
+++ b/ext/oci8/tests/conn_attr_4.phpt
@@ -79,17 +79,17 @@ echo "Done\n";
 
 Invalid Connection resource
 
-Warning: oci_set_action() expects argument #1 to be of type resource, null given in %s on line %d
+Warning: oci_set_action(): Argument #1 must be of type resource, null given in %s on line %d
 NULL
 
 Invalid Connection resource 2
 
-Warning: oci_set_client_info() expects argument #1 to be of type resource, %s given in %s on line %d
+Warning: oci_set_client_info(): Argument #1 must be of type resource, %s given in %s on line %d
 NULL
 
 Invalid Value
 
-Warning: oci_set_action() expects argument #2 to be of type %s, resource given in %s on line %d
+Warning: oci_set_action(): Argument #2 must be of type %s, resource given in %s on line %d
 NULL
 
 Set Values multiple times
diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index e69de8e0db..426ab91cba 100644
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -60,13 +60,13 @@ object(OCI-Lob)#%d (1) {
 }
 int(0)
 
-Warning: OCI-Lob::write() expects argument #2 to be of type int%s string given in %slob_002.php on line %d
+Warning: OCI-Lob::write(): Argument #2 must be of type int%s string given in %slob_002.php on line %d
 NULL
 int(4)
 int(40000)
 int(40004)
 
-Warning: OCI-Lob::seek() expects argument #1 to be of type int%s string given in %slob_002.php on line %d
+Warning: OCI-Lob::seek(): Argument #1 must be of type int%s string given in %slob_002.php on line %d
 NULL
 bool(false)
 int(40004)
diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt
index 0745c76c3c..3fbf4fab5a 100644
--- a/ext/oci8/tests/lob_021.phpt
+++ b/ext/oci8/tests/lob_021.phpt
@@ -61,7 +61,7 @@ bool(false)
 Warning: oci_free_descriptor(): %s is not a valid oci8 descriptor resource in %s on line %d
 bool(false)
 
-Warning: oci_free_descriptor() expects argument #1 to be of type OCI-Lob, object given in %s on line %d
+Warning: oci_free_descriptor(): Argument #1 must be of type OCI-Lob, object given in %s on line %d
 NULL
 
 Warning: oci_free_descriptor(): Unable to find descriptor property in %s on line %d
diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index 2a39db46d6..301a8f4b62 100644
--- a/ext/oci8/tests/lob_026.phpt
+++ b/ext/oci8/tests/lob_026.phpt
@@ -73,7 +73,7 @@ NULL
 bool(true)
 int(3)
 
-Warning: oci_lob_seek() expects argument #1 to be of type OCI-Lob, int%sgiven in %s on line %d
+Warning: oci_lob_seek(): Argument #1 must be of type OCI-Lob, int%sgiven in %s on line %d
 NULL
 bool(true)
 array(2) {
diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt
index e5857450f8..4a69258ea3 100644
--- a/ext/oci8/tests/null_byte_1.phpt
+++ b/ext/oci8/tests/null_byte_1.phpt
@@ -35,9 +35,9 @@ var_dump($r);
 --EXPECTF--
 Test 1: Import
 
-Warning: OCI-Lob::savefile() expects argument #1 ($function) to be a valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::savefile(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
 NULL
 Test 2: Export
 
-Warning: OCI-Lob::export() expects argument #1 ($function) to be a valid path, string given in %snull_byte_1.php on line %d
+Warning: OCI-Lob::export(): Argument #1 ($function) must be a valid path, string given in %snull_byte_1.php on line %d
 NULL
diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index ca785aa361..26955d4b17 100644
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -21,5 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c
 
 Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 
-Warning: oci_connect() expects argument #5 to be of type int%s string given in %s on line %d
+Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d
 Done
diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt
index aaa819ca92..8093620168 100644
--- a/ext/oci8/tests/privileged_connect1.phpt
+++ b/ext/oci8/tests/privileged_connect1.phpt
@@ -23,5 +23,5 @@ Warning: oci_connect(): ORA-%d: %s in %s on line %d
 
 Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 
-Warning: oci_connect() expects argument #5 to be of type int%s string given in %s on line %d
+Warning: oci_connect(): Argument #5 must be of type int%s string given in %s on line %d
 Done