add Unicode EXPECT tags

diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt
index 4c76df42f92d5289cbc01e6d26f78e26391b9cc9..f0c3f2118e514d1bf9e73ecc188a953165b2f9c2 100644 (file)
--- a/ext/oci8/tests/array_bind_002.phpt
+++ b/ext/oci8/tests/array_bind_002.phpt
@@ -75,3 +75,20 @@ array(5) {
   string(9) "05-NOV-05"
 }
 Done
+--UEXPECTF--
+Warning: oci_bind_array_by_name(): Maximum array length must be greater than zero in %s on line %d
+
+Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d
+array(5) {
+  [0]=>
+  unicode(9) "06-DEC-05"
+  [1]=>
+  unicode(9) "10-DEC-80"
+  [2]=>
+  unicode(9) "21-AUG-91"
+  [3]=>
+  unicode(9) "26-OCT-17"
+  [4]=>
+  unicode(9) "05-NOV-05"
+}
+Done

diff --git a/ext/oci8/tests/bind_long.phpt b/ext/oci8/tests/bind_long.phpt
index ddbc11eb698e681c1aa3e62992b81cb192deee8f..c9e9c58d687f461c0e7db9cbefe26ccf50d19f1f 100644 (file)
--- a/ext/oci8/tests/bind_long.phpt
+++ b/ext/oci8/tests/bind_long.phpt
@@ -36,3 +36,7 @@ echo "Done\n";
 string(32) "da852396d08c9ef9fbdf914db1d6d5bb"
 int(276)
 Done
+--UEXPECTF--
+unicode(32) "da852396d08c9ef9fbdf914db1d6d5bb"
+int(276)
+Done

diff --git a/ext/oci8/tests/bind_long_raw.phpt b/ext/oci8/tests/bind_long_raw.phpt
index 2a9962eace9c1ac2f337525961817fb58e474cae..e4a8d6e297eb5394a8f1a450a6241384e5ce06b0 100644 (file)
--- a/ext/oci8/tests/bind_long_raw.phpt
+++ b/ext/oci8/tests/bind_long_raw.phpt
@@ -36,3 +36,7 @@ echo "Done\n";
 string(32) "614fcbba1effb7caa27ef0ef25c27fcf"
 int(2523)
 Done
+--UEXPECTF--
+unicode(32) "614fcbba1effb7caa27ef0ef25c27fcf"
+int(2523)
+Done

diff --git a/ext/oci8/tests/bind_raw.phpt b/ext/oci8/tests/bind_raw.phpt
index c9087e552b62efbbdf5ddea7dd9fc21791274761..7391a22528bde7353ffcc111a95eace78167bed2 100644 (file)
--- a/ext/oci8/tests/bind_raw.phpt
+++ b/ext/oci8/tests/bind_raw.phpt
@@ -37,3 +37,7 @@ echo "Done\n";
 string(32) "88b274d7a257ac6f70435b83abd4e26e"
 int(300)
 Done
+--UEXPECTF--
+unicode(32) "88b274d7a257ac6f70435b83abd4e26e"
+int(300)
+Done

diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt
index 57d3cf1b4793daf3feda28cd5395cc7b19a5bd36..88d1217ea04518ac5009a57cd965a4862edb06cd 100644 (file)
--- a/ext/oci8/tests/coll_001.phpt
+++ b/ext/oci8/tests/coll_001.phpt
@@ -25,3 +25,12 @@ object(OCI-Collection)#%d (1) {
 Warning: oci_new_collection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+
+Warning: oci_new_collection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt
index 6d3051989790c9f5bcbd50c44680c986db88e15e..8378cf1efa76d8cdf4dd9156081be6f688665c2c 100644 (file)
--- a/ext/oci8/tests/coll_002.phpt
+++ b/ext/oci8/tests/coll_002.phpt
@@ -28,3 +28,13 @@ bool(true)
 Warning: OCI-Collection::size(): %d is not a valid oci8 collection resource in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+bool(true)
