diff options
| author | Felipe Pena <felipe@php.net> | 2008-05-27 14:30:38 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-05-27 14:30:38 +0000 |
| commit | f859bd1b4f3f72b6bdfa8ecbb76d1a1c35755ced (patch) | |
| tree | 64aabbba5d84686db0346ec83efc50e252e0af84 | |
| parent | b3ac16e5846cc7616ffe2d1024926b41384c9ce1 (diff) | |
| download | php-git-f859bd1b4f3f72b6bdfa8ecbb76d1a1c35755ced.tar.gz | |
- Removed UEXPECT(F)
124 files changed, 1 insertions, 4602 deletions
diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt index 6fa0d11050..c234707cba 100644 --- a/ext/oci8/tests/array_bind_001.phpt +++ b/ext/oci8/tests/array_bind_001.phpt @@ -64,15 +64,6 @@ Warning: oci_bind_array_by_name(): OCI-21560: argument 3 is null, invalid, or ou Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d array(1) { [0]=> - string(0) "" -} -Done ---UEXPECTF-- -Warning: oci_bind_array_by_name(): OCI-21560: argument 3 is null, invalid, or out of range in %s on line %d - -Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d -array(1) { - [0]=> unicode(0) "" } Done diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt index f0c3f2118e..403e8d3d73 100644 --- a/ext/oci8/tests/array_bind_002.phpt +++ b/ext/oci8/tests/array_bind_002.phpt @@ -64,23 +64,6 @@ Warning: oci_bind_array_by_name(): Maximum array length must be greater than zer Warning: oci_execute(): ORA-01008: not all variables bound in %s on line %d array(5) { [0]=> - string(9) "06-DEC-05" - [1]=> - string(9) "10-DEC-80" - [2]=> - string(9) "21-AUG-91" - [3]=> - string(9) "26-OCT-17" - [4]=> - 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" diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt index f1218ca231..c40f251318 100644 --- a/ext/oci8/tests/array_bind_003.phpt +++ b/ext/oci8/tests/array_bind_003.phpt @@ -62,19 +62,6 @@ echo "Done\n"; Warning: oci_execute(): OCI_NO_DATA in %s on line %d array(4) { [0]=> - string(9) "06-DEC-05" - [1]=> - string(9) "10-DEC-80" - [2]=> - string(9) "21-AUG-91" - [3]=> - string(9) "26-OCT-17" -} -Done ---UEXPECTF-- -Warning: oci_execute(): OCI_NO_DATA in %s on line %d -array(4) { - [0]=> unicode(9) "06-DEC-05" [1]=> unicode(9) "10-DEC-80" diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt index b62b439fbf..9749610012 100644 --- a/ext/oci8/tests/array_bind_005.phpt +++ b/ext/oci8/tests/array_bind_005.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECTF-- array(5) { [0]=> - string(0) "" - [1]=> - string(0) "" - [2]=> - string(0) "" - [3]=> - string(0) "" - [4]=> - string(0) "" -} -Done ---UEXPECTF-- -array(5) { - [0]=> unicode(0) "" [1]=> unicode(0) "" diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt index 3f4881c891..4faebf5e94 100644 --- a/ext/oci8/tests/array_bind_006.phpt +++ b/ext/oci8/tests/array_bind_006.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(4) "five" - [1]=> - string(4) "four" - [2]=> - string(5) "three" - [3]=> - string(3) "two" - [4]=> - string(3) "one" -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(4) "five" [1]=> unicode(4) "four" diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt index e73e04d705..fa883352dc 100644 --- a/ext/oci8/tests/array_bind_008.phpt +++ b/ext/oci8/tests/array_bind_008.phpt @@ -59,24 +59,6 @@ var_dump($array); echo "Done\n"; ?> --EXPECTF-- -Warning: oci_execute(): ORA-06550: line %d, column %d: -PLS-00418: array bind type must match PL/SQL table row type -ORA-06550: line %d, column %d: -PL/SQL: Statement ignored in %s on line %d -array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - [4]=> - string(1) "5" -} -Done ---UEXPECTF-- Warning: oci_execute(): ORA-06550: line 1, column 28: PLS-00418: array bind type must match PL/SQL table row type ORA-06550: line 1, column 7: diff --git a/ext/oci8/tests/array_bind_010.phpt b/ext/oci8/tests/array_bind_010.phpt index e0af6add4e..4cd5a6e390 100644 --- a/ext/oci8/tests/array_bind_010.phpt +++ b/ext/oci8/tests/array_bind_010.phpt @@ -23,21 +23,6 @@ echo "Done\n"; Warning: oci_bind_array_by_name(): ORA-01036: illegal variable name/number in %s on line %d array(5) { [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - [4]=> - string(1) "5" -} -Done ---UEXPECTF-- -Warning: oci_bind_array_by_name(): ORA-01036: illegal variable name/number in %s on line %d -array(5) { - [0]=> unicode(1) "1" [1]=> unicode(1) "2" diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt index 5c2f5dae87..7c108fdce0 100644 --- a/ext/oci8/tests/array_bind_date.phpt +++ b/ext/oci8/tests/array_bind_date.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(9) "05-NOV-05" - [1]=> - string(9) "26-OCT-17" - [2]=> - string(9) "21-AUG-91" - [3]=> - string(9) "10-DEC-80" - [4]=> - string(9) "06-DEC-05" -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(9) "05-NOV-05" [1]=> unicode(9) "26-OCT-17" diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt index 21725d40f9..f03928b70c 100644 --- a/ext/oci8/tests/array_bind_date1.phpt +++ b/ext/oci8/tests/array_bind_date1.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(9) "05-NOV-05" - [1]=> - string(9) "26-OCT-17" - [2]=> - string(9) "21-AUG-91" - [3]=> - string(9) "10-DEC-80" - [4]=> - string(9) "06-DEC-05" -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(9) "05-NOV-05" [1]=> unicode(9) "26-OCT-17" diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt index 968667d7cf..390066de83 100644 --- a/ext/oci8/tests/array_bind_str.phpt +++ b/ext/oci8/tests/array_bind_str.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(4) "five" - [1]=> - string(4) "four" - [2]=> - string(5) "three" - [3]=> - string(3) "two" - [4]=> - string(3) "one" -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(4) "five" [1]=> unicode(4) "four" diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt index bb3a7db543..d9c62439ae 100644 --- a/ext/oci8/tests/array_bind_str1.phpt +++ b/ext/oci8/tests/array_bind_str1.phpt @@ -61,20 +61,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(4) "five" - [1]=> - string(4) "four" - [2]=> - string(5) "three" - [3]=> - string(3) "two" - [4]=> - string(3) "one" -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(4) "five" [1]=> unicode(4) "four" diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index 23493ce772..5f5c62920f 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -219,91 +219,6 @@ Test 1.4: Type: AFC: Length: strlen :: Test 1.5: Type: AFC. Length: strlen-1 Querying: - Oci_execute error ORA-1460 Exiting Query -Test 1.6: Type: AFC. Length: strlen+1 - Querying: - :1: - :abc : - :: - - -*** NULL data tests against CHAR *** -Test 2.1: Type: default. Length: default - Querying: -Test 2.2: Type: AFC. Length: default - Querying: -Test 2.3: Type: AFC: Length: 0 - Querying: -Test 2.4: Type: AFC: Length: strlen - Querying: -Test 2.5: Type: AFC. Length: strlen-1 - Querying: -Test 2.6: Type: AFC. Length: strlen+1 - Querying: - - -*** Non-null Data Tests against VARCHAR2*** -Test 3.1: Type: default. Length: default - Querying: - :2: - :: - :abc: -Test 3.2: Type: AFC. Length: default - Querying: - :2: - :: - :abc: -Test 3.3: Type: AFC: Length: 0 - Querying: - Oci_execute error ORA-1460 Exiting Query -Test 3.4: Type: AFC: Length: strlen - Querying: - :2: - :: - :abc: -Test 3.5: Type: AFC. Length: strlen-1 - Querying: - Oci_execute error ORA-1460 Exiting Query -Test 3.6: Type: AFC. Length: strlen+1 - Querying: - :2: - :: - :abc: - - -*** NULL data tests against VARCHAR2 *** -Test 4.1: Type: default. Length: default - Querying: -Test 4.2: Type: AFC. Length: default - Querying: -Test 4.3: Type: AFC: Length: 0 - Querying: -Test 4.4: Type: AFC: Length: strlen - Querying: -Test 4.5: Type: AFC. Length: strlen-1 - Querying: -Test 4.6: Type: AFC. Length: strlen+1 - Querying: -Done ---UEXPECT-- -*** Non-null Data Tests against CHAR*** -Test 1.1: Type: default. Length: default - Querying: -Test 1.2: Type: AFC. Length: default - Querying: - :1: - :abc : - :: -Test 1.3: Type: AFC: Length: 0 - Querying: - Oci_execute error ORA-1460 Exiting Query -Test 1.4: Type: AFC: Length: strlen - Querying: - :1: - :abc : - :: -Test 1.5: Type: AFC. Length: strlen-1 - Querying: :1: :abc : :: diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt index 3cbc0d9f7b..16e9c0d38c 100644 --- a/ext/oci8/tests/bind_char_2.phpt +++ b/ext/oci8/tests/bind_char_2.phpt @@ -107,30 +107,6 @@ Test 1.4: Type: AFC: Length: strlen :2008-04-20: Test 1.5: Type: AFC. Length: strlen-1 Querying: - Oci_execute error ORA-1460 Exiting Query -Test 1.6: Type: AFC. Length: strlen+1 - Querying: - :1: - :2008-04-20: -Done ---UEXPECT-- -Test 1.1: Type: default. Length: default - Querying: - :1: - :2008-04-20: -Test 1.2: Type: AFC. Length: default - Querying: - :1: - :2008-04-20: -Test 1.3: Type: AFC: Length: 0 - Querying: - Oci_execute error ORA-1460 Exiting Query -Test 1.4: Type: AFC: Length: strlen - Querying: - :1: - :2008-04-20: -Test 1.5: Type: AFC. Length: strlen-1 - Querying: :1: :2008-04-20: Test 1.6: Type: AFC. Length: strlen+1 diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt index b6fb5efbc2..3d63fbb762 100644 --- a/ext/oci8/tests/bind_char_3.phpt +++ b/ext/oci8/tests/bind_char_3.phpt @@ -247,97 +247,6 @@ echo "Done\n"; Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default Executing: Oci_execute error ORA-6502 -string(3) "abc" -NULL -Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -string(3) "abc" -string(3) "abc" -Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -string(3) "abc" -string(3) "abc" -Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(3) "abc" -string(10) "abc " -Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input). Out Type: AFC - Executing: -string(3) "abc" -string(3) "abc" -Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input)-1. Out Type: AFC - Executing: - Oci_execute error ORA-6502 -string(3) "abc" -string(3) "abc" -Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input)+1. Out Type: AFC - Executing: -string(3) "abc" -string(4) "abc " - - -Tests with '' - -Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -string(0) "" -NULL -Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -string(0) "" -NULL -Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. Out Type: AFC - Executing: -string(0) "" -NULL - - -Tests with NULL -Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -NULL -NULL -Test 3.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -NULL -NULL -Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -NULL -NULL -Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -NULL -NULL -Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -NULL -NULL -Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. Out Type: AFC - Executing: -NULL -NULL -Done ---UEXPECT-- -Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default - Executing: - Oci_execute error ORA-6502 unicode(3) "abc" NULL Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt index 3ddcfddd99..6cef39c567 100644 --- a/ext/oci8/tests/bind_char_4.phpt +++ b/ext/oci8/tests/bind_char_4.phpt @@ -249,97 +249,6 @@ echo "Done\n"; Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default Executing: Oci_execute error ORA-6502 -string(3) "abc" -NULL -Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -string(3) "abc" -string(3) "abc" -Test 1.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -string(3) "abc" -string(3) "abc" -Test 1.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(3) "abc" -string(10) "abc " -Test 1.5 In Length: strlen. In Type: AFC. Out Length: strlen(input). Out Type: AFC - Executing: -string(3) "abc" -string(3) "abc" -Test 1.6 In Length: strlen. In Type: AFC. Out Length: strlen(input)-1. Out Type: AFC - Executing: - Oci_execute error ORA-6502 -string(3) "abc" -string(3) "abc" -Test 1.7 In Length: strlen. In Type: AFC. Out Length: strlen(input)+1. Out Type: AFC - Executing: -string(3) "abc" -string(4) "abc " - - -Tests with '' - -Test 2.1 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -string(0) "" -NULL -Test 2.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -string(0) "" -NULL -Test 2.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.5 In Length: -1. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.6 In Length: 0. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -string(0) "" -NULL -Test 2.7 In Length: 1. In Type: AFC. Out Length: 1. Out Type: AFC - Executing: -string(0) "" -NULL - - -Tests with NULL -Test 3.1 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -NULL -NULL -Test 3.2 In Length: default. In Type: default. Out Length: 10. Out Type: default - Executing: -NULL -NULL -Test 3.3 In Length: -1. In Type: AFC. Out Length: 10. Out Type: default - Executing: -NULL -NULL -Test 3.4 In Length: -1. In Type: AFC. Out Length: 10. Out Type: AFC - Executing: -NULL -NULL -Test 3.5 In Length: -1. In Type: AFC. Out Length: 0. Out Type: AFC - Executing: -NULL -NULL -Test 3.6 In Length: -1. In Type: AFC. Out Length: 1. Out Type: AFC - Executing: -NULL -NULL -Done ---UEXPECT-- -Test 1.1 In Length: default. In Type: default. Out Length: default. Out Type: default - Executing: - Oci_execute error ORA-6502 unicode(3) "abc" NULL Test 1.2 In Length: default. In Type: default. Out Length: 10. Out Type: default diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt index ec630fadc5..10d35c649c 100644 --- a/ext/oci8/tests/bind_empty.phpt +++ b/ext/oci8/tests/bind_empty.phpt @@ -82,34 +82,6 @@ bool(true) Test 3 bool(true) array(1) { - ["NAME"]=> - array(2) { - [0]=> - string(3) "def" - [1]=> - NULL - } -} -Test 4 -bool(true) -array(1) { - ["NAME"]=> - array(2) { - [0]=> - NULL - [1]=> - NULL - } -} -Done ---UEXPECTF-- -Test 1 -bool(true) -Test 2 -bool(true) -Test 3 -bool(true) -array(1) { [u"NAME"]=> array(2) { [0]=> diff --git a/ext/oci8/tests/bind_long.phpt b/ext/oci8/tests/bind_long.phpt index 199c62ebc9..6d21daa7c3 100644 --- a/ext/oci8/tests/bind_long.phpt +++ b/ext/oci8/tests/bind_long.phpt @@ -33,10 +33,6 @@ echo "Done\n"; ?> --EXPECT-- -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 2e0e0426c1..f0055f9612 100644 --- a/ext/oci8/tests/bind_long_raw.phpt +++ b/ext/oci8/tests/bind_long_raw.phpt @@ -33,10 +33,6 @@ echo "Done\n"; ?> --EXPECT-- -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 163b529860..c66ac551b0 100644 --- a/ext/oci8/tests/bind_raw.phpt +++ b/ext/oci8/tests/bind_raw.phpt @@ -34,10 +34,6 @@ echo "Done\n"; ?> --EXPECT-- -string(32) "88b274d7a257ac6f70435b83abd4e26e" -int(300) -Done ---UEXPECTF-- unicode(32) "88b274d7a257ac6f70435b83abd4e26e" int(300) Done diff --git a/ext/oci8/tests/bug27303.phpt b/ext/oci8/tests/bug27303.phpt index 1e12a6f4ba..4dcb8e8612 100644 --- a/ext/oci8/tests/bug27303.phpt +++ b/ext/oci8/tests/bug27303.phpt @@ -50,207 +50,6 @@ foreach ($create_st as $statement) { echo "Done\n"; ?> --EXPECTF-- -string(1) "1" -string(1) "2" -string(1) "3" -string(1) "4" -string(1) "5" -string(1) "6" -string(1) "7" -string(1) "8" -string(1) "9" -string(2) "10" -string(2) "11" -string(2) "12" -string(2) "13" -string(2) "14" -string(2) "15" -string(2) "16" -string(2) "17" -string(2) "18" -string(2) "19" -string(2) "20" -string(2) "21" -string(2) "22" -string(2) "23" -string(2) "24" -string(2) "25" -string(2) "26" -string(2) "27" -string(2) "28" -string(2) "29" -string(2) "30" -string(2) "31" -string(2) "32" -string(2) "33" -string(2) "34" -string(2) "35" -string(2) "36" -string(2) "37" -string(2) "38" -string(2) "39" -string(2) "40" -string(2) "41" -string(2) "42" -string(2) "43" -string(2) "44" -string(2) "45" -string(2) "46" -string(2) "47" -string(2) "48" -string(2) "49" -string(2) "50" -string(2) "51" -string(2) "52" -string(2) "53" -string(2) "54" -string(2) "55" -string(2) "56" -string(2) "57" -string(2) "58" -string(2) "59" -string(2) "60" -string(2) "61" -string(2) "62" -string(2) "63" -string(2) "64" -string(2) "65" -string(2) "66" -string(2) "67" -string(2) "68" -string(2) "69" -string(2) "70" -string(2) "71" -string(2) "72" -string(2) "73" -string(2) "74" -string(2) "75" -string(2) "76" -string(2) "77" -string(2) "78" -string(2) "79" -string(2) "80" -string(2) "81" -string(2) "82" -string(2) "83" -string(2) "84" -string(2) "85" -string(2) "86" -string(2) "87" -string(2) "88" -string(2) "89" -string(2) "90" -string(2) "91" -string(2) "92" -string(2) "93" -string(2) "94" -string(2) "95" -string(2) "96" -string(2) "97" -string(2) "98" -string(2) "99" -string(3) "100" -string(3) "101" -string(3) "102" -string(3) "103" -string(3) "104" -string(3) "105" -string(3) "106" -string(3) "107" -string(3) "108" -string(3) "109" -string(3) "110" -string(3) "111" -string(3) "112" -string(3) "113" -string(3) "114" -string(3) "115" -string(3) "116" -string(3) "117" -string(3) "118" -string(3) "119" -string(3) "120" -string(3) "121" -string(3) "122" -string(3) "123" -string(3) "124" -string(3) "125" -string(3) "126" -string(3) "127" -string(3) "128" -string(3) "129" -string(3) "130" -string(3) "131" -string(3) "132" -string(3) "133" -string(3) "134" -string(3) "135" -string(3) "136" -string(3) "137" -string(3) "138" -string(3) "139" -string(3) "140" -string(3) "141" -string(3) "142" -string(3) "143" -string(3) "144" -string(3) "145" -string(3) "146" -string(3) "147" -string(3) "148" -string(3) "149" -string(3) "150" -string(3) "151" -string(3) "152" -string(3) "153" -string(3) "154" -string(3) "155" -string(3) "156" -string(3) "157" -string(3) "158" -string(3) "159" -string(3) "160" -string(3) "161" -string(3) "162" -string(3) "163" -string(3) "164" -string(3) "165" -string(3) "166" -string(3) "167" -string(3) "168" -string(3) "169" -string(3) "170" -string(3) "171" -string(3) "172" -string(3) "173" -string(3) "174" -string(3) "175" -string(3) "176" -string(3) "177" -string(3) "178" -string(3) "179" -string(3) "180" -string(3) "181" -string(3) "182" -string(3) "183" -string(3) "184" -string(3) "185" -string(3) "186" -string(3) "187" -string(3) "188" -string(3) "189" -string(3) "190" -string(3) "191" -string(3) "192" -string(3) "193" -string(3) "194" -string(3) "195" -string(3) "196" -string(3) "197" -string(3) "198" -string(3) "199" -Done ---UEXPECTF-- unicode(1) "1" unicode(1) "2" unicode(1) "3" diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt index 4fc8736f14..4fb01caf4e 100644 --- a/ext/oci8/tests/bug27303_2.phpt +++ b/ext/oci8/tests/bug27303_2.phpt @@ -50,207 +50,6 @@ foreach ($create_st as $statement) { echo "Done\n"; ?> --EXPECTF-- -string(1) "1" -string(1) "2" -string(1) "3" -string(1) "4" -string(1) "5" -string(1) "6" -string(1) "7" -string(1) "8" -string(1) "9" -string(2) "10" -string(2) "11" -string(2) "12" -string(2) "13" -string(2) "14" -string(2) "15" -string(2) "16" -string(2) "17" -string(2) "18" -string(2) "19" -string(2) "20" -string(2) "21" -string(2) "22" -string(2) "23" -string(2) "24" -string(2) "25" -string(2) "26" -string(2) "27" -string(2) "28" -string(2) "29" -string(2) "30" -string(2) "31" -string(2) "32" -string(2) "33" -string(2) "34" -string(2) "35" -string(2) "36" -string(2) "37" -string(2) "38" -string(2) "39" -string(2) "40" -string(2) "41" -string(2) "42" -string(2) "43" -string(2) "44" -string(2) "45" -string(2) "46" -string(2) "47" -string(2) "48" -string(2) "49" -string(2) "50" -string(2) "51" -string(2) "52" -string(2) "53" -string(2) "54" -string(2) "55" -string(2) "56" -string(2) "57" -string(2) "58" -string(2) "59" -string(2) "60" -string(2) "61" -string(2) "62" -string(2) "63" -string(2) "64" -string(2) "65" -string(2) "66" -string(2) "67" -string(2) "68" -string(2) "69" -string(2) "70" -string(2) "71" -string(2) "72" -string(2) "73" -string(2) "74" -string(2) "75" -string(2) "76" -string(2) "77" -string(2) "78" -string(2) "79" -string(2) "80" -string(2) "81" -string(2) "82" -string(2) "83" -string(2) "84" -string(2) "85" -string(2) "86" -string(2) "87" -string(2) "88" -string(2) "89" -string(2) "90" -string(2) "91" -string(2) "92" -string(2) "93" -string(2) "94" -string(2) "95" -string(2) "96" -string(2) "97" -string(2) "98" -string(2) "99" -string(3) "100" -string(3) "101" -string(3) "102" -string(3) "103" -string(3) "104" -string(3) "105" -string(3) "106" -string(3) "107" -string(3) "108" -string(3) "109" -string(3) "110" -string(3) "111" -string(3) "112" -string(3) "113" -string(3) "114" -string(3) "115" -string(3) "116" -string(3) "117" -string(3) "118" -string(3) "119" -string(3) "120" -string(3) "121" -string(3) "122" -string(3) "123" -string(3) "124" -string(3) "125" -string(3) "126" -string(3) "127" -string(3) "128" -string(3) "129" -string(3) "130" -string(3) "131" -string(3) "132" -string(3) "133" -string(3) "134" -string(3) "135" -string(3) "136" -string(3) "137" -string(3) "138" -string(3) "139" -string(3) "140" -string(3) "141" -string(3) "142" -string(3) "143" -string(3) "144" -string(3) "145" -string(3) "146" -string(3) "147" -string(3) "148" -string(3) "149" -string(3) "150" -string(3) "151" -string(3) "152" -string(3) "153" -string(3) "154" -string(3) "155" -string(3) "156" -string(3) "157" -string(3) "158" -string(3) "159" -string(3) "160" -string(3) "161" -string(3) "162" -string(3) "163" -string(3) "164" -string(3) "165" -string(3) "166" -string(3) "167" -string(3) "168" -string(3) "169" -string(3) "170" -string(3) "171" -string(3) "172" -string(3) "173" -string(3) "174" -string(3) "175" -string(3) "176" -string(3) "177" -string(3) "178" -string(3) "179" -string(3) "180" -string(3) "181" -string(3) "182" -string(3) "183" -string(3) "184" -string(3) "185" -string(3) "186" -string(3) "187" -string(3) "188" -string(3) "189" -string(3) "190" -string(3) "191" -string(3) "192" -string(3) "193" -string(3) "194" -string(3) "195" -string(3) "196" -string(3) "197" -string(3) "198" -string(3) "199" -Done ---UEXPECTF-- unicode(1) "1" unicode(1) "2" unicode(1) "3" diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt index d0b4a90e93..3323991b20 100644 --- a/ext/oci8/tests/bug27303_4.phpt +++ b/ext/oci8/tests/bug27303_4.phpt @@ -50,207 +50,6 @@ foreach ($create_st as $statement) { echo "Done\n"; ?> --EXPECTF-- -string(1) "1" -string(1) "2" -string(1) "3" -string(1) "4" -string(1) "5" -string(1) "6" -string(1) "7" -string(1) "8" -string(1) "9" -string(2) "10" -string(2) "11" -string(2) "12" -string(2) "13" -string(2) "14" -string(2) "15" -string(2) "16" -string(2) "17" -string(2) "18" -string(2) "19" -string(2) "20" -string(2) "21" -string(2) "22" -string(2) "23" -string(2) "24" -string(2) "25" -string(2) "26" -string(2) "27" -string(2) "28" -string(2) "29" -string(2) "30" -string(2) "31" -string(2) "32" -string(2) "33" -string(2) "34" -string(2) "35" -string(2) "36" -string(2) "37" -string(2) "38" -string(2) "39" -string(2) "40" -string(2) "41" -string(2) "42" -string(2) "43" -string(2) "44" -string(2) "45" -string(2) "46" -string(2) "47" -string(2) "48" -string(2) "49" -string(2) "50" -string(2) "51" -string(2) "52" -string(2) "53" -string(2) "54" -string(2) "55" -string(2) "56" -string(2) "57" -string(2) "58" -string(2) "59" -string(2) "60" -string(2) "61" -string(2) "62" -string(2) "63" -string(2) "64" -string(2) "65" -string(2) "66" -string(2) "67" -string(2) "68" -string(2) "69" -string(2) "70" -string(2) "71" -string(2) "72" -string(2) "73" -string(2) "74" -string(2) "75" -string(2) "76" -string(2) "77" -string(2) "78" -string(2) "79" -string(2) "80" -string(2) "81" -string(2) "82" -string(2) "83" -string(2) "84" -string(2) "85" -string(2) "86" -string(2) "87" -string(2) "88" -string(2) "89" -string(2) "90" -string(2) "91" -string(2) "92" -string(2) "93" -string(2) "94" -string(2) "95" -string(2) "96" -string(2) "97" -string(2) "98" -string(2) "99" -string(3) "100" -string(3) "101" -string(3) "102" -string(3) "103" -string(3) "104" -string(3) "105" -string(3) "106" -string(3) "107" -string(3) "108" -string(3) "109" -string(3) "110" -string(3) "111" -string(3) "112" -string(3) "113" -string(3) "114" -string(3) "115" -string(3) "116" -string(3) "117" -string(3) "118" -string(3) "119" -string(3) "120" -string(3) "121" -string(3) "122" -string(3) "123" -string(3) "124" -string(3) "125" -string(3) "126" -string(3) "127" -string(3) "128" -string(3) "129" -string(3) "130" -string(3) "131" -string(3) "132" -string(3) "133" -string(3) "134" -string(3) "135" -string(3) "136" -string(3) "137" -string(3) "138" -string(3) "139" -string(3) "140" -string(3) "141" -string(3) "142" -string(3) "143" -string(3) "144" -string(3) "145" -string(3) "146" -string(3) "147" -string(3) "148" -string(3) "149" -string(3) "150" -string(3) "151" -string(3) "152" -string(3) "153" -string(3) "154" -string(3) "155" -string(3) "156" -string(3) "157" -string(3) "158" -string(3) "159" -string(3) "160" -string(3) "161" -string(3) "162" -string(3) "163" -string(3) "164" -string(3) "165" -string(3) "166" -string(3) "167" -string(3) "168" -string(3) "169" -string(3) "170" -string(3) "171" -string(3) "172" -string(3) "173" -string(3) "174" -string(3) "175" -string(3) "176" -string(3) "177" -string(3) "178" -string(3) "179" -string(3) "180" -string(3) "181" -string(3) "182" -string(3) "183" -string(3) "184" -string(3) "185" -string(3) "186" -string(3) "187" -string(3) "188" -string(3) "189" -string(3) "190" -string(3) "191" -string(3) "192" -string(3) "193" -string(3) "194" -string(3) "195" -string(3) "196" -string(3) "197" -string(3) "198" -string(3) "199" -Done ---UEXPECTF-- unicode(1) "1" unicode(1) "2" unicode(1) "3" diff --git a/ext/oci8/tests/bug35973.phpt b/ext/oci8/tests/bug35973.phpt index cab7cdefcb..ad816df611 100644 --- a/ext/oci8/tests/bug35973.phpt +++ b/ext/oci8/tests/bug35973.phpt @@ -32,17 +32,6 @@ echo "Done\n"; ?> --EXPECTF-- array(1) { - ["NC"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(%d) "%s5" -string(%d) "%sa" -Done ---UEXPECTF-- -array(1) { [u"NC"]=> object(OCI-Lob)#%d (1) { [u"descriptor"]=> diff --git a/ext/oci8/tests/bug36096.phpt b/ext/oci8/tests/bug36096.phpt index 487640ec4b..a4f716ca23 100644 --- a/ext/oci8/tests/bug36096.phpt +++ b/ext/oci8/tests/bug36096.phpt @@ -23,12 +23,6 @@ echo "Done\n"; --EXPECT-- bool(false) bool(false) -string(5) "'ABC'" -string(4) "CHAR" -Done ---UEXPECT-- -bool(false) -bool(false) unicode(5) "'ABC'" unicode(4) "CHAR" Done diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt index bda33d7a48..a6d6953912 100644 --- a/ext/oci8/tests/bug37581.phpt +++ b/ext/oci8/tests/bug37581.phpt @@ -44,32 +44,6 @@ echo "Done\n"; --EXPECTF-- array(5) { [0]=> - string(1) "A" - [1]=> - string(1) "B" - [2]=> - string(1) "C" - [3]=> - string(1) "D" - [4]=> - string(1) "E" -} -array(5) { - [0]=> - string(1) "A" - [1]=> - string(1) "B" - [2]=> - string(1) "C" - [3]=> - string(1) "D" - [4]=> - string(1) "E" -} -Done ---UEXPECTF-- -array(5) { - [0]=> unicode(1) "A" [1]=> unicode(1) "B" diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt index 8f5ecb710d..56b082b080 100644 --- a/ext/oci8/tests/bug40078.phpt +++ b/ext/oci8/tests/bug40078.phpt @@ -42,20 +42,6 @@ echo "Done\n"; --EXPECTF-- array(5) { [0]=> - string(3) "one" - [1]=> - string(3) "two" - [2]=> - string(0) "" - [3]=> - string(4) "four" - [4]=> - string(4) "five" -} -Done ---UEXPECTF-- -array(5) { - [0]=> unicode(3) "one" [1]=> unicode(3) "two" diff --git a/ext/oci8/tests/bug40415.phpt b/ext/oci8/tests/bug40415.phpt index 369fac6258..9efc476727 100644 --- a/ext/oci8/tests/bug40415.phpt +++ b/ext/oci8/tests/bug40415.phpt @@ -96,113 +96,6 @@ Test 1: Associate fetch of nested cursor Got row "11". Now getting nested cursor: bool(true) array(1) { - ["ID2"]=> - string(2) "21" -} -array(1) { - ["ID2"]=> - string(2) "22" -} -array(1) { - ["ID2"]=> - string(2) "23" -} -Got row "12". Now getting nested cursor: -bool(true) -array(1) { - ["ID2"]=> - string(2) "21" -} -array(1) { - ["ID2"]=> - string(2) "22" -} -array(1) { - ["ID2"]=> - string(2) "23" -} -Got row "13". Now getting nested cursor: -bool(true) -array(1) { - ["ID2"]=> - string(2) "21" -} -array(1) { - ["ID2"]=> - string(2) "22" -} -array(1) { - ["ID2"]=> - string(2) "23" -} - -Test 2: fetchall of nested cursor -Rows returned 3 -array(2) { - ["ID1"]=> - array(3) { - [0]=> - string(2) "11" - [1]=> - string(2) "12" - [2]=> - string(2) "13" - } - ["CURSOR"]=> - array(3) { - [0]=> - resource(%d) of type (oci8 statement) - [1]=> - resource(%d) of type (oci8 statement) - [2]=> - resource(%d) of type (oci8 statement) - } -} -Getting nested cursor -bool(true) -array(1) { - ["ID2"]=> - array(3) { - [0]=> - string(2) "21" - [1]=> - string(2) "22" - [2]=> - string(2) "23" - } -} -Getting nested cursor -bool(true) -array(1) { - ["ID2"]=> - array(3) { - [0]=> - string(2) "21" - [1]=> - string(2) "22" - [2]=> - string(2) "23" - } -} -Getting nested cursor -bool(true) -array(1) { - ["ID2"]=> - array(3) { - [0]=> - string(2) "21" - [1]=> - string(2) "22" - [2]=> - string(2) "23" - } -} -Done ---UEXPECTF-- -Test 1: Associate fetch of nested cursor -Got row "11". Now getting nested cursor: -bool(true) -array(1) { [u"ID2"]=> unicode(2) "21" } diff --git a/ext/oci8/tests/bug41069.phpt b/ext/oci8/tests/bug41069.phpt index 2bfe07a0b9..72edec5826 100644 --- a/ext/oci8/tests/bug41069.phpt +++ b/ext/oci8/tests/bug41069.phpt @@ -96,188 +96,6 @@ Test 1: non-DB link case that always worked array(3) { [0]=> array(13) { - ["C1"]=> - string(3) "111" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - NULL - ["C4"]=> - NULL - ["C5"]=> - string(1) "b" - ["C6"]=> - string(1) "c" - ["C7"]=> - NULL - ["C8"]=> - NULL - ["C9"]=> - string(10) "01/17/2008" - ["C10"]=> - string(10) "01/07/2017" - ["C12"]=> - string(4) "2222" - ["C13"]=> - NULL - ["C15"]=> - string(10) "zzzzzzzzzz" - } - [1]=> - array(13) { - ["C1"]=> - string(3) "112" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - string(8) "bbbbbbbb" - ["C4"]=> - string(7) "ccccccc" - ["C5"]=> - string(1) "d" - ["C6"]=> - string(1) "e" - ["C7"]=> - string(7) "rrrrrrr" - ["C8"]=> - NULL - ["C9"]=> - string(10) "04/16/2007" - ["C10"]=> - string(10) "04/16/2007" - ["C12"]=> - string(4) "2223" - ["C13"]=> - string(8) "xxxxxxxx" - ["C15"]=> - string(8) "zzzzzzzz" - } - [2]=> - array(13) { - ["C1"]=> - string(3) "113" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - string(10) "bbbbbbbbbb" - ["C4"]=> - string(6) "cccccc" - ["C5"]=> - string(1) "e" - ["C6"]=> - string(1) "f" - ["C7"]=> - string(4) "dddd" - ["C8"]=> - NULL - ["C9"]=> - string(10) "12/04/2006" - ["C10"]=> - string(10) "12/04/2006" - ["C12"]=> - string(4) "2224" - ["C13"]=> - NULL - ["C15"]=> - string(7) "zzzzzzz" - } -} -Test 2: Should not crash -array(3) { - [0]=> - array(13) { - ["C1"]=> - string(3) "111" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - NULL - ["C4"]=> - NULL - ["C5"]=> - string(1) "b" - ["C6"]=> - string(1) "c" - ["C7"]=> - NULL - ["C8"]=> - NULL - ["C9"]=> - string(10) "01/17/2008" - ["C10"]=> - string(10) "01/07/2017" - ["C12"]=> - string(4) "2222" - ["C13"]=> - NULL - ["C15"]=> - string(10) "zzzzzzzzzz" - } - [1]=> - array(13) { - ["C1"]=> - string(3) "112" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - string(8) "bbbbbbbb" - ["C4"]=> - string(7) "ccccccc" - ["C5"]=> - string(1) "d" - ["C6"]=> - string(1) "e" - ["C7"]=> - string(7) "rrrrrrr" - ["C8"]=> - NULL - ["C9"]=> - string(10) "04/16/2007" - ["C10"]=> - string(10) "04/16/2007" - ["C12"]=> - string(4) "2223" - ["C13"]=> - string(8) "xxxxxxxx" - ["C15"]=> - string(8) "zzzzzzzz" - } - [2]=> - array(13) { - ["C1"]=> - string(3) "113" - ["C2"]=> - string(7) "aaaaaaa" - ["C3"]=> - string(10) "bbbbbbbbbb" - ["C4"]=> - string(6) "cccccc" - ["C5"]=> - string(1) "e" - ["C6"]=> - string(1) "f" - ["C7"]=> - string(4) "dddd" - ["C8"]=> - NULL - ["C9"]=> - string(10) "12/04/2006" - ["C10"]=> - string(10) "12/04/2006" - ["C12"]=> - string(4) "2224" - ["C13"]=> - NULL - ["C15"]=> - string(7) "zzzzzzz" - } -} -Done ---UEXPECT-- -Test 1: non-DB link case that always worked -array(3) { - [0]=> - array(13) { [u"C1"]=> unicode(3) "111" [u"C2"]=> diff --git a/ext/oci8/tests/bug42134.phpt b/ext/oci8/tests/bug42134.phpt index c9aad46b95..15a319dbde 100644 --- a/ext/oci8/tests/bug42134.phpt +++ b/ext/oci8/tests/bug42134.phpt @@ -62,46 +62,6 @@ echo "Done\n"; Warning: oci_new_collection(): OCI-22303: type ""."ABC" not found in %s on line %d Normal connection: New Collection error array(4) { - ["code"]=> - int(22303) - ["message"]=> - string(34) "OCI-22303: type ""."ABC" not found" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} - -Warning: oci_new_collection(): OCI-22303: type ""."DEF" not found in %s on line %d -New connection: New Collection error -array(4) { - ["code"]=> - int(22303) - ["message"]=> - string(34) "OCI-22303: type ""."DEF" not found" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} - -Warning: oci_new_collection(): OCI-22303: type ""."GHI" not found in %s on line %d -Persistent connection: New Collection error -array(4) { - ["code"]=> - int(22303) - ["message"]=> - string(34) "OCI-22303: type ""."GHI" not found" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} -Done ---UEXPECTF-- -Warning: oci_new_collection(): OCI-22303: type ""."ABC" not found in %s on line %d -Normal connection: New Collection error -array(4) { [u"code"]=> int(22303) [u"message"]=> diff --git a/ext/oci8/tests/bug42173.phpt b/ext/oci8/tests/bug42173.phpt index d3ee7f7df7..e228d85772 100644 --- a/ext/oci8/tests/bug42173.phpt +++ b/ext/oci8/tests/bug42173.phpt @@ -65,109 +65,6 @@ echo "Done\n"; ?> --EXPECTF-- array(9) { - ["C1"]=> - string(28) "03-JAN-99 10.00.00.123000 AM" - ["C2"]=> - string(27) "04-JAN-99 10.00.00.12346 AM" - ["C3"]=> - string(35) "05-JAN-99 10.00.00.123456 AM +01:00" - ["C4"]=> - string(31) "06-JAN-99 10.00.00.12 AM -01:00" - ["C5"]=> - string(28) "%s" - ["C6"]=> - string(6) "+01-02" - ["C7"]=> - string(6) "+10-04" - ["C8"]=> - string(19) "+01 02:20:20.123000" - ["C9"]=> - string(16) "+01 02:20:20.123" -} - -Column C1 -bool(false) -string(2) "C1" -string(9) "TIMESTAMP" -int(187) -int(6) -int(0) -int(11) - -Column C2 -bool(false) -string(2) "C2" -string(9) "TIMESTAMP" -int(187) -int(5) -int(0) -int(11) - -Column C3 -bool(false) -string(2) "C3" -string(23) "TIMESTAMP WITH TIMEZONE" -int(188) -int(6) -int(0) -int(13) - -Column C4 -bool(false) -string(2) "C4" -string(23) "TIMESTAMP WITH TIMEZONE" -int(188) -int(2) -int(0) -int(13) - -Column C5 -bool(false) -string(2) "C5" -string(29) "TIMESTAMP WITH LOCAL TIMEZONE" -int(232) -int(6) -int(0) -int(11) - -Column C6 -bool(false) -string(2) "C6" -string(22) "INTERVAL YEAR TO MONTH" -int(189) -int(0) -int(2) -int(5) - -Column C7 -bool(false) -string(2) "C7" -string(22) "INTERVAL YEAR TO MONTH" -int(189) -int(0) -int(2) -int(5) - -Column C8 -bool(false) -string(2) "C8" -string(22) "INTERVAL DAY TO SECOND" -int(190) -int(6) -int(2) -int(11) - -Column C9 -bool(false) -string(2) "C9" -string(22) "INTERVAL DAY TO SECOND" -int(190) -int(3) -int(2) -int(11) -Done ---UEXPECTF-- -array(9) { [u"C1"]=> unicode(28) "03-JAN-99 10.00.00.123000 AM" [u"C2"]=> diff --git a/ext/oci8/tests/bug42841.phpt b/ext/oci8/tests/bug42841.phpt index ce567a7c7f..29424c121f 100644 --- a/ext/oci8/tests/bug42841.phpt +++ b/ext/oci8/tests/bug42841.phpt @@ -138,60 +138,6 @@ array(3) { [0]=> array(1) { [11]=> - string(2) "11" - } - [1]=> - array(1) { - [11]=> - string(2) "12" - } - [2]=> - array(1) { - [11]=> - string(2) "13" - } -} -Second attempt -array(3) { - [0]=> - array(1) { - [11]=> - string(2) "11" - } - [1]=> - array(1) { - [11]=> - string(2) "12" - } - [2]=> - array(1) { - [11]=> - string(2) "13" - } -} -Test bug 43449: Cursor as function result -array(1) { - [0]=> - array(1) { - ["DUMMY"]=> - string(1) "X" - } -} -array(1) { - [0]=> - array(1) { - ["DUMMY"]=> - string(1) "X" - } -} -Done ---UEXPECT-- -Test bug 42841: Procedure with OUT cursor parameter -First attempt -array(3) { - [0]=> - array(1) { - [11]=> unicode(2) "11" } [1]=> diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt index 88d1217ea0..a28d904aba 100644 --- a/ext/oci8/tests/coll_001.phpt +++ b/ext/oci8/tests/coll_001.phpt @@ -18,15 +18,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["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 ---UEXPECTF-- -object(OCI-Collection)#%d (1) { [u"collection"]=> resource(%d) of type (oci8 collection) } diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt index 8378cf1efa..68f74c01d7 100644 --- a/ext/oci8/tests/coll_002.phpt +++ b/ext/oci8/tests/coll_002.phpt @@ -20,16 +20,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["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 ---UEXPECTF-- -object(OCI-Collection)#%d (1) { [u"collection"]=> resource(%d) of type (oci8 collection) } diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt index 952b9d7230..4d9365ae8c 100644 --- a/ext/oci8/tests/coll_002_func.phpt +++ b/ext/oci8/tests/coll_002_func.phpt @@ -20,16 +20,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["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 ---UEXPECTF-- -object(OCI-Collection)#%d (1) { [u"collection"]=> resource(%d) of type (oci8 collection) } diff --git a/ext/oci8/tests/coll_005.phpt b/ext/oci8/tests/coll_005.phpt index 86a3bc4a3c..aa09d1f741 100644 --- a/ext/oci8/tests/coll_005.phpt +++ b/ext/oci8/tests/coll_005.phpt @@ -18,15 +18,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["collection"]=> - resource(%d) of type (oci8 collection) -} - -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) } diff --git a/ext/oci8/tests/coll_006.phpt b/ext/oci8/tests/coll_006.phpt index 2288ed3f70..7e70fe9b2f 100644 --- a/ext/oci8/tests/coll_006.phpt +++ b/ext/oci8/tests/coll_006.phpt @@ -20,16 +20,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["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 ---UEXPECTF-- -object(OCI-Collection)#%d (1) { [u"collection"]=> resource(%d) of type (oci8 collection) } diff --git a/ext/oci8/tests/coll_006_func.phpt b/ext/oci8/tests/coll_006_func.phpt index 26f6a150c9..cadd1695b0 100644 --- a/ext/oci8/tests/coll_006_func.phpt +++ b/ext/oci8/tests/coll_006_func.phpt @@ -20,16 +20,6 @@ require dirname(__FILE__)."/drop_type.inc"; ?> --EXPECTF-- object(OCI-Collection)#%d (1) { - ["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 ---UEXPECTF-- -object(OCI-Collection)#%d (1) { [u"collection"]=> resource(%d) of type (oci8 collection) } diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt index 37019e13e4..09950fa7d6 100644 --- a/ext/oci8/tests/coll_011.phpt +++ b/ext/oci8/tests/coll_011.phpt @@ -39,11 +39,5 @@ require dirname(__FILE__)."/drop_type.inc"; bool(true) bool(true) bool(true) -string(6) "string" -Done ---UEXPECT-- -bool(true) -bool(true) -bool(true) unicode(6) "string" Done diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt index e53f4adb23..ccaef0d6a0 100644 --- a/ext/oci8/tests/coll_011_func.phpt +++ b/ext/oci8/tests/coll_011_func.phpt @@ -39,11 +39,5 @@ require dirname(__FILE__)."/drop_type.inc"; bool(true) bool(true) bool(true) -string(6) "string" -Done ---UEXPECT-- -bool(true) -bool(true) -bool(true) unicode(6) "string" Done diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt index 8d59078429..0009399211 100644 --- a/ext/oci8/tests/coll_012.phpt +++ b/ext/oci8/tests/coll_012.phpt @@ -37,10 +37,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(9) "28-JUL-05" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(9) "28-JUL-05" Done diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt index 5359453606..5acdaf7a60 100644 --- a/ext/oci8/tests/coll_012_func.phpt +++ b/ext/oci8/tests/coll_012_func.phpt @@ -37,10 +37,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(9) "28-JUL-05" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(9) "28-JUL-05" Done diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt index d19837bfee..cb06d12ce9 100644 --- a/ext/oci8/tests/coll_013.phpt +++ b/ext/oci8/tests/coll_013.phpt @@ -34,10 +34,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(9) "01-JAN-05" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(9) "01-JAN-05" Done diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt index 83052a3d5c..811f7734c0 100644 --- a/ext/oci8/tests/coll_013_func.phpt +++ b/ext/oci8/tests/coll_013_func.phpt @@ -34,10 +34,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(9) "01-JAN-05" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(9) "01-JAN-05" Done diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt index cadab3a384..e2601a9159 100644 --- a/ext/oci8/tests/coll_014.phpt +++ b/ext/oci8/tests/coll_014.phpt @@ -34,10 +34,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(4) "blah" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(4) "blah" Done diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt index aaa7d28420..1144bc4e1f 100644 --- a/ext/oci8/tests/coll_014_func.phpt +++ b/ext/oci8/tests/coll_014_func.phpt @@ -34,10 +34,5 @@ require dirname(__FILE__)."/drop_type.inc"; --EXPECT-- bool(true) bool(true) -string(4) "blah" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(4) "blah" Done diff --git a/ext/oci8/tests/commit.phpt b/ext/oci8/tests/commit.phpt index 1594118e4f..73efe4b2a3 100644 --- a/ext/oci8/tests/commit.phpt +++ b/ext/oci8/tests/commit.phpt @@ -70,86 +70,6 @@ echo "Done\n"; bool(true) int(0) array(5) { - ["ID"]=> - array(0) { - } - ["VALUE"]=> - array(0) { - } - ["BLOB"]=> - array(0) { - } - ["CLOB"]=> - array(0) { - } - ["STRING"]=> - array(0) { - } -} -bool(true) -int(4) -array(5) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - [3]=> - string(1) "1" - } - ["VALUE"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - [3]=> - string(1) "1" - } - ["BLOB"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } - ["CLOB"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } - ["STRING"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } -} -Done ---UEXPECTF-- -bool(true) -int(0) -array(5) { [u"ID"]=> array(0) { } diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt index 4cfc65a075..10eb6b38c3 100644 --- a/ext/oci8/tests/commit_old.phpt +++ b/ext/oci8/tests/commit_old.phpt @@ -68,86 +68,6 @@ echo "Done\n"; bool(true) int(0) array(5) { - ["ID"]=> - array(0) { - } - ["VALUE"]=> - array(0) { - } - ["BLOB"]=> - array(0) { - } - ["CLOB"]=> - array(0) { - } - ["STRING"]=> - array(0) { - } -} -bool(true) -int(4) -array(5) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - [3]=> - string(1) "1" - } - ["VALUE"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - [3]=> - string(1) "1" - } - ["BLOB"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } - ["CLOB"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } - ["STRING"]=> - array(4) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - [3]=> - NULL - } -} -Done ---UEXPECTF-- -bool(true) -int(0) -array(5) { [u"ID"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt index 2278aeb898..42a470d8b3 100644 --- a/ext/oci8/tests/connect_scope1.phpt +++ b/ext/oci8/tests/connect_scope1.phpt @@ -77,23 +77,6 @@ echo "Done\n"; --EXPECTF-- Test 1 - oci_connect array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 - oci_connect -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt index bfa6279356..deeae3f26d 100644 --- a/ext/oci8/tests/connect_scope2.phpt +++ b/ext/oci8/tests/connect_scope2.phpt @@ -77,23 +77,6 @@ echo "Done\n"; --EXPECTF-- Test 1 - oci_pconnect array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 - oci_pconnect -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try1.phpt b/ext/oci8/tests/connect_scope_try1.phpt index f3c976bf8a..3d11228201 100644 --- a/ext/oci8/tests/connect_scope_try1.phpt +++ b/ext/oci8/tests/connect_scope_try1.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try2.phpt b/ext/oci8/tests/connect_scope_try2.phpt index 616444907b..63c3133a9d 100644 --- a/ext/oci8/tests/connect_scope_try2.phpt +++ b/ext/oci8/tests/connect_scope_try2.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try3.phpt b/ext/oci8/tests/connect_scope_try3.phpt index c99b01449f..01779cd68f 100644 --- a/ext/oci8/tests/connect_scope_try3.phpt +++ b/ext/oci8/tests/connect_scope_try3.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try4.phpt b/ext/oci8/tests/connect_scope_try4.phpt index bf9cbc7272..154e26620f 100644 --- a/ext/oci8/tests/connect_scope_try4.phpt +++ b/ext/oci8/tests/connect_scope_try4.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try5.phpt b/ext/oci8/tests/connect_scope_try5.phpt index 387aa605ac..e1a9612c98 100644 --- a/ext/oci8/tests/connect_scope_try5.phpt +++ b/ext/oci8/tests/connect_scope_try5.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 persistent connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 persistent connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/connect_scope_try6.phpt b/ext/oci8/tests/connect_scope_try6.phpt index 59fd4807a0..28d6abeb62 100644 --- a/ext/oci8/tests/connect_scope_try6.phpt +++ b/ext/oci8/tests/connect_scope_try6.phpt @@ -86,23 +86,6 @@ Test 1 Caught Exception: oci_execute(): ORA-00984: %s resource(%d) of type (oci8 persistent connection) array(1) { - ["C1"]=> - array(0) { - } -} -array(1) { - ["C1"]=> - array(1) { - [0]=> - string(1) "1" - } -} -Done ---UEXPECTF-- -Test 1 -Caught Exception: oci_execute(): ORA-00984: %s -resource(%d) of type (oci8 persistent connection) -array(1) { [u"C1"]=> array(0) { } diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt index 3210034d2f..09533394a2 100644 --- a/ext/oci8/tests/cursor_bind.phpt +++ b/ext/oci8/tests/cursor_bind.phpt @@ -79,27 +79,6 @@ if (!($s = oci_parse($c, $drop_table))) { --EXPECT-- 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" -} -bool(false) -Done ---UEXPECT-- -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt index f8c7059e18..badec68ba5 100644 --- a/ext/oci8/tests/cursors.phpt +++ b/ext/oci8/tests/cursors.phpt @@ -46,25 +46,6 @@ echo "Done\n"; ?> --EXPECTF-- array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -bool(true) - -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"]=> unicode(1) "1" [u"VALUE"]=> diff --git a/ext/oci8/tests/cursors_old.phpt b/ext/oci8/tests/cursors_old.phpt index 8be6f63059..f081126c7f 100644 --- a/ext/oci8/tests/cursors_old.phpt +++ b/ext/oci8/tests/cursors_old.phpt @@ -46,24 +46,6 @@ echo "Done\n"; ?> --EXPECTF-- array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -bool(true) - -Warning: ocifetchinto():%sORA-01002: fetch out of sequence in %scursors_old.php on line %d -array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -bool(true) -Done ---UEXPECTF-- -array(2) { [u"ID"]=> unicode(1) "1" [u"VALUE"]=> diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt index e8c10dc75d..a0ff731b58 100644 --- a/ext/oci8/tests/debug.phpt +++ b/ext/oci8/tests/debug.phpt @@ -20,19 +20,6 @@ echo "Done\n"; ?> --EXPECTF-- -OCI8 DEBUG: OCINlsEnvironmentVariableGet at (%s:%d) -OCI8 DEBUG L1: Got a cached connection: (%s) at (%s:%d) -Done -OCI8 DEBUG: OCISessionRelease at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCISessionPoolDestroy at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) -OCI8 DEBUG: OCIHandleFree at (%s:%d) ---UEXPECTF-- OCI8 DEBUG L1: Got a cached connection: (%s) at (%s:%d) Done OCI8 DEBUG: OCISessionRelease at (%s:%d) diff --git a/ext/oci8/tests/define.phpt b/ext/oci8/tests/define.phpt index db775758f2..f9fb28f496 100644 --- a/ext/oci8/tests/define.phpt +++ b/ext/oci8/tests/define.phpt @@ -37,8 +37,5 @@ echo "Done\n"; ?> --EXPECT-- -string(4) "some" -Done ---UEXPECT-- unicode(4) "some" Done diff --git a/ext/oci8/tests/define1.phpt b/ext/oci8/tests/define1.phpt index 089c8c2914..a0c74dc080 100644 --- a/ext/oci8/tests/define1.phpt +++ b/ext/oci8/tests/define1.phpt @@ -48,16 +48,5 @@ bool(false) Warning: oci_define_by_name() expects at least 3 parameters, 2 given in %s on line %d NULL -string(4) "some" -Done ---UEXPECTF-- -bool(true) -bool(false) - -Warning: oci_define_by_name(): Column name cannot be empty in %s on line %d -bool(false) - -Warning: oci_define_by_name() expects at least 3 parameters, 2 given in %s on line %d -NULL unicode(4) "some" Done diff --git a/ext/oci8/tests/define2.phpt b/ext/oci8/tests/define2.phpt index 2a6fa9f49d..7b1965b4a1 100644 --- a/ext/oci8/tests/define2.phpt +++ b/ext/oci8/tests/define2.phpt @@ -67,25 +67,6 @@ oci_execute($stmt); echo "Done\n"; ?> --EXPECTF-- -string(32) "88b274d7a257ac6f70435b83abd4e26e" -Test 1 -bool(true) -string(300) "GIF89%s" -file md5:88b274d7a257ac6f70435b83abd4e26e -Test 2 -bool(true) -string(300) "GIF89%s" -file md5:88b274d7a257ac6f70435b83abd4e26e -Test 3 - test repeatability -bool(true) -string(600) "47494638396178004300E66A007F82B839374728252ACCCDE2A1A4CBD3D5E7B2B4D44342588386B98283B35252729092C2C2C4DEAAACD04C4B635B5C83DDDEEC3B383C6E71A56A6D9D61638D7579B17B7EB5E5E6F0999CC68C8DC1B9BAD96B6B924E4E6B7174A97A7AA3888BBD7274A37473988E90C15A5B7EE2E3EF7B7DADA4A5D06D70A27276AC9596C8BBBDD97478AE8588BB9295C3D8D9EA9292C46466926B6E9FA5A8CE9496C52E2B2F535168B3B4D76C6A8C5C5B768A8DBF666896686A9A9C9FC8312E39AEB0D39C9CCD5556789EA1CA9699C58182AF6769973F3D50BCBEDA5E60899899C88C8EBF898ABA57587CB6B7D7D5D7E8221E206C6F9ECED0E4BFC0DC777BB47678A75F5E7D9999CC6E6F987377AE221E1FFFFFFF908E8F595657C7C6C7EEEEF5D5D4D5F6F6" -file md5:80bb3201e2a8bdcb8ab3e1a44a82bb8a -Test 4 - wrong type -bool(true) - -Warning: oci_fetch(): ORA-00932: inconsistent datatypes%s on line %d -Done ---UEXPECTF-- unicode(32) "88b274d7a257ac6f70435b83abd4e26e" Test 1 bool(true) diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt index 71225b27bc..ac8be464fa 100644 --- a/ext/oci8/tests/define3.phpt +++ b/ext/oci8/tests/define3.phpt @@ -75,34 +75,6 @@ echo "Done\n"; ?> --EXPECTF-- -string(32) "614fcbba1effb7caa27ef0ef25c27fcf" -string(32) "06d4f219d946c74d748d43932cd9dcb2" -Test 1 -bool(true) -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -file md5:614fcbba1effb7caa27ef0ef25c27fcf -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -file md5:06d4f219d946c74d748d43932cd9dcb2 -Test 2 -bool(true) - -Warning: oci_fetch(): ORA-00932: %s on line %d -Test 3 -bool(true) -file md5:614fcbba1effb7caa27ef0ef25c27fcf -file md5:06d4f219d946c74d748d43932cd9dcb2 -Test 4 -bool(true) -file md5:614fcbba1effb7caa27ef0ef25c27fcf -file md5:06d4f219d946c74d748d43932cd9dcb2 -Done ---UEXPECTF-- unicode(32) "614fcbba1effb7caa27ef0ef25c27fcf" unicode(32) "06d4f219d946c74d748d43932cd9dcb2" Test 1 diff --git a/ext/oci8/tests/define4.phpt b/ext/oci8/tests/define4.phpt index 27d7a0c672..16e0823244 100644 --- a/ext/oci8/tests/define4.phpt +++ b/ext/oci8/tests/define4.phpt @@ -51,23 +51,6 @@ echo "Done\n"; Test 1 bool(true) Test 2 -string(4) "1234" -string(4) "some" -string(4) "some" -string(4) "some" -string(4) "1234" -string(4) "some" -Test 3 -bool(true) -string(4) "some" - -Warning: oci_result(): %d is not a valid oci8 statement resource in %s on line %d -bool(false) -Done ---UEXPECTF-- -Test 1 -bool(true) -Test 2 unicode(4) "1234" unicode(4) "some" unicode(4) "some" diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt index d6b1414082..e717842590 100644 --- a/ext/oci8/tests/define5.phpt +++ b/ext/oci8/tests/define5.phpt @@ -53,20 +53,6 @@ bool(true) Test 1 - must do define before execute bool(true) NULL -string(4) "some" -Test 2 - normal define order -bool(true) -string(4) "some" -Test 3 - no new define done -string(4) "some" -string(5) "thing" -Done ---UEXPECT-- -bool(true) -bool(true) -Test 1 - must do define before execute -bool(true) -NULL unicode(4) "some" Test 2 - normal define order bool(true) diff --git a/ext/oci8/tests/define_old.phpt b/ext/oci8/tests/define_old.phpt index fc3e2b0da9..825d0b0787 100644 --- a/ext/oci8/tests/define_old.phpt +++ b/ext/oci8/tests/define_old.phpt @@ -37,8 +37,5 @@ echo "Done\n"; ?> --EXPECT-- -string(4) "some" -Done ---UEXPECT-- unicode(4) "some" Done diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt index 1675fd1cab..6222eea420 100644 --- a/ext/oci8/tests/descriptors.phpt +++ b/ext/oci8/tests/descriptors.phpt @@ -40,15 +40,6 @@ echo "Done\n"; ?> --EXPECTF-- array(1) { - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -Done ---UEXPECTF-- -array(1) { [u"BLOB"]=> object(OCI-Lob)#%d (1) { [u"descriptor"]=> diff --git a/ext/oci8/tests/drcp_cclass1.phpt b/ext/oci8/tests/drcp_cclass1.phpt index ff45f73f73..130cbb3294 100644 --- a/ext/oci8/tests/drcp_cclass1.phpt +++ b/ext/oci8/tests/drcp_cclass1.phpt @@ -53,34 +53,6 @@ echo "Done\n"; --EXPECTF-- Test 1 array(1) { - ["DUMMY"]=> - array(1) { - [0]=> - string(1) "X" - } -} -Test 2 -array(1) { - ["DUMMY"]=> - array(1) { - [0]=> - string(1) "X" - } -} -Test 3 -array(1) { - ["CCLASS_NAME"]=> - array(2) { - [0]=> - string(21) "%s.cc1_%d" - [1]=> - string(21) "%s.cc2_%d" - } -} -Done ---UEXPECTF-- -Test 1 -array(1) { [u"DUMMY"]=> array(1) { [0]=> diff --git a/ext/oci8/tests/drcp_characterset.phpt b/ext/oci8/tests/drcp_characterset.phpt index c2ac1e1863..3fb494e3f2 100644 --- a/ext/oci8/tests/drcp_characterset.phpt +++ b/ext/oci8/tests/drcp_characterset.phpt @@ -60,14 +60,6 @@ resource(%d) of type (oci8 connection) resource(%d) of type (oci8 persistent connection) resource(%d) of type (oci8 connection) resource(%d) of type (oci8 persistent connection) -First and third connections are different: OK -Second and fourth connections are different: OK -Done ---UEXPECTF-- -resource(%d) of type (oci8 connection) -resource(%d) of type (oci8 persistent connection) -resource(%d) of type (oci8 connection) -resource(%d) of type (oci8 persistent connection) First and third connections share a resource: NOT OK Second and fourth connections share a resource: NOT OK Done diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt index a2bd65167c..17f30cd145 100644 --- a/ext/oci8/tests/error.phpt +++ b/ext/oci8/tests/error.phpt @@ -22,23 +22,6 @@ echo "Done\n"; ?> --EXPECTF-- -resource(%s) of type (oci8 connection) -resource(%s) of type (oci8 statement) - -Warning: oci_execute(): ORA-00900: invalid SQL statement in %s on line %d -bool(false) -array(4) { - ["code"]=> - int(900) - ["message"]=> - string(32) "ORA-00900: invalid SQL statement" - ["offset"]=> - int(0) - ["sqltext"]=> - string(12) "WRONG SYNTAX" -} -Done ---UEXPECTF-- resource(%d) of type (oci8 connection) resource(%d) of type (oci8 statement) diff --git a/ext/oci8/tests/error1.phpt b/ext/oci8/tests/error1.phpt index f160349b41..c8ca045b52 100644 --- a/ext/oci8/tests/error1.phpt +++ b/ext/oci8/tests/error1.phpt @@ -15,20 +15,6 @@ echo "Done\n"; Warning: oci_connect(): ORA-12154: TNS:could not resolve %s in %s on line %d bool(false) array(4) { - ["code"]=> - int(12154) - ["message"]=> - string(%d) "ORA-12154: TNS:could not resolve %s" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} -Done ---UEXPECTF-- -Warning: oci_connect(): ORA-12154: TNS:could not resolve %s in %s on line %d -bool(false) -array(4) { [u"code"]=> int(12154) [u"message"]=> diff --git a/ext/oci8/tests/error_old.phpt b/ext/oci8/tests/error_old.phpt index e1e613cbb7..6f36a54805 100644 --- a/ext/oci8/tests/error_old.phpt +++ b/ext/oci8/tests/error_old.phpt @@ -22,23 +22,6 @@ echo "Done\n"; ?> --EXPECTF-- -resource(%s) of type (oci8 connection) -resource(%s) of type (oci8 statement) - -Warning: ociexecute(): ORA-00900: invalid SQL statement in %s on line %d -bool(false) -array(4) { - ["code"]=> - int(900) - ["message"]=> - string(32) "ORA-00900: invalid SQL statement" - ["offset"]=> - int(0) - ["sqltext"]=> - string(12) "WRONG SYNTAX" -} -Done ---UEXPECTF-- resource(%d) of type (oci8 connection) resource(%d) of type (oci8 statement) diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt index 4856e5cc51..deacde200a 100644 --- a/ext/oci8/tests/fetch.phpt +++ b/ext/oci8/tests/fetch.phpt @@ -47,14 +47,6 @@ require dirname(__FILE__).'/drop_table.inc'; echo "Done\n"; ?> --EXPECT-- -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -string(1) "1" -Done ---UEXPECT-- unicode(1) "1" unicode(1) "1" unicode(1) "1" diff --git a/ext/oci8/tests/fetch_all.phpt b/ext/oci8/tests/fetch_all.phpt index 234eacc5d5..63452ec749 100644 --- a/ext/oci8/tests/fetch_all.phpt +++ b/ext/oci8/tests/fetch_all.phpt @@ -52,104 +52,6 @@ echo "Done\n"; --EXPECT-- int(3) array(5) { - ["ID"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["VALUE"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["BLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["CLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["STRING"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } -} -int(3) -array(5) { - ["ID"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["VALUE"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["BLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["CLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["STRING"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } -} -Done ---UEXPECT-- -int(3) -array(5) { [u"ID"]=> array(3) { [0]=> diff --git a/ext/oci8/tests/fetch_all2.phpt b/ext/oci8/tests/fetch_all2.phpt index 787abf8763..8e1369b0d6 100644 --- a/ext/oci8/tests/fetch_all2.phpt +++ b/ext/oci8/tests/fetch_all2.phpt @@ -53,196 +53,6 @@ echo "Done\n"; --EXPECT-- int(3) array(5) { - ["ID"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["VALUE"]=> - array(3) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - string(1) "1" - } - ["BLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["CLOB"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } - ["STRING"]=> - array(3) { - [0]=> - NULL - [1]=> - NULL - [2]=> - NULL - } -} -int(3) -array(3) { - [0]=> - array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL - } - [1]=> - array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL - } - [2]=> - array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL - } -} -int(0) -array(0) { -} -int(2) -array(2) { - [0]=> - array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - } - [1]=> - array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL - } -} -int(2) -array(5) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - } - [1]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - } - [2]=> - array(2) { - [0]=> - NULL - [1]=> - NULL - } - [3]=> - array(2) { - [0]=> - NULL - [1]=> - NULL - } - [4]=> - array(2) { - [0]=> - NULL - [1]=> - NULL - } -} -int(1) -array(5) { - [0]=> - array(1) { - [0]=> - string(1) "1" - } - [1]=> - array(1) { - [0]=> - string(1) "1" - } - [2]=> - array(1) { - [0]=> - NULL - } - [3]=> - array(1) { - [0]=> - NULL - } - [4]=> - array(1) { - [0]=> - NULL - } -} -Done ---UEXPECT-- -int(3) -array(5) { [u"ID"]=> array(3) { [0]=> diff --git a/ext/oci8/tests/fetch_all3.phpt b/ext/oci8/tests/fetch_all3.phpt index f266d62e8c..51f904baa9 100644 --- a/ext/oci8/tests/fetch_all3.phpt +++ b/ext/oci8/tests/fetch_all3.phpt @@ -113,472 +113,6 @@ echo "Done\n"; None int(4) array(2) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - ["VALUE"]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_ASSOC -int(4) -array(2) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - ["VALUE"]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_COLUMN -int(4) -array(2) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - ["VALUE"]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_COLUMN|OCI_ASSOC -int(4) -array(2) { - ["ID"]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - ["VALUE"]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_COLUMN|OCI_NUM -int(4) -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - [1]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_COLUMN|OCI_NUM|OCI_ASSOC -int(4) -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - [1]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW -int(4) -array(4) { - [0]=> - array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(2) "-1" - } - [1]=> - array(2) { - ["ID"]=> - string(1) "2" - ["VALUE"]=> - string(2) "-2" - } - [2]=> - array(2) { - ["ID"]=> - string(1) "3" - ["VALUE"]=> - string(2) "-3" - } - [3]=> - array(2) { - ["ID"]=> - string(1) "4" - ["VALUE"]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_ASSOC -int(4) -array(4) { - [0]=> - array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(2) "-1" - } - [1]=> - array(2) { - ["ID"]=> - string(1) "2" - ["VALUE"]=> - string(2) "-2" - } - [2]=> - array(2) { - ["ID"]=> - string(1) "3" - ["VALUE"]=> - string(2) "-3" - } - [3]=> - array(2) { - ["ID"]=> - string(1) "4" - ["VALUE"]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_FETCHSTATEMENT_BY_COLUMN -int(4) -array(4) { - [0]=> - array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(2) "-1" - } - [1]=> - array(2) { - ["ID"]=> - string(1) "2" - ["VALUE"]=> - string(2) "-2" - } - [2]=> - array(2) { - ["ID"]=> - string(1) "3" - ["VALUE"]=> - string(2) "-3" - } - [3]=> - array(2) { - ["ID"]=> - string(1) "4" - ["VALUE"]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_FETCHSTATEMENT_BY_COLUMN|OCI_ASSOC -int(4) -array(4) { - [0]=> - array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(2) "-1" - } - [1]=> - array(2) { - ["ID"]=> - string(1) "2" - ["VALUE"]=> - string(2) "-2" - } - [2]=> - array(2) { - ["ID"]=> - string(1) "3" - ["VALUE"]=> - string(2) "-3" - } - [3]=> - array(2) { - ["ID"]=> - string(1) "4" - ["VALUE"]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_FETCHSTATEMENT_BY_COLUMN|OCI_NUM -int(4) -array(4) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(2) "-1" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(2) "-2" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(2) "-3" - } - [3]=> - array(2) { - [0]=> - string(1) "4" - [1]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_FETCHSTATEMENT_BY_COLUMN|OCI_NUM|OCI_ASSOC -int(4) -array(4) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(2) "-1" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(2) "-2" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(2) "-3" - } - [3]=> - array(2) { - [0]=> - string(1) "4" - [1]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_NUM -int(4) -array(4) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(2) "-1" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(2) "-2" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(2) "-3" - } - [3]=> - array(2) { - [0]=> - string(1) "4" - [1]=> - string(2) "-4" - } -} -OCI_FETCHSTATEMENT_BY_ROW|OCI_NUM|OCI_ASSOC -int(4) -array(4) { - [0]=> - array(2) { - [0]=> - string(1) "1" - [1]=> - string(2) "-1" - } - [1]=> - array(2) { - [0]=> - string(1) "2" - [1]=> - string(2) "-2" - } - [2]=> - array(2) { - [0]=> - string(1) "3" - [1]=> - string(2) "-3" - } - [3]=> - array(2) { - [0]=> - string(1) "4" - [1]=> - string(2) "-4" - } -} -OCI_NUM -int(4) -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - [1]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -OCI_NUM|OCI_ASSOC -int(4) -array(2) { - [0]=> - array(4) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - } - [1]=> - array(4) { - [0]=> - string(2) "-1" - [1]=> - string(2) "-2" - [2]=> - string(2) "-3" - [3]=> - string(2) "-4" - } -} -Done ---UEXPECT-- -None -int(4) -array(2) { [u"ID"]=> array(4) { [0]=> diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt index 07b3e461bb..846bc2ab4c 100644 --- a/ext/oci8/tests/fetch_array.phpt +++ b/ext/oci8/tests/fetch_array.phpt @@ -79,236 +79,6 @@ echo "Done\n"; --EXPECT-- array(10) { [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["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) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(2) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(4) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -Done ---UEXPECT-- -array(10) { - [0]=> unicode(1) "1" [u"ID"]=> unicode(1) "1" diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt index 62d9a332ec..4cda6afa09 100644 --- a/ext/oci8/tests/fetch_assoc.phpt +++ b/ext/oci8/tests/fetch_assoc.phpt @@ -44,44 +44,6 @@ echo "Done\n"; ?> --EXPECT-- array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -Done ---UEXPECT-- -array(5) { [u"ID"]=> unicode(1) "1" [u"VALUE"]=> diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt index 74505423d4..aa0ceaed85 100644 --- a/ext/oci8/tests/fetch_into.phpt +++ b/ext/oci8/tests/fetch_into.phpt @@ -52,38 +52,6 @@ echo "Done\n"; int(5) array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -int(5) -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -Done ---UEXPECT-- -int(5) -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt index 3f8d65c80f..7642af3d3d 100644 --- a/ext/oci8/tests/fetch_into1.phpt +++ b/ext/oci8/tests/fetch_into1.phpt @@ -62,138 +62,6 @@ echo "Done\n"; int(5) array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -int(5) -array(2) { - ["ID"]=> - string(1) "1" - ["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" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" -} -int(5) -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -int(5) -array(10) { - [0]=> - string(1) "1" - ["ID"]=> - string(1) "1" - [1]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - [2]=> - NULL - ["BLOB"]=> - NULL - [3]=> - NULL - ["CLOB"]=> - NULL - [4]=> - NULL - ["STRING"]=> - NULL -} -int(5) -array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -int(5) -array(5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -int(5) -array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -Done ---UEXPECT-- -int(5) -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index 66ed2f88e8..71f93762ce 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -63,28 +63,6 @@ NULL int(5) array(2) { [0]=> - string(1) "1" - [1]=> - string(1) "1" -} -Done ---UEXPECTF-- -Warning: ocifetchinto() expects at least 2 parameters, 1 given in %s on line %d -NULL - -Notice: Undefined variable: all in %s on line %d -NULL - -Warning: ocifetchinto() expects at most 3 parameters, 4 given in %s on line %d -NULL -NULL - -Warning: ocifetchinto(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) -NULL -int(5) -array(2) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt index c4cceb0859..f7543fe3e6 100644 --- a/ext/oci8/tests/fetch_object.phpt +++ b/ext/oci8/tests/fetch_object.phpt @@ -44,44 +44,6 @@ echo "Done\n"; ?> --EXPECTF-- object(stdClass)#%d (5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -object(stdClass)#%d (5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -object(stdClass)#%d (5) { - ["ID"]=> - string(1) "1" - ["VALUE"]=> - string(1) "1" - ["BLOB"]=> - NULL - ["CLOB"]=> - NULL - ["STRING"]=> - NULL -} -Done ---UEXPECTF-- -object(stdClass)#%d (5) { [u"ID"]=> unicode(1) "1" [u"VALUE"]=> diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt index 35a669a59a..4425b32e42 100644 --- a/ext/oci8/tests/fetch_row.phpt +++ b/ext/oci8/tests/fetch_row.phpt @@ -45,44 +45,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -array(5) { - [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -Done ---UEXPECT-- -array(5) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt index 6dd857f2f1..ff48ae5c11 100644 --- a/ext/oci8/tests/field_funcs.phpt +++ b/ext/oci8/tests/field_funcs.phpt @@ -57,55 +57,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -bool(false) -string(2) "ID" -string(6) "NUMBER" -int(2) -int(-127) -int(0) -int(22) -bool(false) -string(5) "VALUE" -string(6) "NUMBER" -int(2) -int(-127) -int(0) -int(22) -bool(true) -string(4) "BLOB" -string(4) "BLOB" -int(113) -int(0) -int(0) -int(4000) -bool(true) -string(4) "CLOB" -string(4) "CLOB" -int(112) -int(0) -int(0) -int(4000) -bool(true) -string(6) "STRING" -string(8) "VARCHAR2" -int(1) -int(0) -int(0) -int(10) -Done ---UEXPECT-- -array(5) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/field_funcs1.phpt b/ext/oci8/tests/field_funcs1.phpt index c802c09580..c34216e95b 100644 --- a/ext/oci8/tests/field_funcs1.phpt +++ b/ext/oci8/tests/field_funcs1.phpt @@ -79,107 +79,6 @@ echo "Done\n"; --EXPECTF-- array(5) { [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} - -Warning: oci_field_is_null(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_name(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_type(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_type_raw(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_scale(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_precision(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_size(): Invalid column index "-1" in %s on line %d -bool(false) - -Warning: oci_field_is_null(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_name(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_type(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_type_raw(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_scale(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_precision(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_size(): Invalid column name "none" in %s on line %d -bool(false) - -Warning: oci_field_is_null(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_name(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_type(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_type_raw(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_scale(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_precision(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_size(): supplied resource is not a valid oci8 statement resource in %s on line %d -bool(false) - -Warning: oci_field_is_null(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_name(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_type(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_type_raw(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_scale(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_precision(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_size(): Invalid column index "0" in %s on line %d -bool(false) - -Warning: oci_field_size() expects exactly 2 parameters, 1 given in %s on line %d -bool(false) -Done ---UEXPECTF-- -array(5) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt index 207b8de2fb..75c86bf6f3 100644 --- a/ext/oci8/tests/field_funcs_old.phpt +++ b/ext/oci8/tests/field_funcs_old.phpt @@ -57,55 +57,6 @@ echo "Done\n"; --EXPECT-- array(5) { [0]=> - string(1) "1" - [1]=> - string(1) "1" - [2]=> - NULL - [3]=> - NULL - [4]=> - NULL -} -bool(false) -string(2) "ID" -string(6) "NUMBER" -int(2) -int(-127) -int(0) -int(22) -bool(false) -string(5) "VALUE" -string(6) "NUMBER" -int(2) -int(-127) -int(0) -int(22) -bool(true) -string(4) "BLOB" -string(4) "BLOB" -int(113) -int(0) -int(0) -int(4000) -bool(true) -string(4) "CLOB" -string(4) "CLOB" -int(112) -int(0) -int(0) -int(4000) -bool(true) -string(6) "STRING" -string(8) "VARCHAR2" -int(1) -int(0) -int(0) -int(10) -Done ---UEXPECT-- -array(5) { - [0]=> unicode(1) "1" [1]=> unicode(1) "1" diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index 08fd84a623..10694ee38a 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -48,24 +48,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(0) - -Warning: OCI-Lob::write() expects parameter 2 to be long, string given in %slob_002.php on line %d -NULL -int(4) -int(40000) -int(40004) - -Warning: OCI-Lob::seek() expects parameter 1 to be long, string given in %slob_002.php on line %d -NULL -bool(false) -int(40004) -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt index c44afe2bb8..e7ac224e40 100644 --- a/ext/oci8/tests/lob_004.phpt +++ b/ext/oci8/tests/lob_004.phpt @@ -55,31 +55,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(4) -bool(true) -int(3) -bool(true) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -bool(true) -string(4) "strt" -string(8) "strtstrt" -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt index 2ddfc577e4..9836521ee8 100644 --- a/ext/oci8/tests/lob_005.phpt +++ b/ext/oci8/tests/lob_005.phpt @@ -39,21 +39,6 @@ echo "Done\n"; array(2) { [0]=> object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -bool(true) -Done ---UEXPECTF-- -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt index e837826e71..42cfb3bac7 100644 --- a/ext/oci8/tests/lob_007.phpt +++ b/ext/oci8/tests/lob_007.phpt @@ -43,29 +43,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(0) -int(7000) -int(7000) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -int(7000) -int(7000) -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt index 0755b4452f..36ea2e1f71 100644 --- a/ext/oci8/tests/lob_008.phpt +++ b/ext/oci8/tests/lob_008.phpt @@ -45,26 +45,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(7000) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -int(7000) -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt index 21df6a7b96..01563fac62 100644 --- a/ext/oci8/tests/lob_009.phpt +++ b/ext/oci8/tests/lob_009.phpt @@ -42,33 +42,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -bool(true) -bool(true) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(43) "this -is -a -test -file for -test lob_009.phpt -" -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_011.phpt b/ext/oci8/tests/lob_011.phpt index cdd08de732..1e82905021 100644 --- a/ext/oci8/tests/lob_011.phpt +++ b/ext/oci8/tests/lob_011.phpt @@ -72,17 +72,6 @@ string(32) "some string here. string, I said" array(2) { [0]=> string(32) "some string here. string, I said" - ["BLOB"]=> - 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" } diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt index e92383b853..96d5030c07 100644 --- a/ext/oci8/tests/lob_015.phpt +++ b/ext/oci8/tests/lob_015.phpt @@ -47,23 +47,6 @@ Warning: oci_bind_by_name() expects at least 3 parameters, 1 given in %s on line Warning: oci_execute(): ORA-00932: inconsistent datatypes: expected NUMBER got BLOB in %s on line %d object(OCI-Lob)#%d (1) { - ["descriptor"]=> - 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) } diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt index ffaf04f992..aaa1b96cad 100644 --- a/ext/oci8/tests/lob_016.phpt +++ b/ext/oci8/tests/lob_016.phpt @@ -51,22 +51,6 @@ echo "Done\n"; ?> --EXPECTF-- array(2) { - ["LOB_1"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["LOB_2"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(5) "first" -string(6) "second" -Done ---UEXPECTF-- -array(2) { [u"LOB_1"]=> object(OCI-Lob)#%d (1) { [u"descriptor"]=> diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt index 4db7830b15..2c7f887ce5 100644 --- a/ext/oci8/tests/lob_017.phpt +++ b/ext/oci8/tests/lob_017.phpt @@ -53,22 +53,6 @@ echo "Done\n"; ?> --EXPECTF-- array(2) { - ["LOB_1"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["LOB_2"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(5) "first" -string(6) "second" -Done ---UEXPECTF-- -array(2) { [u"LOB_1"]=> object(OCI-Lob)#%d (1) { [u"descriptor"]=> diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt index d549a51e80..0797bb93a5 100644 --- a/ext/oci8/tests/lob_018.phpt +++ b/ext/oci8/tests/lob_018.phpt @@ -60,12 +60,6 @@ echo "Done\n"; ?> --EXPECTF-- -string(4) "data" -string(9) "long data" -string(9) "long data" -string(4) "data" -Done ---UEXPECTF-- unicode(4) "data" unicode(9) "long data" unicode(9) "long data" diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt index da0d23b4a1..766d56bcbd 100644 --- a/ext/oci8/tests/lob_022.phpt +++ b/ext/oci8/tests/lob_022.phpt @@ -73,19 +73,6 @@ Warning: oci_lob_save() expects at least 2 parameters, 0 given in %s on line %d Warning: oci_lob_save(): Unable to find descriptor property in %s on line %d Warning: OCI-Lob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d -string(4) "data" -string(9) "long data" -string(9) "long data" -string(4) "data" -Done ---UEXPECTF-- -Warning: OCI-Lob::save() expects at least 1 parameter, 0 given in %s on line %d - -Warning: oci_lob_save() expects at least 2 parameters, 0 given in %s on line %d - -Warning: oci_lob_save(): Unable to find descriptor property in %s on line %d - -Warning: OCI-Lob::save(): Offset parameter must be greater than or equal to 0 in %s on line %d unicode(4) "data" unicode(9) "long data" unicode(9) "long data" diff --git a/ext/oci8/tests/lob_023.phpt b/ext/oci8/tests/lob_023.phpt index 6d33d69880..097dd4907d 100644 --- a/ext/oci8/tests/lob_023.phpt +++ b/ext/oci8/tests/lob_023.phpt @@ -47,43 +47,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -bool(true) -bool(true) - -Warning: OCI-Lob::import() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: oci_lob_import() expects exactly 2 parameters, 1 given in %s on line %d -NULL -bool(true) - -Warning: oci_lob_import(): Unable to find descriptor property in %s on line %d -bool(false) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(43) "this -is -a -test -file for -test lob_009.phpt -" -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_024.phpt b/ext/oci8/tests/lob_024.phpt index 535196e4c6..1e0751b899 100644 --- a/ext/oci8/tests/lob_024.phpt +++ b/ext/oci8/tests/lob_024.phpt @@ -46,35 +46,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(0) -int(7000) -int(7000) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -int(7000) -int(7000) - -Warning: oci_lob_load() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: oci_lob_load(): Unable to find descriptor property in %s on line %d -bool(false) -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_025.phpt b/ext/oci8/tests/lob_025.phpt index 64ecbca4ad..4c3cb6c23c 100644 --- a/ext/oci8/tests/lob_025.phpt +++ b/ext/oci8/tests/lob_025.phpt @@ -53,40 +53,6 @@ int(7000) array(2) { [0]=> object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(2) "st" - -Warning: oci_lob_read() expects exactly 2 parameters, 1 given in %s on line %d -NULL - -Warning: oci_lob_read() expects exactly 2 parameters, 0 given in %s on line %d -NULL -bool(false) - -Warning: oci_lob_eof() expects exactly 1 parameter, 0 given in %s on line %d -NULL - -Warning: oci_lob_read(): Unable to find descriptor property in %s on line %d -bool(false) - -Warning: oci_lob_eof(): Unable to find descriptor property in %s on line %d -bool(false) -Done ---UEXPECTF-- -int(0) -int(7000) -int(7000) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt index bd52d7739c..9625f14a76 100644 --- a/ext/oci8/tests/lob_026.phpt +++ b/ext/oci8/tests/lob_026.phpt @@ -60,46 +60,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(4) - -Warning: oci_lob_rewind() expects exactly 1 parameter, 0 given in %s on line %d -NULL -bool(true) -int(3) - -Warning: oci_lob_seek() expects parameter 1 to be OCI-Lob, integer given in %s on line %d -NULL -bool(true) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} - -Warning: oci_lob_append() expects exactly 2 parameters, 0 given in %s on line %d -NULL - -Warning: oci_lob_append() expects exactly 2 parameters, 1 given in %s on line %d -NULL -bool(true) - -Warning: oci_lob_read() expects exactly 2 parameters, 1 given in %s on line %d -NULL -string(4) "strt" -string(8) "strtstrt" -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_027.phpt b/ext/oci8/tests/lob_027.phpt index dc7d954fb6..7792124611 100644 --- a/ext/oci8/tests/lob_027.phpt +++ b/ext/oci8/tests/lob_027.phpt @@ -65,44 +65,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -int(72) -array(2) { - [0]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } - ["BLOB"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -string(72) "this is a biiiig faaat test string. why are you reading it, I wonder? =)" -bool(true) -string(40) "this is a biiiig faaat test string. why " -bool(true) -string(30) "this is a biiiig faaat test st" -bool(true) -string(20) "this is a biiiig faa" -bool(true) -string(10) "this is a " -bool(true) -string(0) "" - -Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d -bool(false) -string(0) "" - -Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d -bool(false) -bool(true) -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_028.phpt b/ext/oci8/tests/lob_028.phpt index e175632b09..4b6506f970 100644 --- a/ext/oci8/tests/lob_028.phpt +++ b/ext/oci8/tests/lob_028.phpt @@ -46,44 +46,6 @@ echo "Done\n"; ?> --EXPECTF-- object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} - -Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d -NULL - -Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d -NULL - -Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d -NULL - -Warning: oci_new_descriptor(): Unknown descriptor type %d in %s on line %d -NULL -Done ---UEXPECTF-- -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_035.phpt b/ext/oci8/tests/lob_035.phpt index 2d1bfcfce9..d01871898d 100644 --- a/ext/oci8/tests/lob_035.phpt +++ b/ext/oci8/tests/lob_035.phpt @@ -80,33 +80,6 @@ echo "Done\n"; ?> --EXPECTF-- -int(32) - -Warning: oci_lob_copy(): OCI_INVALID_HANDLE in %s on line %d -bool(false) - -Warning: oci_lob_copy(): OCI_INVALID_HANDLE in %s on line %d -bool(false) -bool(false) - -Warning: oci_lob_copy(): Length parameter must be greater than 0 in %s on line %d -bool(false) -bool(true) - -Warning: oci_lob_size() expects exactly 1 parameter, 0 given in %s on line %d -NULL -int(0) - -Warning: oci_lob_size(): Unable to find descriptor property in %s on line %d -bool(false) -array(2) { - [0]=> - string(0) "" - ["BLOB"]=> - string(0) "" -} -Done ---UEXPECTF-- int(64) Warning: oci_lob_copy(): OCI_INVALID_HANDLE in %s on line %d diff --git a/ext/oci8/tests/lob_036.phpt b/ext/oci8/tests/lob_036.phpt index 5c2972e467..2db7b4b1e4 100644 --- a/ext/oci8/tests/lob_036.phpt +++ b/ext/oci8/tests/lob_036.phpt @@ -34,11 +34,6 @@ echo "Done\n"; ?> --EXPECT-- -int(4) -bool(true) -int(4) -Done ---UEXPECT-- int(8) bool(true) int(8) diff --git a/ext/oci8/tests/lob_039.phpt b/ext/oci8/tests/lob_039.phpt index bc2df2f845..e7cc3a3608 100644 --- a/ext/oci8/tests/lob_039.phpt +++ b/ext/oci8/tests/lob_039.phpt @@ -52,24 +52,6 @@ int(11) int(11) bool(true) array(1) { - ["CLOB"]=> - array(3) { - [0]=> - string(11) "clob test 1" - [1]=> - string(22) " clob test 2" - [2]=> - string(33) " clob test 3" - } -} -Done ---UEXPECT-- -Test 1: CLOB -int(11) -int(11) -int(11) -bool(true) -array(1) { [u"CLOB"]=> array(3) { [0]=> diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt index 48bf4ddbf6..98739d00c8 100644 --- a/ext/oci8/tests/lob_041.phpt +++ b/ext/oci8/tests/lob_041.phpt @@ -76,27 +76,6 @@ test data Test 2 - implicit statement close test data object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} - -Test 3 - no preallocated descriptor -test data -array(1) { - ["C1"]=> - object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) - } -} -Done ---UEXPECTF-- -Test 1 - explicit statement close -test data - -Test 2 - implicit statement close -test data -object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) } diff --git a/ext/oci8/tests/lob_042.phpt b/ext/oci8/tests/lob_042.phpt index 4a90bcdc9b..4946caf850 100644 --- a/ext/oci8/tests/lob_042.phpt +++ b/ext/oci8/tests/lob_042.phpt @@ -42,7 +42,7 @@ require(dirname(__FILE__).'/drop_table.inc'); echo "Done\n"; ?> ---UEXPECTF-- +--EXPECTF-- object(OCI-Lob)#%d (1) { [u"descriptor"]=> resource(%d) of type (oci8 descriptor) @@ -69,30 +69,3 @@ bool(false) Warning: OCI-Lob::savefile(): Can't open file %s in %s on line %d bool(false) Done ---EXPECTF-- -object(OCI-Lob)#%d (1) { - ["descriptor"]=> - resource(%d) of type (oci8 descriptor) -} - -Warning: OCI-Lob::writetemporary(): Invalid temporary lob type: %d in %s on line %d -bool(false) -int(6) -bool(true) -bool(true) - -Warning: OCI-Lob::truncate(): Size must be less than or equal to the current LOB size in %s on line %d -bool(false) - -Warning: OCI-Lob::truncate(): Length must be greater than or equal to zero in %s on line %d -bool(false) - -Warning: OCI-Lob::read(): Offset must be less than size of the LOB in %s on line %d -bool(false) - -Warning: OCI-Lob::import(): Can't open file %s in %s on line %d -bool(false) - -Warning: OCI-Lob::savefile(): Can't open file %s in %s on line %d -bool(false) -Done diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt index 4aeb5ed9fb..97cba8e4e1 100644 --- a/ext/oci8/tests/lob_null.phpt +++ b/ext/oci8/tests/lob_null.phpt @@ -197,84 +197,6 @@ RETURNING INTO: '' RETURNING INTO: text Fetch as string array(2) { - ["ID"]=> - array(9) { - [0]=> - string(1) "1" - [1]=> - string(1) "2" - [2]=> - string(1) "3" - [3]=> - string(1) "4" - [4]=> - string(1) "5" - [5]=> - string(1) "6" - [6]=> - string(1) "7" - [7]=> - string(1) "8" - [8]=> - string(1) "9" - } - ["DATA"]=> - array(9) { - [0]=> - string(0) "" - [1]=> - string(0) "" - [2]=> - string(26) "Inserted via SQL statement" - [3]=> - string(0) "" - [4]=> - string(0) "" - [5]=> - string(32) "Inserted via procedure parameter" - [6]=> - string(0) "" - [7]=> - string(0) "" - [8]=> - string(28) "Inserted with RETURNING INTO" - } -} - -Fetch as a descriptor -1 is an object: string(0) "" -2 is an object: string(0) "" -3 is an object: string(26) "Inserted via SQL statement" -4 is an object: string(0) "" -5 is an object: string(0) "" -6 is an object: string(32) "Inserted via procedure parameter" -7 is an object: string(0) "" -8 is an object: string(0) "" -9 is an object: string(28) "Inserted with RETURNING INTO" - -Fetch via the procedure parameter -1 is an object: string(0) "" -2 is an object: string(0) "" -3 is an object: string(26) "Inserted via SQL statement" -4 is an object: string(0) "" -5 is an object: string(0) "" -6 is an object: string(32) "Inserted via procedure parameter" -7 is an object: string(0) "" -8 is an object: string(0) "" -9 is an object: string(28) "Inserted with RETURNING INTO" -Done ---UEXPECTF-- -Temporary CLOB: NULL -Temporary CLOB: '' -Temporary CLOB: text -Procedure parameter: NULL -Procedure parameter: '' -Procedure parameter: text -RETURNING INTO: null -RETURNING INTO: '' -RETURNING INTO: text -Fetch as string -array(2) { [u"ID"]=> array(9) { [0]=> diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt index ea8e9fe25b..62449518e4 100644 --- a/ext/oci8/tests/lob_temp.phpt +++ b/ext/oci8/tests/lob_temp.phpt @@ -26,16 +26,6 @@ echo "Done\n"; ?> --EXPECTF-- bool(true) -string(4) "test" -bool(true) -string(2) "te" -bool(true) -string(4) "test" -bool(true) -string(2) "te" -Done ---UEXPECTF-- -bool(true) unicode(4) "test" bool(true) unicode(2) "te" diff --git a/ext/oci8/tests/lob_temp1.phpt b/ext/oci8/tests/lob_temp1.phpt index bc843e41c7..d3de4da0a8 100644 --- a/ext/oci8/tests/lob_temp1.phpt +++ b/ext/oci8/tests/lob_temp1.phpt @@ -24,14 +24,6 @@ echo "Done\n"; ?> --EXPECTF-- bool(true) -string(4) "test" -bool(true) -bool(true) -string(4) "test" -bool(true) -Done ---UEXPECTF-- -bool(true) unicode(4) "test" bool(true) bool(true) diff --git a/ext/oci8/tests/oci_execute_segfault.phpt b/ext/oci8/tests/oci_execute_segfault.phpt index 9e4e23b202..acb5d8cc83 100644 --- a/ext/oci8/tests/oci_execute_segfault.phpt +++ b/ext/oci8/tests/oci_execute_segfault.phpt @@ -43,12 +43,6 @@ echo "Done\n"; --EXPECT-- bool(true) bool(true) -string(14) "some text data" -string(19) "some more text data" -Done ---UEXPECT-- -bool(true) -bool(true) unicode(14) "some text data" unicode(19) "some more text data" Done diff --git a/ext/oci8/tests/parse_error.phpt b/ext/oci8/tests/parse_error.phpt index 0525064b04..1a1c3a636c 100644 --- a/ext/oci8/tests/parse_error.phpt +++ b/ext/oci8/tests/parse_error.phpt @@ -101,48 +101,6 @@ echo "Done\n"; --EXPECTF-- Normal connection: Parse error array(4) { - ["code"]=> - int(1756) - ["message"]=> - string(48) "ORA-01756: quoted string not properly terminated" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} -New connection: Parse error -array(4) { - ["code"]=> - int(1756) - ["message"]=> - string(48) "ORA-01756: quoted string not properly terminated" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} -Persistent connection: Parse error -array(4) { - ["code"]=> - int(1756) - ["message"]=> - string(48) "ORA-01756: quoted string not properly terminated" - ["offset"]=> - int(0) - ["sqltext"]=> - string(0) "" -} -No connection: error: bool(false) -Normal connection (take #2): Parse error: ORA-01756: quoted string not properly terminated -New connection (take #2): Parse error: ORA-01756: quoted string not properly terminated -Persistent connection (take #2): Parse error: ORA-01756: quoted string not properly terminated -Normal connection: New Collection error: OCI-22303: type ""."ABC" not found -New connection (take #3): Parse error: ORA-01756: quoted string not properly terminated -Persistent connection (take #3): Parse error: ORA-01756: quoted string not properly terminated -Done ---UEXPECTF-- -Normal connection: Parse error -array(4) { [u"code"]=> int(1756) [u"message"]=> diff --git a/ext/oci8/tests/pecl_bug8816.phpt b/ext/oci8/tests/pecl_bug8816.phpt index 670d84ac5a..f7d96a5bad 100644 --- a/ext/oci8/tests/pecl_bug8816.phpt +++ b/ext/oci8/tests/pecl_bug8816.phpt @@ -66,38 +66,6 @@ echo "Done\n"; ?> --EXPECT-- array(2) { - ["L1"]=> - string(19) "1234567890111111111" - ["L2"]=> - string(9) "987654321" -} -array(2) { - ["L1"]=> - string(15) "122222222222222" - ["L2"]=> - string(9) "123456789" -} -array(2) { - ["L1"]=> - string(30) "985456745674567654567654567654" - ["L2"]=> - string(30) "985456745674567654567654567654" -} -array(2) { - ["L1"]=> - string(9) "123456789" - ["L2"]=> - string(15) "122222222222222" -} -array(2) { - ["L1"]=> - string(9) "987654321" - ["L2"]=> - string(19) "1234567890111111111" -} -Done ---UEXPECT-- -array(2) { [u"L1"]=> unicode(19) "1234567890111111111" [u"L2"]=> diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index dd4e5d7c87..721660c652 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -21,14 +21,5 @@ Warning: oci_connect(): Privileged connect is disabled. Enable oci8.privileged_c 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/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index 0235d4be04..b7a0f38082 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -23,14 +23,5 @@ Warning: oci_connect(): ORA-%d: %s 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, string given in %s on line %d -Done ---UEXPECTF-- -Warning: oci_connect(): ORA-%d: %s in %s on line %d - -Warning: oci_connect(): ORA-%d: %s 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/rowid_bind.phpt b/ext/oci8/tests/rowid_bind.phpt index 2865ced7d4..afce27dea0 100644 --- a/ext/oci8/tests/rowid_bind.phpt +++ b/ext/oci8/tests/rowid_bind.phpt @@ -67,26 +67,6 @@ echo "Done\n"; --EXPECT-- Initial Data array(1) { - ["ADDRESS"]=> - string(16) "original text #1" -} -array(1) { - ["ADDRESS"]=> - string(16) "original text #2" -} -Verify Change -array(1) { - ["ADDRESS"]=> - string(13) "Some new text" -} -array(1) { - ["ADDRESS"]=> - string(16) "original text #2" -} -Done ---UEXPECT-- -Initial Data -array(1) { [u"ADDRESS"]=> unicode(16) "original text #1" } diff --git a/ext/oci8/tests/select_null.phpt b/ext/oci8/tests/select_null.phpt index 720d867731..b2f99ccbda 100644 --- a/ext/oci8/tests/select_null.phpt +++ b/ext/oci8/tests/select_null.phpt @@ -19,14 +19,6 @@ echo "Done\n"; array(2) { [0]=> NULL - ["NULL"]=> - NULL -} -Done ---UEXPECT-- -array(2) { - [0]=> - NULL [u"NULL"]=> NULL } diff --git a/ext/oci8/tests/serverversion.phpt b/ext/oci8/tests/serverversion.phpt index 2cfcd37e32..4df1798670 100644 --- a/ext/oci8/tests/serverversion.phpt +++ b/ext/oci8/tests/serverversion.phpt @@ -25,11 +25,6 @@ echo "Done\n"; ?> --EXPECTF-- resource(%d) of type (oci8 connection) -string(%d) "%s" -string(%d) "%s" -Done ---UEXPECTF-- -resource(%d) of type (oci8 connection) unicode(%d) "%s" unicode(%d) "%s" Done diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt index 60398fe526..8a7fee4822 100644 --- a/ext/oci8/tests/statement_cache.phpt +++ b/ext/oci8/tests/statement_cache.phpt @@ -22,20 +22,6 @@ echo "Done\n"; --EXPECTF-- array(2) { [0]=> - string(1) "4" - ["1+3"]=> - string(1) "4" -} -array(2) { - [0]=> - string(1) "4" - ["1+3"]=> - string(1) "4" -} -Done ---UEXPECTF-- -array(2) { - [0]=> unicode(1) "4" [u"1+3"]=> unicode(1) "4" diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt index 5964ac8cd8..d9417c2882 100644 --- a/ext/oci8/tests/statement_type.phpt +++ b/ext/oci8/tests/statement_type.phpt @@ -32,21 +32,6 @@ echo "Done\n"; ?> --EXPECTF-- -string(6) "SELECT" -string(6) "DELETE" -string(6) "INSERT" -string(6) "UPDATE" -string(4) "DROP" -string(6) "CREATE" -string(6) "CREATE" -string(5) "ALTER" -string(5) "BEGIN" -string(7) "DECLARE" -string(4) "CALL" -string(7) "UNKNOWN" -string(7) "UNKNOWN" -Done ---UEXPECTF-- unicode(6) "SELECT" unicode(6) "DELETE" unicode(6) "INSERT" diff --git a/ext/oci8/tests/statement_type_old.phpt b/ext/oci8/tests/statement_type_old.phpt index 03edc97f82..46fa86745e 100644 --- a/ext/oci8/tests/statement_type_old.phpt +++ b/ext/oci8/tests/statement_type_old.phpt @@ -40,22 +40,6 @@ echo "Done\n"; ?> --EXPECTF-- resource(%d) of type (oci8 connection) -string(6) "SELECT" -string(6) "DELETE" -string(6) "INSERT" -string(6) "UPDATE" -string(4) "DROP" -string(6) "CREATE" -string(6) "CREATE" -string(5) "ALTER" -string(5) "BEGIN" -string(7) "DECLARE" -string(4) "CALL" -string(7) "UNKNOWN" -string(7) "UNKNOWN" -Done ---UEXPECTF-- -resource(%d) of type (oci8 connection) unicode(6) "SELECT" unicode(6) "DELETE" unicode(6) "INSERT" diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt index 22313f8a4f..66aafdcd69 100644 --- a/ext/oci8/tests/xmltype_01.phpt +++ b/ext/oci8/tests/xmltype_01.phpt @@ -91,35 +91,6 @@ echo "Done\n"; ?> --EXPECT-- Initial Data -string(250) "<?xml version="1.0"?> - <Xt> - <XtId>1</XtId> - <Size>Big</Size> - <Area>12345</Area> - <Hardness>20</Hardness> - <Lip>Curved</Lip> - <Color>Red</Color> - <Nice>N</Nice> - <Compact>Tiny</Compact> - <Material>Steel</Material> - </Xt>" -Verify -string(249) "<?xml version="1.0"?> -<Xt> - <XtId>1</XtId> - <Size>Big</Size> - <Area>12345</Area> - <Hardness>19</Hardness> - <Lip>Curved</Lip> - <Color>Red</Color> - <Nice>Y</Nice> - <Compact>Tiny</Compact> - <Material>Steel</Material> - </Xt> -" -Done ---UEXPECT-- -Initial Data unicode(250) "<?xml version="1.0"?> <Xt> <XtId>1</XtId> |