From 4c12299c080ee47665422b690384a466beb571cb Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Sun, 19 Jul 2009 16:05:08 +0000 Subject: [PATCH] Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible --- ext/oci8/tests/extauth_01.phpt | 56 +++++++++++++++++----------------- ext/oci8/tests/extauth_02.phpt | 56 +++++++++++++++++----------------- ext/oci8/tests/extauth_03.phpt | 56 +++++++++++++++++----------------- 3 files changed, 84 insertions(+), 84 deletions(-) diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt index 850b1385d1a..e054a221627 100644 --- 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 df9cb5eb0ab..b2752296111 100644 --- 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 5012742326d..50be0e7243b 100644 --- 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===