+
+Warning: OCI-Collection::size(): %d is not a valid oci8 collection resource in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt
index 58e641ee24326efedfb07b84bf23568250761bee..952b9d7230809221c287d584ad27f2b293b38862 100644 (file)
--- a/ext/oci8/tests/coll_002_func.phpt
+++ b/ext/oci8/tests/coll_002_func.phpt
@@ -28,3 +28,13 @@ bool(true)
 Warning: oci_collection_size(): %d is not a valid oci8 collection resource in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+bool(true)
+
+Warning: oci_collection_size(): %d is not a valid oci8 collection resource in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/coll_005.phpt b/ext/oci8/tests/coll_005.phpt
index 0f40069964f2e3fd9a3de45c23a6449dc7c4ffcd..86a3bc4a3ca15ff1e5a82856f52dddbe37c8e402 100644 (file)
--- a/ext/oci8/tests/coll_005.phpt
+++ b/ext/oci8/tests/coll_005.phpt
@@ -25,3 +25,12 @@ object(OCI-Collection)#%d (1) {
 Warning: ocinewcollection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+
+Warning: ocinewcollection(): OCI-22303: type ""."NONEXISTENT" not found in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/coll_006.phpt b/ext/oci8/tests/coll_006.phpt
index cf258cbe34430061eb02d69b7f8abf64ca9959fb..2288ed3f706486323722481aec6de9a4982c2e4c 100644 (file)
--- a/ext/oci8/tests/coll_006.phpt
+++ b/ext/oci8/tests/coll_006.phpt
@@ -28,3 +28,13 @@ bool(true)
 Warning: OCI-Collection::size(): %d is not a valid oci8 collection resource in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+bool(true)
+
+Warning: OCI-Collection::size(): %d is not a valid oci8 collection resource in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/coll_006_func.phpt b/ext/oci8/tests/coll_006_func.phpt
index 56707d6087a407342b3ba608fec094383cb6deeb..26f6a150c9403ce8d0c9fb24cc001c0101bfc3eb 100644 (file)
--- a/ext/oci8/tests/coll_006_func.phpt
+++ b/ext/oci8/tests/coll_006_func.phpt
@@ -28,3 +28,13 @@ bool(true)
 Warning: oci_collection_size(): %d is not a valid oci8 collection resource in %s on line %d
 bool(false)
 Done
+--UEXPECTF--
+object(OCI-Collection)#%d (1) {
+  [u"collection"]=>
+  resource(%d) of type (oci8 collection)
+}
+bool(true)
+
+Warning: oci_collection_size(): %d is not a valid oci8 collection resource in %s on line %d
+bool(false)
+Done

diff --git a/ext/oci8/tests/commit.phpt b/ext/oci8/tests/commit.phpt
index 3bef318c8544eb9a6dda3b6b8dc0b4a3bdc93454..9e409f34c6d30c3ed927d62c98ea2cb025b3bd45 100644 (file)
--- a/ext/oci8/tests/commit.phpt
+++ b/ext/oci8/tests/commit.phpt
@@ -146,3 +146,83 @@ array(5) {
   }
 }
 Done
+--UEXPECTF--
+bool(true)
+int(0)
+array(5) {
+  [u"ID"]=>
+  array(0) {
+  }
+  [u"VALUE"]=>
+  array(0) {
+  }
+  [u"BLOB"]=>
+  array(0) {
+  }
+  [u"CLOB"]=>
+  array(0) {
+  }
+  [u"STRING"]=>
+  array(0) {
+  }
+}
+bool(true)
+int(4)
+array(5) {
+  [u"ID"]=>
+  array(4) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+    [3]=>
+    string(1) "1"
+  }
+  [u"VALUE"]=>
+  array(4) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+    [3]=>
+    string(1) "1"
+  }
+  [u"BLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [u"CLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [u"STRING"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+}
+Done

diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt
index 196e0650cc125885e172713ac7b2c5f130ae4ee7..a8a1c40e1397f2027eef89f105fe37348632f163 100644 (file)
--- a/ext/oci8/tests/commit_old.phpt
+++ b/ext/oci8/tests/commit_old.phpt
@@ -144,3 +144,83 @@ array(5) {
   }
 }
 Done
