sixd            Sun, 19 Jul 2009 16:04:57 +0000

URL: http://svn.php.net/viewvc?view=revision&revision=284368

Changed paths:
        U   php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
        U   php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
        U   php/php-src/trunk/ext/oci8/tests/extauth_03.phpt

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

Modified: php/php-src/trunk/ext/oci8/tests/extauth_01.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_01.phpt    2009-07-19 15:57:06 UTC 
(rev 284367)
+++ php/php-src/trunk/ext/oci8/tests/extauth_01.phpt    2009-07-19 16:04:57 UTC 
(rev 284368)
@@ -141,56 +141,56 @@

 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===

Modified: php/php-src/trunk/ext/oci8/tests/extauth_02.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_02.phpt    2009-07-19 15:57:06 UTC 
(rev 284367)
+++ php/php-src/trunk/ext/oci8/tests/extauth_02.phpt    2009-07-19 16:04:57 UTC 
(rev 284368)
@@ -141,56 +141,56 @@

 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===

Modified: php/php-src/trunk/ext/oci8/tests/extauth_03.phpt
===================================================================
--- php/php-src/trunk/ext/oci8/tests/extauth_03.phpt    2009-07-19 15:57:06 UTC 
(rev 284367)
+++ php/php-src/trunk/ext/oci8/tests/extauth_03.phpt    2009-07-19 16:04:57 UTC 
(rev 284368)
@@ -141,56 +141,56 @@

 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===

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to