Make tests portable across PHP 7.x versions

diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt
index e9e409433d8bb16556ff98d049bd0d83403057d7..4fa2e2399595b31b88e382cc42ca6f06fa401ada 100644 (file)
--- a/ext/oci8/tests/bug51291_1.phpt
+++ b/ext/oci8/tests/bug51291_1.phpt
@@ -167,7 +167,7 @@ array(4) {
 
 Test 2 - Parse
 
-Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d
+Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d
 bool(false)
 array(4) {
   ["code"]=>
@@ -182,7 +182,7 @@ array(4) {
 NULL
 2nd call
 
-Warning: oci_error() expects parameter 1 to be resource, boolean given in %sbug51291_1.php on line %d
+Warning: oci_error() expects parameter 1 to be resource, bool%sgiven in %sbug51291_1.php on line %d
 bool(false)
 array(4) {
   ["code"]=>

diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index f2c585b817a5c899b2c04f4bd1586573ac37e7ce..188f83ddd382b8d86541d76b5da4456df5b545ae 100644 (file)
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -62,13 +62,13 @@ object(OCI-Lob)#%d (1) {
 }
 int(0)
 
-Warning: OCI-Lob::write() expects parameter 2 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::write() expects parameter 2 to be int%s string given in %slob_002.php on line %d
 NULL
 int(4)
 int(40000)
 int(40004)
 
-Warning: OCI-Lob::seek() expects parameter 1 to be integer, string given in %slob_002.php on line %d
+Warning: OCI-Lob::seek() expects parameter 1 to be int%s string given in %slob_002.php on line %d
 NULL
 bool(false)
 int(40004)

diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt
index 5799bc5277a6e19ef1e924094800cec21b26b061..42f0d8f7750c3c204bee29a67f900f5e42c61ef4 100644 (file)
--- 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 parameter 1 to be OCI-Lob, integer given in %s on line %d
+Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, int%sgiven in %s on line %d
 NULL
 bool(true)
 array(2) {

diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index 3e06283421db7a185bc2835e05c59baae579f8da..cb19d73907645fb2c736c1d65af4fdfb2910bcbc 100644 (file)
--- 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 parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be 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 d33711a91a08be9844bcd8dc5f7ad8833121463f..a4b8b76ba7da5882112b227143a607b08639641e 100644 (file)
--- 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 parameter 5 to be integer, string given in %s on line %d
+Warning: oci_connect() expects parameter 5 to be int%s string given in %s on line %d
 Done