diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt index f1bee56b846..15a86477794 100644 --- a/ext/oci8/tests/array_bind_001.phpt +++ b/ext/oci8/tests/array_bind_001.phpt @@ -58,7 +58,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- 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-%r(01008|57000)%r: %s in %s on line %d diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt index f70ebb3f617..2bf39b58658 100644 --- a/ext/oci8/tests/array_bind_002.phpt +++ b/ext/oci8/tests/array_bind_002.phpt @@ -58,7 +58,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): Maximum array length must be greater than zero in %s on line %d Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt index 0de8e68187f..0979f4340f0 100644 --- a/ext/oci8/tests/array_bind_003.phpt +++ b/ext/oci8/tests/array_bind_003.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_execute(): ORA-01403: %s ORA-06512: at "%s.ARRAY_BIND_003_PKG", line %d ORA-06512: at line %d in %sarray_bind_003.php on line %d diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt index 297229cab8a..d9dfb01548e 100644 --- a/ext/oci8/tests/array_bind_004.phpt +++ b/ext/oci8/tests/array_bind_004.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_execute(): ORA-01403: %s ORA-06512: at "%s.ARRAY_BIND_004_PKG", line %d ORA-06512: at line %d in %sarray_bind_004.php on line %d diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt index 31d368d661c..b9a8b8c8203 100644 --- a/ext/oci8/tests/array_bind_005.phpt +++ b/ext/oci8/tests/array_bind_005.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(0) "" diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt index f2239f9d19f..56db1aea619 100644 --- a/ext/oci8/tests/array_bind_006.phpt +++ b/ext/oci8/tests/array_bind_006.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(4) "five" diff --git a/ext/oci8/tests/array_bind_007.phpt b/ext/oci8/tests/array_bind_007.phpt index a3c63bca86e..7cde333aadd 100644 --- a/ext/oci8/tests/array_bind_007.phpt +++ b/ext/oci8/tests/array_bind_007.phpt @@ -58,7 +58,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): Unknown or unsupported datatype given: -1 in %s on line %d Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt index 512ce053743..5b1975cd184 100644 --- a/ext/oci8/tests/array_bind_008.phpt +++ b/ext/oci8/tests/array_bind_008.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_execute(): ORA-06550: line %d, column %d: PLS-00418: %s ORA-06550: %s diff --git a/ext/oci8/tests/array_bind_009.phpt b/ext/oci8/tests/array_bind_009.phpt index 8e83b0982c4..64b2e8cded2 100644 --- a/ext/oci8/tests/array_bind_009.phpt +++ b/ext/oci8/tests/array_bind_009.phpt @@ -11,7 +11,7 @@ var_dump(oci_bind_array_by_name($c, ":c1", $array, 5, 5, SQLT_CHR)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): supplied resource is not a valid oci8 statement resource in %s on line %d bool(false) Done diff --git a/ext/oci8/tests/array_bind_010.phpt b/ext/oci8/tests/array_bind_010.phpt index ede82c97fce..b5ba85938c5 100644 --- a/ext/oci8/tests/array_bind_010.phpt +++ b/ext/oci8/tests/array_bind_010.phpt @@ -19,7 +19,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): ORA-01036: illegal variable name/number in %s on line %d array(5) { [0]=> diff --git a/ext/oci8/tests/array_bind_011.phpt b/ext/oci8/tests/array_bind_011.phpt index 90631619bcd..164821c221a 100644 --- a/ext/oci8/tests/array_bind_011.phpt +++ b/ext/oci8/tests/array_bind_011.phpt @@ -58,7 +58,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): You must provide max length value for empty arrays in %s on line %d Warning: oci_execute(): ORA-%r(01008|57000)%r: %s in %s on line %d diff --git a/ext/oci8/tests/array_bind_012.phpt b/ext/oci8/tests/array_bind_012.phpt index 38e1701a4b8..e2b74a9ce98 100644 --- a/ext/oci8/tests/array_bind_012.phpt +++ b/ext/oci8/tests/array_bind_012.phpt @@ -19,7 +19,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name(): Invalid max length value (-10) in %s on line %d array(0) { } diff --git a/ext/oci8/tests/array_bind_013.phpt b/ext/oci8/tests/array_bind_013.phpt index 4da9d8bbed8..44d4bd1e6de 100644 --- a/ext/oci8/tests/array_bind_013.phpt +++ b/ext/oci8/tests/array_bind_013.phpt @@ -22,7 +22,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_bind_array_by_name() expects at most 6 parameters, 7 given in %s on line %d NULL diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt index 8a88aff33be..51224bc3e07 100644 --- a/ext/oci8/tests/array_bind_014.phpt +++ b/ext/oci8/tests/array_bind_014.phpt @@ -60,7 +60,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt index cc48779fd19..75d2dbb3ba0 100644 --- a/ext/oci8/tests/array_bind_date.phpt +++ b/ext/oci8/tests/array_bind_date.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(9) "05-NOV-05" diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt index 8e1aceaa06b..c0228539a19 100644 --- a/ext/oci8/tests/array_bind_date1.phpt +++ b/ext/oci8/tests/array_bind_date1.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(9) "05-NOV-05" diff --git a/ext/oci8/tests/array_bind_float.phpt b/ext/oci8/tests/array_bind_float.phpt index a7cc87bc683..dbd1437696b 100644 --- a/ext/oci8/tests/array_bind_float.phpt +++ b/ext/oci8/tests/array_bind_float.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> float(5.9999) diff --git a/ext/oci8/tests/array_bind_float1.phpt b/ext/oci8/tests/array_bind_float1.phpt index 082262594bb..c342c0eb58f 100644 --- a/ext/oci8/tests/array_bind_float1.phpt +++ b/ext/oci8/tests/array_bind_float1.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> float(5.9999) diff --git a/ext/oci8/tests/array_bind_int.phpt b/ext/oci8/tests/array_bind_int.phpt index 08574779710..19fa3bf2ac1 100644 --- a/ext/oci8/tests/array_bind_int.phpt +++ b/ext/oci8/tests/array_bind_int.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/oci8/tests/array_bind_int1.phpt b/ext/oci8/tests/array_bind_int1.phpt index 7a784bac61f..b730cb2f204 100644 --- a/ext/oci8/tests/array_bind_int1.phpt +++ b/ext/oci8/tests/array_bind_int1.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> int(5) diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt index bda452fd028..70c148afcf3 100644 --- a/ext/oci8/tests/array_bind_str.phpt +++ b/ext/oci8/tests/array_bind_str.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(4) "five" diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt index 9444786cbe1..aabed16d4fb 100644 --- a/ext/oci8/tests/array_bind_str1.phpt +++ b/ext/oci8/tests/array_bind_str1.phpt @@ -61,7 +61,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(4) "five" diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index 84ef14d9574..477bb1422f3 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -26,7 +26,7 @@ $stmtarray = array( "insert into bind_char_tab values (2, NULL, 'abc')", "insert into bind_char_tab values (3, NULL, 'abc ')" ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test @@ -196,7 +196,7 @@ function do_e_q($s) $stmtarray = array( "drop table bind_char_tab" ); - + oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; diff --git a/ext/oci8/tests/bind_char_1_11gR1.phpt b/ext/oci8/tests/bind_char_1_11gR1.phpt index 317a1db901d..7a97213cad4 100644 --- a/ext/oci8/tests/bind_char_1_11gR1.phpt +++ b/ext/oci8/tests/bind_char_1_11gR1.phpt @@ -28,7 +28,7 @@ $stmtarray = array( "insert into bind_char_tab values (2, NULL, 'abc')", "insert into bind_char_tab values (3, NULL, 'abc ')" ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test @@ -198,7 +198,7 @@ function do_e_q($s) $stmtarray = array( "drop table bind_char_tab" ); - + oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt index 3f925e3bbd8..5ab03553b79 100644 --- a/ext/oci8/tests/bind_char_2.phpt +++ b/ext/oci8/tests/bind_char_2.phpt @@ -25,7 +25,7 @@ $stmtarray = array( "create table bind_char_tab (id number, c1 date)", "insert into bind_char_tab values (1, '2008-04-20')", ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test @@ -85,7 +85,7 @@ function do_e_q($s) $stmtarray = array( "drop table bind_char_tab" ); - + oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; diff --git a/ext/oci8/tests/bind_char_2_11gR1.phpt b/ext/oci8/tests/bind_char_2_11gR1.phpt index 2395b83b886..00831111b6e 100644 --- a/ext/oci8/tests/bind_char_2_11gR1.phpt +++ b/ext/oci8/tests/bind_char_2_11gR1.phpt @@ -25,7 +25,7 @@ $stmtarray = array( "create table bind_char_tab (id number, c1 date)", "insert into bind_char_tab values (1, '2008-04-20')", ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test @@ -85,7 +85,7 @@ function do_e_q($s) $stmtarray = array( "drop table bind_char_tab" ); - + oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt b/ext/oci8/tests/bind_char_3_11gR1.phpt index 4ab77c6a5c0..3c3d3b36dc5 100644 --- a/ext/oci8/tests/bind_char_3_11gR1.phpt +++ b/ext/oci8/tests/bind_char_3_11gR1.phpt @@ -22,7 +22,7 @@ require(dirname(__FILE__).'/connect.inc'); $stmtarray = array( "create or replace function bind_char_3_fn(p1 char) return char as begin return p1; end;", ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt index 0e380ec5f08..60d7ac6c9f6 100644 --- a/ext/oci8/tests/bind_char_4.phpt +++ b/ext/oci8/tests/bind_char_4.phpt @@ -24,7 +24,7 @@ require(dirname(__FILE__).'/connect.inc'); $stmtarray = array( "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt b/ext/oci8/tests/bind_char_4_11gR1.phpt index cc1276181da..9bc0ddf428d 100644 --- a/ext/oci8/tests/bind_char_4_11gR1.phpt +++ b/ext/oci8/tests/bind_char_4_11gR1.phpt @@ -24,7 +24,7 @@ require(dirname(__FILE__).'/connect.inc'); $stmtarray = array( "create or replace function bind_char_3_fn(p1 varchar2) return varchar2 as begin return p1; end;", ); - + oci8_test_sql_execute($c, $stmtarray); // Run Test diff --git a/ext/oci8/tests/bug27303_1.phpt b/ext/oci8/tests/bug27303_1.phpt index 0b9d2b99e0e..3058c1bcaec 100644 --- a/ext/oci8/tests/bug27303_1.phpt +++ b/ext/oci8/tests/bug27303_1.phpt @@ -16,7 +16,7 @@ NLS_LANG= ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug27303_1_11gR1.phpt b/ext/oci8/tests/bug27303_1_11gR1.phpt index d2018783bc9..f7e224f45c1 100644 --- a/ext/oci8/tests/bug27303_1_11gR1.phpt +++ b/ext/oci8/tests/bug27303_1_11gR1.phpt @@ -51,7 +51,7 @@ oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt index ee2f7b52aa5..76188153e58 100644 --- a/ext/oci8/tests/bug27303_2.phpt +++ b/ext/oci8/tests/bug27303_2.phpt @@ -16,7 +16,7 @@ NLS_LANG= ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug27303_2_11gR1.phpt b/ext/oci8/tests/bug27303_2_11gR1.phpt index a50b3e26132..0a0cc44845c 100644 --- a/ext/oci8/tests/bug27303_2_11gR1.phpt +++ b/ext/oci8/tests/bug27303_2_11gR1.phpt @@ -16,7 +16,7 @@ NLS_LANG= ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug27303_3.phpt b/ext/oci8/tests/bug27303_3.phpt index e2910670886..aafdf61e731 100644 --- a/ext/oci8/tests/bug27303_3.phpt +++ b/ext/oci8/tests/bug27303_3.phpt @@ -6,7 +6,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) ---EXPECT-- +--EXPECT-- int(1) int(2) int(3) diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt index ed9d5a1fe6d..a88f29807d2 100644 --- a/ext/oci8/tests/bug27303_4.phpt +++ b/ext/oci8/tests/bug27303_4.phpt @@ -16,7 +16,7 @@ NLS_LANG= ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug27303_4_11gR1.phpt b/ext/oci8/tests/bug27303_4_11gR1.phpt index 550d89fdcc5..ff21d23a2a9 100644 --- a/ext/oci8/tests/bug27303_4_11gR1.phpt +++ b/ext/oci8/tests/bug27303_4_11gR1.phpt @@ -14,7 +14,7 @@ if (!(isset($matches[0]) && $matches[1] < 12)) { ---EXPECT-- +--EXPECT-- string(1) "1" string(1) "2" string(1) "3" diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt index 906195c60f3..925433659b4 100644 --- a/ext/oci8/tests/bug32325.phpt +++ b/ext/oci8/tests/bug32325.phpt @@ -9,7 +9,7 @@ require(dirname(__FILE__).'/skipif.inc'); ---EXPECT-- +--EXPECT-- int(4) float(2) float(3) diff --git a/ext/oci8/tests/bug35973.phpt b/ext/oci8/tests/bug35973.phpt index 399391b8e98..4c000d022b6 100644 --- a/ext/oci8/tests/bug35973.phpt +++ b/ext/oci8/tests/bug35973.phpt @@ -33,7 +33,7 @@ $s1 = oci_parse($c, "drop table test_nclob"); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { ["NC"]=> object(OCI-Lob)#%d (1) { diff --git a/ext/oci8/tests/bug36010.phpt b/ext/oci8/tests/bug36010.phpt index ec382d27ba0..cd68b66f34d 100644 --- a/ext/oci8/tests/bug36010.phpt +++ b/ext/oci8/tests/bug36010.phpt @@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- writetemporary("", OCI_TEMP_CLOB); $success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS); -oci_free_statement($stmt); +oci_free_statement($stmt); $clob->close(); // Query back the change diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt index b9b491cac06..642414f9a35 100644 --- a/ext/oci8/tests/bug37581.phpt +++ b/ext/oci8/tests/bug37581.phpt @@ -44,7 +44,7 @@ var_dump($strings); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(1) "A" diff --git a/ext/oci8/tests/bug38161.phpt b/ext/oci8/tests/bug38161.phpt index 0664510146e..4187de8fed1 100644 --- a/ext/oci8/tests/bug38161.phpt +++ b/ext/oci8/tests/bug38161.phpt @@ -24,7 +24,7 @@ var_dump($bv); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- NULL int(0) Done diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt index b7abcf5214b..9fdcb14b7d0 100644 --- a/ext/oci8/tests/bug40078.phpt +++ b/ext/oci8/tests/bug40078.phpt @@ -42,7 +42,7 @@ var_dump($array); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- array(5) { [0]=> string(3) "one" diff --git a/ext/oci8/tests/bug41069.phpt b/ext/oci8/tests/bug41069.phpt index 29f579448e2..a7606819f3b 100644 --- a/ext/oci8/tests/bug41069.phpt +++ b/ext/oci8/tests/bug41069.phpt @@ -51,7 +51,7 @@ $stmtarray = array( "insert into bug41069_tab (c1, c2, c3, c4, c5, c6, c7, c9, c10, c12, c15) values (113, 'aaaaaaa', 'bbbbbbbbbb', 'cccccc', 'e', 'f', 'dddd', '12/04/2006', '12/04/2006', 2224, 'zzzzzzz')" ); - + oci8_test_sql_execute($c, $stmtarray); diff --git a/ext/oci8/tests/bug43497.phpt b/ext/oci8/tests/bug43497.phpt index 6171127591e..618836da58f 100644 --- a/ext/oci8/tests/bug43497.phpt +++ b/ext/oci8/tests/bug43497.phpt @@ -102,27 +102,27 @@ function dropxmltab($c) // delete table function fillxmltab($c) { for ($id = 1; $id <= 100; $id++) { - - // create an XML element string with random data + + // create an XML element string with random data $s = ""; for ($j = 0; $j < 128; $j++) { - $s .= rand(); + $s .= rand(); } - $s .= "\n"; + $s .= "\n"; for ($j = 0; $j < 4; $j++) { $s .= $s; - } + } $data = "" . $s . ""; - + // insert XML data into database - + $stmt = oci_parse($c, "insert into bug43497_tab(id, xml) values (:id, sys.xmltype.createxml(:xml))"); oci_bind_by_name($stmt, ":id", $id); $clob = oci_new_descriptor($c, OCI_D_LOB); oci_bind_by_name($stmt, ":xml", $clob, -1, OCI_B_CLOB); $clob->writetemporary($data); oci_execute($stmt); - + $clob->close(); $clob->free(); } diff --git a/ext/oci8/tests/bug51253.phpt b/ext/oci8/tests/bug51253.phpt index b25d393ee23..21a0cf8a3f9 100644 --- a/ext/oci8/tests/bug51253.phpt +++ b/ext/oci8/tests/bug51253.phpt @@ -89,7 +89,7 @@ $statement = oci_parse($c, "DROP TABLE BIND_TEST"); echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Test 1 array(5) { [0]=> diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt index c49dd0ee03d..fc548d26c1d 100644 --- a/ext/oci8/tests/bug71600.phpt +++ b/ext/oci8/tests/bug71600.phpt @@ -9,7 +9,7 @@ require(dirname(__FILE__).'/skipif.inc'); ===DONE=== ---EXPECT-- +--EXPECT-- Test 1 Executing SELECT statament... Fetching data by columns... diff --git a/ext/oci8/tests/close.phpt b/ext/oci8/tests/close.phpt index aed90fcaa71..6f9d2b84736 100644 --- a/ext/oci8/tests/close.phpt +++ b/ext/oci8/tests/close.phpt @@ -10,8 +10,8 @@ require dirname(__FILE__).'/connect.inc'; oci_close($c); oci_connect($user, $password, $dbase); - + echo "Done\n"; ?> ---EXPECT-- +--EXPECT-- Done diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt index 5f502036f38..bb3f6aed751 100644 --- a/ext/oci8/tests/coll_009.phpt +++ b/ext/oci8/tests/coll_009.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_009_func.phpt b/ext/oci8/tests/coll_009_func.phpt index 40d7e60228c..38573bd3a88 100644 --- a/ext/oci8/tests/coll_009_func.phpt +++ b/ext/oci8/tests/coll_009_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt index 11dbe61f70c..620872c206d 100644 --- a/ext/oci8/tests/coll_010.phpt +++ b/ext/oci8/tests/coll_010.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt index f3284584d30..75a6c1209cb 100644 --- a/ext/oci8/tests/coll_010_func.phpt +++ b/ext/oci8/tests/coll_010_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt index da0650cfdd1..220ed179a56 100644 --- a/ext/oci8/tests/coll_011.phpt +++ b/ext/oci8/tests/coll_011.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt index 684da3d85d3..ff121d78203 100644 --- a/ext/oci8/tests/coll_011_func.phpt +++ b/ext/oci8/tests/coll_011_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt index 3d47ee8830e..c99a5abb3af 100644 --- a/ext/oci8/tests/coll_012.phpt +++ b/ext/oci8/tests/coll_012.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt index 08841447764..1a20b37bc10 100644 --- a/ext/oci8/tests/coll_012_func.phpt +++ b/ext/oci8/tests/coll_012_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt index f85c98a9071..2bb836ae1a4 100644 --- a/ext/oci8/tests/coll_013.phpt +++ b/ext/oci8/tests/coll_013.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt index 2132a06a0ae..27c2e66868c 100644 --- a/ext/oci8/tests/coll_013_func.phpt +++ b/ext/oci8/tests/coll_013_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt index eca1c18ee41..de3d46bd293 100644 --- a/ext/oci8/tests/coll_014.phpt +++ b/ext/oci8/tests/coll_014.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt index ad04ad0be7d..4acde26e9ee 100644 --- a/ext/oci8/tests/coll_014_func.phpt +++ b/ext/oci8/tests/coll_014_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_015.phpt b/ext/oci8/tests/coll_015.phpt index 3618af4f738..2d8a0f382b0 100644 --- a/ext/oci8/tests/coll_015.phpt +++ b/ext/oci8/tests/coll_015.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_015_func.phpt b/ext/oci8/tests/coll_015_func.phpt index af82ff12856..d88b14547e5 100644 --- a/ext/oci8/tests/coll_015_func.phpt +++ b/ext/oci8/tests/coll_015_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt index 3f6dac744cb..1ba78007ccf 100644 --- a/ext/oci8/tests/coll_016.phpt +++ b/ext/oci8/tests/coll_016.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt index 470ac1da73e..ba3bee863ae 100644 --- a/ext/oci8/tests/coll_016_func.phpt +++ b/ext/oci8/tests/coll_016_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt index 7c07e3c61df..c988e4ffe62 100644 --- a/ext/oci8/tests/coll_017.phpt +++ b/ext/oci8/tests/coll_017.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt index a08a95f052b..1aff12d7646 100644 --- a/ext/oci8/tests/coll_017_func.phpt +++ b/ext/oci8/tests/coll_017_func.phpt @@ -18,7 +18,7 @@ $statement = OCIParse($c,$ora_sql); @OCIExecute($statement); $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR(10)"; - + $statement = OCIParse($c,$ora_sql); OCIExecute($statement); diff --git a/ext/oci8/tests/commit_001.phpt b/ext/oci8/tests/commit_001.phpt index 2df6b03382f..2696217a0f8 100644 --- a/ext/oci8/tests/commit_001.phpt +++ b/ext/oci8/tests/commit_001.phpt @@ -74,7 +74,7 @@ var_dump($all); require(dirname(__FILE__).'/drop_table.inc'); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt index dadffb6850e..0e3e08112ac 100644 --- a/ext/oci8/tests/commit_old.phpt +++ b/ext/oci8/tests/commit_old.phpt @@ -64,7 +64,7 @@ var_dump($all); require dirname(__FILE__).'/drop_table.inc'; - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index c44b70aeca1..7897ddd4c9e 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -62,7 +62,7 @@ foreach($values_array as $val ) { oci_set_module_name($c1,$val); oci_set_client_identifier($c1,$val); oci_set_client_info($c1,$val); - $r = oci_set_action($c1,$val); + $r = oci_set_action($c1,$val); if ($r) { echo "Values set successfully to $val\n"; foreach($attr_array as $attr) { diff --git a/ext/oci8/tests/connect.phpt b/ext/oci8/tests/connect.phpt index 6ce4c533ba0..390ce1923eb 100644 --- a/ext/oci8/tests/connect.phpt +++ b/ext/oci8/tests/connect.phpt @@ -13,7 +13,7 @@ if (!empty($dbase)) { else { var_dump(oci_connect($user, $password)); } - + echo "Done\n"; ?> diff --git a/ext/oci8/tests/connect_old.phpt b/ext/oci8/tests/connect_old.phpt index 55f1734a5a2..390c418a11f 100644 --- a/ext/oci8/tests/connect_old.phpt +++ b/ext/oci8/tests/connect_old.phpt @@ -13,7 +13,7 @@ if (!empty($dbase)) { else { var_dump(ocilogon($user, $password)); } - + echo "Done\n"; ?> diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt index b1f6653f120..55cc1710470 100644 --- a/ext/oci8/tests/connect_scope1.phpt +++ b/ext/oci8/tests/connect_scope1.phpt @@ -18,7 +18,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt index 660630bb6b6..76ed42ca178 100644 --- a/ext/oci8/tests/connect_scope2.phpt +++ b/ext/oci8/tests/connect_scope2.phpt @@ -18,7 +18,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try1.phpt b/ext/oci8/tests/connect_scope_try1.phpt index d30fc6686da..6dc94792db7 100644 --- a/ext/oci8/tests/connect_scope_try1.phpt +++ b/ext/oci8/tests/connect_scope_try1.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try2.phpt b/ext/oci8/tests/connect_scope_try2.phpt index bb1ad4a7c65..47e2b384b44 100644 --- a/ext/oci8/tests/connect_scope_try2.phpt +++ b/ext/oci8/tests/connect_scope_try2.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try3.phpt b/ext/oci8/tests/connect_scope_try3.phpt index 4a82362127a..6e1c652ad5e 100644 --- a/ext/oci8/tests/connect_scope_try3.phpt +++ b/ext/oci8/tests/connect_scope_try3.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try4.phpt b/ext/oci8/tests/connect_scope_try4.phpt index 25a951a7923..f35f4e68b52 100644 --- a/ext/oci8/tests/connect_scope_try4.phpt +++ b/ext/oci8/tests/connect_scope_try4.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try5.phpt b/ext/oci8/tests/connect_scope_try5.phpt index 0a2518d4e03..325ce2fb99c 100644 --- a/ext/oci8/tests/connect_scope_try5.phpt +++ b/ext/oci8/tests/connect_scope_try5.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_scope_try6.phpt b/ext/oci8/tests/connect_scope_try6.phpt index 653bacc8794..6cc54a21bbe 100644 --- a/ext/oci8/tests/connect_scope_try6.phpt +++ b/ext/oci8/tests/connect_scope_try6.phpt @@ -20,7 +20,7 @@ if (!empty($dbase)) $c1 = oci_new_connect($user,$password,$dbase); else $c1 = oci_new_connect($user,$password); - + oci8_test_sql_execute($c1, $stmtarray); // Run Test diff --git a/ext/oci8/tests/connect_with_charset_001.phpt b/ext/oci8/tests/connect_with_charset_001.phpt index 9149747cdbb..36963ab5a0f 100644 --- a/ext/oci8/tests/connect_with_charset_001.phpt +++ b/ext/oci8/tests/connect_with_charset_001.phpt @@ -21,7 +21,7 @@ var_dump($c5 == $c6); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- resource(%d) of type (oci8 connection) resource(%d) of type (oci8 connection) diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt index 4ccc2989c87..0e4a37ca3a2 100644 --- a/ext/oci8/tests/connect_without_oracle_home.phpt +++ b/ext/oci8/tests/connect_without_oracle_home.phpt @@ -28,7 +28,7 @@ if (!empty($dbase)) { else { var_dump(oci_connect($user, $password)); } - + ?> ===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_11.phpt b/ext/oci8/tests/connect_without_oracle_home_11.phpt index 9962ecfcf84..09f778362c1 100644 --- a/ext/oci8/tests/connect_without_oracle_home_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_11.phpt @@ -31,7 +31,7 @@ if (!empty($dbase)) { else { var_dump(oci_connect($user, $password)); } - + ?> ===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt index 7e15bc5dd4d..1bc7b37c236 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt @@ -24,7 +24,7 @@ if (!empty($dbase)) { else { var_dump(ocilogon($user, $password)); } - + ?> ===DONE=== diff --git a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt index 6371b3f909f..07803b99965 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt @@ -31,7 +31,7 @@ if (!empty($dbase)) { else { var_dump(ocilogon($user, $password)); } - + ?> ===DONE=== diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt index 66ab0f0d005..729726fdd6f 100644 --- a/ext/oci8/tests/debug.phpt +++ b/ext/oci8/tests/debug.phpt @@ -15,7 +15,7 @@ if (!empty($dbase)) { else { oci_connect($user, $password); } - + oci_internal_debug(false); ?> diff --git a/ext/oci8/tests/default_prefetch0.phpt b/ext/oci8/tests/default_prefetch0.phpt index cc70c6ecb3c..5d2934e4cb4 100644 --- a/ext/oci8/tests/default_prefetch0.phpt +++ b/ext/oci8/tests/default_prefetch0.phpt @@ -44,7 +44,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/default_prefetch1.phpt b/ext/oci8/tests/default_prefetch1.phpt index bc788293657..04fbd1a5a51 100644 --- a/ext/oci8/tests/default_prefetch1.phpt +++ b/ext/oci8/tests/default_prefetch1.phpt @@ -44,7 +44,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/default_prefetch2.phpt b/ext/oci8/tests/default_prefetch2.phpt index d8a76dbb079..33e91150b6a 100644 --- a/ext/oci8/tests/default_prefetch2.phpt +++ b/ext/oci8/tests/default_prefetch2.phpt @@ -45,7 +45,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/define2.phpt b/ext/oci8/tests/define2.phpt index 086cc7275c4..67cff225c19 100644 --- a/ext/oci8/tests/define2.phpt +++ b/ext/oci8/tests/define2.phpt @@ -14,7 +14,7 @@ $stmtarray = array( "drop table phptestrawtable", "create table phptestrawtable( id number(10), fileimage raw(1000))" ); - + oci8_test_sql_execute($c, $stmtarray); $stmt = oci_parse ($c, "insert into phptestrawtable (id, fileimage) values (:id, :fileimage)"); diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt index 70426f61b49..701c89db549 100644 --- a/ext/oci8/tests/define3.phpt +++ b/ext/oci8/tests/define3.phpt @@ -14,7 +14,7 @@ $stmtarray = array( "drop table phpdefblobtable", "create table phpdefblobtable (id number(10), fileimage blob)" ); - + oci8_test_sql_execute($c, $stmtarray); // Load data @@ -78,7 +78,7 @@ while (oci_fetch($stmt)) { $stmtarray = array( "drop table phpdefblobtable" ); - + oci8_test_sql_execute($c, $stmtarray); echo "Done\n"; diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt index 9a4c650c479..0b4aeb09f70 100644 --- a/ext/oci8/tests/descriptors.phpt +++ b/ext/oci8/tests/descriptors.phpt @@ -41,7 +41,7 @@ require dirname(__FILE__).'/drop_table.inc'; echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(1) { ["BLOB"]=> object(OCI-Lob)#%d (1) { diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 6d56f9be5ca..9ec5f4b96de 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -92,7 +92,7 @@ foreach ($values_array as $val ) { if ($c1) { get_edit_attr($c1); oci_close($c1); - } + } } echo "\n\n**Test 1.5 - Negative case with an invalid string value. *********\n"; diff --git a/ext/oci8/tests/exec_fetch.phpt b/ext/oci8/tests/exec_fetch.phpt index 52d515ffc4c..b318ee48fcc 100644 --- a/ext/oci8/tests/exec_fetch.phpt +++ b/ext/oci8/tests/exec_fetch.phpt @@ -15,7 +15,7 @@ var_dump(oci_fetch_array($stmt)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_execute(): ORA-00942: %s in %s on line %d bool(false) diff --git a/ext/oci8/tests/execute_mode.phpt b/ext/oci8/tests/execute_mode.phpt index 90570cae80a..ffa97f0f2fe 100644 --- a/ext/oci8/tests/execute_mode.phpt +++ b/ext/oci8/tests/execute_mode.phpt @@ -14,6 +14,6 @@ oci_execute($stmt, -1); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Warning: oci_execute(): Invalid execute mode given: -1 in %s on line %d Done diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt index 6fdec313f18..a2906034874 100644 --- a/ext/oci8/tests/fetch.phpt +++ b/ext/oci8/tests/fetch.phpt @@ -43,7 +43,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/fetch_all1.phpt b/ext/oci8/tests/fetch_all1.phpt index 00e747cc357..20afe5967cd 100644 --- a/ext/oci8/tests/fetch_all1.phpt +++ b/ext/oci8/tests/fetch_all1.phpt @@ -45,7 +45,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/fetch_all2.phpt b/ext/oci8/tests/fetch_all2.phpt index 261c46f38b8..ca43348c2b4 100644 --- a/ext/oci8/tests/fetch_all2.phpt +++ b/ext/oci8/tests/fetch_all2.phpt @@ -50,7 +50,7 @@ var_dump(oci_fetch_all($s, $all, 0, 1, OCI_BOTH)); var_dump($all); require dirname(__FILE__).'/drop_table.inc'; - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt index 03640e5901c..9b67f27e8f5 100644 --- a/ext/oci8/tests/fetch_array.phpt +++ b/ext/oci8/tests/fetch_array.phpt @@ -97,7 +97,7 @@ while ($row = oci_fetch_array($s, OCI_NUM+OCI_RETURN_NULLS)) { } require dirname(__FILE__).'/drop_table.inc'; - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt index 05fc78aa019..68e5f9cfaec 100644 --- a/ext/oci8/tests/fetch_into1.phpt +++ b/ext/oci8/tests/fetch_into1.phpt @@ -58,7 +58,7 @@ var_dump(ocifetchinto($s, $all, OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS)); var_dump($all); require dirname(__FILE__).'/drop_table.inc'; - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index 39b1dc72b9c..2d725415807 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -46,7 +46,7 @@ var_dump(ocifetchinto($s, $all, 1000000)); var_dump($all); require dirname(__FILE__).'/drop_table.inc'; - + echo "Done\n"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt index a6967fa787f..432239d1299 100644 Binary files a/ext/oci8/tests/lob_001.phpt and b/ext/oci8/tests/lob_001.phpt differ diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt index 95193bccf65..b0b1d31af4a 100644 Binary files a/ext/oci8/tests/lob_003.phpt and b/ext/oci8/tests/lob_003.phpt differ diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt index 03d42015212..a363199776c 100644 --- a/ext/oci8/tests/lob_004.phpt +++ b/ext/oci8/tests/lob_004.phpt @@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- = 0; $i--) { $row = oci_fetch_array($s); var_dump($row['BLOB']->load()); var_dump($row['BLOB']->truncate(($i-1)*10)); - + oci_commit($c); } diff --git a/ext/oci8/tests/lob_031.phpt b/ext/oci8/tests/lob_031.phpt index ee99e4ceeca..99168442922 100644 --- a/ext/oci8/tests/lob_031.phpt +++ b/ext/oci8/tests/lob_031.phpt @@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- --FILE-- --FILE-- --FILE-- --FILE-- import("does_not_exist")); var_dump($blob->saveFile("does_not_exist")); require(dirname(__FILE__).'/drop_table.inc'); - + echo "Done\n"; - + ?> --EXPECTF-- object(OCI-Lob)#%d (1) { diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt index a49c0b75710..4ed661c0e61 100644 --- a/ext/oci8/tests/lob_044.phpt +++ b/ext/oci8/tests/lob_044.phpt @@ -7,7 +7,7 @@ require(dirname(__FILE__).'/skipif.inc'); ?> --FILE-- --FILE-- --FILE-- ---EXPECTF-- +--EXPECTF-- Fatal error: Allowed memory size of 10485760 bytes exhausted%s(tried to allocate %d bytes) in %s on line %d diff --git a/ext/oci8/tests/persistent.phpt b/ext/oci8/tests/persistent.phpt index 884cd35a4cc..1bdfc3c90f6 100644 --- a/ext/oci8/tests/persistent.phpt +++ b/ext/oci8/tests/persistent.phpt @@ -4,7 +4,7 @@ reusing persistent connections --FILE-- ---EXPECTF-- +--EXPECTF-- resource(%d) of type (oci8 persistent connection) resource(%d) of type (oci8 persistent connection) resource(%d) of type (oci8 persistent connection) diff --git a/ext/oci8/tests/prefetch_old.phpt b/ext/oci8/tests/prefetch_old.phpt index ac43771c6be..7f50993a648 100644 --- a/ext/oci8/tests/prefetch_old.phpt +++ b/ext/oci8/tests/prefetch_old.phpt @@ -46,7 +46,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index 198c45c9904..c56f6605acf 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -4,7 +4,7 @@ privileged connect tests --FILE-- ---EXPECTF-- +--EXPECTF-- array(2) { [0]=> NULL diff --git a/ext/oci8/tests/serverversion.phpt b/ext/oci8/tests/serverversion.phpt index 6cbb5aaad00..1c4b7d7d268 100644 --- a/ext/oci8/tests/serverversion.phpt +++ b/ext/oci8/tests/serverversion.phpt @@ -13,7 +13,7 @@ if (!empty($dbase)) { else { var_dump($c = oci_connect($user, $password)); } - + $v = oci_server_version($c); var_dump(str_replace("\n", "", $v)); diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt index d903b8de22b..8ab9ddc8c10 100644 --- a/ext/oci8/tests/statement_cache.phpt +++ b/ext/oci8/tests/statement_cache.phpt @@ -24,7 +24,7 @@ var_dump(oci_fetch_array($stmt)); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- array(2) { [0]=> string(1) "4" diff --git a/ext/oci8/tests/uncommitted.phpt b/ext/oci8/tests/uncommitted.phpt index a779bba3408..cb90e4a5143 100644 --- a/ext/oci8/tests/uncommitted.phpt +++ b/ext/oci8/tests/uncommitted.phpt @@ -4,7 +4,7 @@ uncommitted connection --FILE-- ---EXPECT-- +--EXPECT-- Done