Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible

diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt
index 850b1385d1aaf7ad7dea885d46b519d321d492ec..e054a221627392cf3fedaadfac787f6587863582 100644 (file)
--- a/ext/oci8/tests/extauth_01.phpt
+++ b/ext/oci8/tests/extauth_01.phpt
@@ -141,56 +141,56 @@ Test 7
 
 Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 8
 
 Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 9
 
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 10
 
-Warning: oci_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_connect(): ORA-%d: TNS:%s in %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 ===DONE===

diff --git a/ext/oci8/tests/extauth_02.phpt b/ext/oci8/tests/extauth_02.phpt
index df9cb5eb0abbb4bed9910904b68d8095086257d4..b2752296111c844bd4ca59fc8af0d99e08eed229 100644 (file)
--- a/ext/oci8/tests/extauth_02.phpt
+++ b/ext/oci8/tests/extauth_02.phpt
@@ -141,56 +141,56 @@ Test 7
 
 Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 8
 
 Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 9
 
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 10
 
-Warning: oci_new_connect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_new_connect(): ORA-%d: TNS:%s %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 ===DONE===

diff --git a/ext/oci8/tests/extauth_03.phpt b/ext/oci8/tests/extauth_03.phpt
index 5012742326d2e99285c73629ef7590f5b28591f9..50be0e7243b5bc3e3d2a42e2e3acfccb5442f3ef 100644 (file)
--- a/ext/oci8/tests/extauth_03.phpt
+++ b/ext/oci8/tests/extauth_03.phpt
@@ -141,56 +141,56 @@ Test 7
 
 Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 8
 
 Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
 array(4) {
-  ["code"]=>
+  [%u|b%"code"]=>
   int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"message"]=>
+  %unicode|string%(65) "ORA-12154: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 9
 
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-%d: TNS:%s in %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 Test 10
 
-Warning: oci_pconnect(): ORA-12154: TNS:could not resolve the connect identifier specified in %s on line %d
+Warning: oci_pconnect(): ORA-%d: TNS:%s in %s on line %d
 array(4) {
-  ["code"]=>
-  int(12154)
-  ["message"]=>
-  string(65) "ORA-12154: %s"
-  ["offset"]=>
+  [%u|b%"code"]=>
+  int(%d)
+  [%u|b%"message"]=>
+  %unicode|string%(%d) "ORA-%d: %s"
+  [%u|b%"offset"]=>
   int(0)
-  ["sqltext"]=>
-  string(0) ""
+  [%u|b%"sqltext"]=>
+  %unicode|string%(0) ""
 }
 bool(false)
 ===DONE===