+--UEXPECTF--
+bool(true)
+int(0)
+array(5) {
+  [u"ID"]=>
+  array(0) {
+  }
+  [u"VALUE"]=>
+  array(0) {
+  }
+  [u"BLOB"]=>
+  array(0) {
+  }
+  [u"CLOB"]=>
+  array(0) {
+  }
+  [u"STRING"]=>
+  array(0) {
+  }
+}
+bool(true)
+int(4)
+array(5) {
+  [u"ID"]=>
+  array(4) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+    [3]=>
+    string(1) "1"
+  }
+  [u"VALUE"]=>
+  array(4) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+    [3]=>
+    string(1) "1"
+  }
+  [u"BLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [u"CLOB"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+  [u"STRING"]=>
+  array(4) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+    [3]=>
+    NULL
+  }
+}
+Done

diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt
index 22c89c9c5498c6e1ae336db90baa51995d3304cd..865c15ecc0c41b9d237a547842c17a8af0462c44 100644 (file)
--- a/ext/oci8/tests/cursors.phpt
+++ b/ext/oci8/tests/cursors.phpt
@@ -63,3 +63,22 @@ Warning: oci_fetch_assoc(): ORA-01002: fetch out of sequence in %s on line %d
 bool(false)
 bool(true)
 Done
+--UEXPECTF--
+array(5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+bool(true)
+
+Warning: oci_fetch_assoc(): ORA-01002: fetch out of sequence in %s on line %d
+bool(false)
+bool(true)
+Done

diff --git a/ext/oci8/tests/cursors_old.phpt b/ext/oci8/tests/cursors_old.phpt
index cf3b5f957570f48959c5f3750a103393daf00f3e..13b39f1fb4068fced1f0d797718f9734d52f6289 100644 (file)
--- a/ext/oci8/tests/cursors_old.phpt
+++ b/ext/oci8/tests/cursors_old.phpt
@@ -62,3 +62,21 @@ array(2) {
 }
 bool(true)
 Done
+--UEXPECTF--
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+bool(true)
+
+Warning: ocifetchinto(): ORA-01002: fetch out of sequence in %s on line %d
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+bool(true)
+Done

diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt
index 8be4f3a06d32e8fb4bf59803b9568ff3acef30ee..1675fd1cab3a99aeec314a08b297d74ddb751ea5 100644 (file)
--- a/ext/oci8/tests/descriptors.phpt
+++ b/ext/oci8/tests/descriptors.phpt
@@ -47,3 +47,12 @@ array(1) {
   }
 }
 Done
