From: Christopher Jones Date: Sun, 19 Jul 2009 16:04:57 +0000 (+0000) Subject: Reduce Oracle version-dependent diffs. Make PHP 5/6 compatible X-Git-Tag: php-5.4.0alpha1~191^2~3054 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=01f090e30a945217c328717c7fbfb5e7b97ccd0a;p=php 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 5b94294ddf..e054a22162 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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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 ca7283aa8c..b275229611 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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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 9c30bc58fd..50be0e7243 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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> + [%u|b%"code"]=> int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"message"]=> + %unicode|string%(65) "ORA-12154: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(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) { - [u"code"]=> - int(12154) - [u"message"]=> - unicode(65) "ORA-12154: %s" - [u"offset"]=> + [%u|b%"code"]=> + int(%d) + [%u|b%"message"]=> + %unicode|string%(%d) "ORA-%d: %s" + [%u|b%"offset"]=> int(0) - [u"sqltext"]=> - unicode(0) "" + [%u|b%"sqltext"]=> + %unicode|string%(0) "" } bool(false) ===DONE===