+--UEXPECTF--
+array(1) {
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+Done

diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt
index 743820f901666b2568c4bb4570373efb05532b80..c38432c90aed4d3d556b354452290d8c621ccb66 100644 (file)
--- a/ext/oci8/tests/error.phpt
+++ b/ext/oci8/tests/error.phpt
@@ -38,3 +38,20 @@ array(4) {
   string(12) "WRONG SYNTAX"
 }
 Done
+--UEXPECTF--
+resource(%d) of type (oci8 connection)
+resource(%d) of type (oci8 statement)
+
+Warning: oci_execute(): ORA-00900: invalid SQL statement in %s on line %d
+bool(false)
+array(4) {
+  [u"code"]=>
+  int(900)
+  [u"message"]=>
+  string(32) "ORA-00900: invalid SQL statement"
+  [u"offset"]=>
+  int(0)
+  [u"sqltext"]=>
+  string(12) "WRONG SYNTAX"
+}
+Done

diff --git a/ext/oci8/tests/error1.phpt b/ext/oci8/tests/error1.phpt
index 25a3f09e92d363f78697e2f1d342556d40a40b66..db7670769eaac4630092359b788cfacf9204b270 100644 (file)
--- a/ext/oci8/tests/error1.phpt
+++ b/ext/oci8/tests/error1.phpt
@@ -25,3 +25,17 @@ array(4) {
   string(0) ""
 }
 Done
+--UEXPECTF--
+Warning: oci_connect(): ORA-12154: TNS:could not resolve service name in %s on line %d
+bool(false)
+array(4) {
+  [u"code"]=>
+  int(12154)
+  [u"message"]=>
+  string(45) "ORA-12154: TNS:could not resolve service name"
+  [u"offset"]=>
+  int(0)
+  [u"sqltext"]=>
+  string(0) ""
+}
+Done

diff --git a/ext/oci8/tests/error_old.phpt b/ext/oci8/tests/error_old.phpt
index a6889c897a7ad4bd90a76b443faf3064a982aff4..2b2c279214a46f2e992dbf201ca6a63e3f29bb73 100644 (file)
--- a/ext/oci8/tests/error_old.phpt
+++ b/ext/oci8/tests/error_old.phpt
@@ -38,3 +38,20 @@ array(4) {
   string(12) "WRONG SYNTAX"
 }
 Done
+--UEXPECTF--
+resource(%d) of type (oci8 connection)
+resource(%d) of type (oci8 statement)
+
+Warning: ociexecute(): ORA-00900: invalid SQL statement in %s on line %d
+bool(false)
+array(4) {
+  [u"code"]=>
+  int(900)
+  [u"message"]=>
+  string(32) "ORA-00900: invalid SQL statement"
+  [u"offset"]=>
+  int(0)
+  [u"sqltext"]=>
+  string(12) "WRONG SYNTAX"
+}
+Done

diff --git a/ext/oci8/tests/fetch_all.phpt b/ext/oci8/tests/fetch_all.phpt
index 5d3738b892aaf585dd5b5670674132637a1f299b..a3722c47888a21a76384c06357a8dfa79fa9f5a4 100644 (file)
--- a/ext/oci8/tests/fetch_all.phpt
+++ b/ext/oci8/tests/fetch_all.phpt
@@ -147,3 +147,101 @@ array(5) {
   }
 }
 Done
+--UEXPECT--
+int(3)
+array(5) {
+  [u"ID"]=>
+  array(3) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+  }
+  [u"VALUE"]=>
+  array(3) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+  }
+  [u"BLOB"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+  [u"CLOB"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+  [u"STRING"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+}
+int(3)
+array(5) {
+  [u"ID"]=>
+  array(3) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+  }
+  [u"VALUE"]=>
+  array(3) {
+    [0]=>
+    string(1) "1"
+    [1]=>
+    string(1) "1"
+    [2]=>
+    string(1) "1"
+  }
+  [u"BLOB"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+  [u"CLOB"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+  [u"STRING"]=>
+  array(3) {
+    [0]=>
+    NULL
+    [1]=>
+    NULL
+    [2]=>
+    NULL
+  }
+}
+Done

diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt
index e2f32483d58a33116e019f85893bc995c1955f71..62d5fcbe8fc595218f95a2684bf818626274b095 100644 (file)
--- a/ext/oci8/tests/fetch_array.phpt
+++ b/ext/oci8/tests/fetch_array.phpt
@@ -306,3 +306,233 @@ array(10) {
   NULL
 }
 Done
+--UEXPECT--
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt
index 7dacf2e5b257e6eb7d2d28caea8e18bcc5b1c672..0c9e574751cc0d59ac48b3793767f8374ca953bc 100644 (file)
--- a/ext/oci8/tests/fetch_assoc.phpt
+++ b/ext/oci8/tests/fetch_assoc.phpt
@@ -80,3 +80,41 @@ array(5) {
   NULL
 }
 Done
+--UEXPECT--
+array(5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+array(5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt
index 379f5fc14eba1cd2da2d85997efc8794cabf92a2..8bd93beaf0d194c27728359b5cc726f5f3befc80 100644 (file)
--- a/ext/oci8/tests/fetch_into.phpt
+++ b/ext/oci8/tests/fetch_into.phpt
@@ -80,3 +80,35 @@ array(10) {
   NULL
 }
 Done
+--UEXPECT--
+int(5)
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+int(5)
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt
index 263590d14014f0a2a3ab1d67dc6a9c7277580521..f7a1b6939dc560eeb7d005ac30027d61a1db22e2 100644 (file)
--- a/ext/oci8/tests/fetch_into1.phpt
+++ b/ext/oci8/tests/fetch_into1.phpt
@@ -190,3 +190,135 @@ array(5) {
   NULL
 }
 Done
+--UEXPECT--
+int(5)
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+int(5)
+array(2) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+int(5)
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+}
+int(5)
+array(2) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+}
+int(5)
+array(4) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+}
+int(5)
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+int(5)
+array(10) {
+  [0]=>
+  string(1) "1"
+  [u"ID"]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [u"BLOB"]=>
+  NULL
+  [3]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [4]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+int(5)
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+}
+int(5)
+array(5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+int(5)
+array(5) {
+  [0]=>
+  string(1) "1"
+  [1]=>
+  string(1) "1"
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt
index 57b7fc03d81fcb77c53cdf076780d4678cea0b26..ce78aa47d50e30bd4a2779c2b1f0febb2013d37b 100644 (file)
--- a/ext/oci8/tests/fetch_object.phpt
+++ b/ext/oci8/tests/fetch_object.phpt
@@ -80,3 +80,41 @@ object(stdClass)#%d (5) {
   NULL
 }
 Done
+--UEXPECTF--
+object(stdClass)#%d (5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+object(stdClass)#%d (5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+object(stdClass)#%d (5) {
+  [u"ID"]=>
+  string(1) "1"
+  [u"VALUE"]=>
+  string(1) "1"
+  [u"BLOB"]=>
+  NULL
+  [u"CLOB"]=>
+  NULL
+  [u"STRING"]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt
index cbcb92e7ec76c4fc2245fd899ebf70c125d0d472..569a85cbcd85fbe30dd8053fb54823f1153dc233 100644 (file)
Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ

diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt
index ebbef1815e2a52d2e0064b8ecf86be4c68c81945..ab53b2805c0bc580aa734c7dd5191d554c51bb12 100644 (file)
--- a/ext/oci8/tests/lob_002.phpt
+++ b/ext/oci8/tests/lob_002.phpt
@@ -64,3 +64,21 @@ NULL
 bool(false)
 int(40004)
 Done
+--UEXPECTF--
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+int(0)
+
+Warning: OCI-Lob::write() expects parameter 2 to be long, Unicode string given in %s on line %d
+NULL
+int(4)
+int(40000)
+int(40004)
+
+Warning: OCI-Lob::seek() expects parameter 1 to be long, Unicode string given in %s on line %d
+NULL
+bool(false)
+int(40004)
+Done

diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt
index 8a492d16ca9b89dede69c4f8dc5eed4fb1748030..5704548dc310cecd5f471e251ffe38480535d36f 100644 (file)
Binary files a/ext/oci8/tests/lob_003.phpt and b/ext/oci8/tests/lob_003.phpt differ

diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt
index 32de4a0120058b51cc81847d99b67bb38c057199..ca6b9e5e4e132b1e66cd6f3047a6ce58e1c76825 100644 (file)
--- a/ext/oci8/tests/lob_004.phpt
+++ b/ext/oci8/tests/lob_004.phpt
@@ -78,3 +78,28 @@ bool(true)
 string(4) "strt"
 string(8) "strtstrt"
 Done
+--UEXPECTF--
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+int(4)
+bool(true)
+int(3)
+bool(true)
+array(2) {
+  [0]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+bool(true)
+string(4) "strt"
+string(8) "strtstrt"
+Done

diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt
index e1ac6e5340f17d69dec16782255b8d47d6dbb7d6..2ddfc577e47aa355eeebe436095cb0866764f060 100644 (file)
--- a/ext/oci8/tests/lob_005.phpt
+++ b/ext/oci8/tests/lob_005.phpt
@@ -50,3 +50,18 @@ array(2) {
 }
 bool(true)
 Done
+--UEXPECTF--
+array(2) {
+  [0]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+bool(true)
+Done

diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt
index 3192ebc906f5fd7a29f4cbfb397e53b1267ffee1..58e6fb40a9a93e252b6042ea73589f85084356b8 100644 (file)
Binary files a/ext/oci8/tests/lob_006.phpt and b/ext/oci8/tests/lob_006.phpt differ

diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt
index 1fe63092c63fe6aec8d6972e800824e762b34755..4928e1f7c8757c223506dd9bf24395f22e16c895 100644 (file)
--- a/ext/oci8/tests/lob_007.phpt
+++ b/ext/oci8/tests/lob_007.phpt
@@ -64,3 +64,26 @@ array(2) {
 int(7000)
 int(7000)
 Done
+--UEXPECTF--
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+int(0)
+int(7000)
+int(7000)
+array(2) {
+  [0]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+int(7000)
+int(7000)
+Done

diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt
index a36bb4a34026b985bc0aecbdbc80387013de938f..bc8e87b4b3029db8adcf002081b126ee76d2a80b 100644 (file)
--- a/ext/oci8/tests/lob_008.phpt
+++ b/ext/oci8/tests/lob_008.phpt
@@ -63,3 +63,23 @@ array(2) {
 }
 int(7000)
 Done
+--UEXPECTF--
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+int(7000)
+array(2) {
+  [0]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+int(7000)
+Done

diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt
index b9f7401128e64cdb9d0f6a16ccf22ac496184ed4..21df6a7b9691c82bfe111794dc5378bab8fd1d04 100644 (file)
--- a/ext/oci8/tests/lob_009.phpt
+++ b/ext/oci8/tests/lob_009.phpt
@@ -67,3 +67,30 @@ file for
 test lob_009.phpt
 "
 Done
+--UEXPECTF--
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+bool(true)
+bool(true)
+array(2) {
+  [0]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"BLOB"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+string(43) "this
+is
+a 
+test
+file for
+test lob_009.phpt
+"
+Done

diff --git a/ext/oci8/tests/lob_011.phpt b/ext/oci8/tests/lob_011.phpt
index b074e1730ef7c897737de6e5c4bfb65c0b81a081..0b7f520d9d19ed50e6174671eef620fd063d9d27 100644 (file)
--- a/ext/oci8/tests/lob_011.phpt
+++ b/ext/oci8/tests/lob_011.phpt
@@ -76,3 +76,14 @@ array(2) {
   string(32) "some string here. string, I said"
 }
 Done
+--UEXPECT--
+int(32)
+bool(true)
+string(32) "some string here. string, I said"
+array(2) {
+  [0]=>
+  string(32) "some string here. string, I said"
+  [u"BLOB"]=>
+  string(32) "some string here. string, I said"
+}
+Done

diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt
index 297d5b49718c06e7ad013e53bb1ee028a7dea31e..e92383b853fe7e814457f6009ab62fd27e7734d4 100644 (file)
--- a/ext/oci8/tests/lob_015.phpt
+++ b/ext/oci8/tests/lob_015.phpt
@@ -51,3 +51,20 @@ object(OCI-Lob)#%d (1) {
   resource(%d) of type (oci8 descriptor)
 }
 Done
+--UEXPECTF--
+Warning: oci_new_descriptor() expects at most 2 parameters, 5 given in %s on line %d
+
+Warning: oci_bind_by_name() expects at most 5 parameters, 6 given in %s on line %d
+
+Warning: oci_bind_by_name() expects at most 5 parameters, 7 given in %s on line %d
+
+Warning: oci_bind_by_name() expects at least 3 parameters, 2 given in %s on line %d
+
+Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %s on line %d
+
+Warning: oci_execute(): ORA-00932: inconsistent datatypes: expected NUMBER got BLOB in %s on line %d
+object(OCI-Lob)#%d (1) {
+  [u"descriptor"]=>
+  resource(%d) of type (oci8 descriptor)
+}
+Done

diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt
index 642e7195ef4ec9df3833fcdffe37d18bb4dd5ef5..fdb7374ccf5c05caa0e06e70b8298519c2d1d2ec 100644 (file)
--- a/ext/oci8/tests/lob_016.phpt
+++ b/ext/oci8/tests/lob_016.phpt
@@ -65,3 +65,19 @@ array(2) {
 string(5) "first"
 string(6) "second"
 Done
+--UEXPECTF--
+array(2) {
+  [u"LOB_1"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"LOB_2"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+string(5) "first"
+string(6) "second"
+Done

diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt
index ed12cc4685843a916801a388362f4fda0cd0a3a4..8ab0dc459e203f6a176f9ed96cb58b11f19503c8 100644 (file)
--- a/ext/oci8/tests/lob_017.phpt
+++ b/ext/oci8/tests/lob_017.phpt
@@ -67,3 +67,19 @@ array(2) {
 string(5) "first"
 string(6) "second"
 Done
+--UEXPECTF--
+array(2) {
+  [u"LOB_1"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+  [u"LOB_2"]=>
+  object(OCI-Lob)#%d (1) {
+    [u"descriptor"]=>
+    resource(%d) of type (oci8 descriptor)
+  }
+}
+string(5) "first"
+string(6) "second"
+Done

diff --git a/ext/oci8/tests/lob_019.phpt b/ext/oci8/tests/lob_019.phpt
index fb9a3c8188b9ea5013543e111b8111f0ec75250f..d972cd792aea62ec1f1d57a17f6edb54eb8f5e96 100644 (file)
Binary files a/ext/oci8/tests/lob_019.phpt and b/ext/oci8/tests/lob_019.phpt differ

diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt
index edd0f02490fea26071ea3cc180de03c403b1d8ec..9110e759d6342572ecf8936132e6aecf2b8ff969 100644 (file)
Binary files a/ext/oci8/tests/lob_020.phpt and b/ext/oci8/tests/lob_020.phpt differ

diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt
index 39122240a7ebfd44c395020974348e223662c878..dd4e5d7c871b070d94c50cabd8b79f2ded0b8bae 100644 (file)
--- a/ext/oci8/tests/privileged_connect.phpt
+++ b/ext/oci8/tests/privileged_connect.phpt
@@ -23,3 +23,12 @@ Warning: oci_connect(): Invalid session mode specified (-1) in %s on line %d
 
 Warning: oci_connect() expects parameter 5 to be long, string given in %s on line %d
 Done
+--UEXPECTF--
+Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA in %s on line %d
+
+Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_connect to be able to connect as SYSOPER or SYSDBA 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 long, Unicode string given in %s on line %d
+Done

diff --git a/ext/oci8/tests/select_null.phpt b/ext/oci8/tests/select_null.phpt
index 87c5b815fd242f496f0c25c02d49ce1cfb8ec0f5..720d8677316615adf6e5f5ddd4c180b699f2b577 100644 (file)
--- a/ext/oci8/tests/select_null.phpt
+++ b/ext/oci8/tests/select_null.phpt
@@ -23,3 +23,11 @@ array(2) {
   NULL
 }
 Done
+--UEXPECT--
+array(2) {
+  [0]=>
+  NULL
+  [u"NULL"]=>
+  NULL
+}
+Done

diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt
index e7c8911e8890758b1395c86e4c97ecc5aa056846..f736054141d699c5f945896d0f615688cc65d48a 100644 (file)
--- a/ext/oci8/tests/statement_cache.phpt
+++ b/ext/oci8/tests/statement_cache.phpt
@@ -33,3 +33,17 @@ array(2) {
   string(1) "4"
 }
 Done
+--UEXPECTF--
+array(2) {
+  [0]=>
+  string(1) "4"
+  [u"1+3"]=>
+  string(1) "4"
+}
+array(2) {
+  [0]=>
+  string(1) "4"
+  [u"1+3"]=>
+  string(1) "4"
+}
+Done