diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt index 0c1644152c2..f1bee56b846 100644 --- a/ext/oci8/tests/array_bind_001.phpt +++ b/ext/oci8/tests/array_bind_001.phpt @@ -1,5 +1,5 @@ --TEST-- -oci_bind_array_by_name() and invalid values 1 +oci_bind_array_by_name() and invalid values 1 --SKIPIF-- --FILE-- @@ -16,15 +16,15 @@ $statement = oci_parse($c, $create); oci_execute($statement); $create_pkg = " -CREATE OR REPLACE PACKAGE ARRAY_BIND_001_PKG AS - TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; - PROCEDURE iobind(c1 IN OUT ARRTYPE); +CREATE OR REPLACE PACKAGE ARRAY_BIND_001_PKG AS + TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; + PROCEDURE iobind(c1 IN OUT ARRTYPE); END ARRAY_BIND_001_PKG;"; $statement = oci_parse($c, $create_pkg); oci_execute($statement); $create_pkg_body = " -CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_001_PKG AS +CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_001_PKG AS CURSOR CUR IS SELECT name FROM bind_test; PROCEDURE iobind(c1 IN OUT ARRTYPE) IS BEGIN diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt index d2b520c78eb..f70ebb3f617 100644 --- a/ext/oci8/tests/array_bind_002.phpt +++ b/ext/oci8/tests/array_bind_002.phpt @@ -16,15 +16,15 @@ $statement = oci_parse($c, $create); oci_execute($statement); $create_pkg = " -CREATE OR REPLACE PACKAGE ARRAY_BIND_002_PKG AS - TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; - PROCEDURE iobind(c1 IN OUT ARRTYPE); +CREATE OR REPLACE PACKAGE ARRAY_BIND_002_PKG AS + TYPE ARRTYPE IS TABLE OF DATE INDEX BY BINARY_INTEGER; + PROCEDURE iobind(c1 IN OUT ARRTYPE); END ARRAY_BIND_002_PKG;"; $statement = oci_parse($c, $create_pkg); oci_execute($statement); $create_pkg_body = " -CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_002_PKG AS +CREATE OR REPLACE PACKAGE BODY ARRAY_BIND_002_PKG AS CURSOR CUR IS SELECT name FROM bind_test; PROCEDURE iobind(c1 IN OUT ARRTYPE) IS BEGIN diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt index bd391db93f1..0de8e68187f 100644 --- a/ext/oci8/tests/array_bind_003.phpt +++ b/ext/oci8/tests/array_bind_003.phpt @@ -4,7 +4,7 @@ oci_bind_array_by_name() and invalid values 3 true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- = 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -46,7 +46,7 @@ var_dump($b); echo "Test 3\n"; -$sql = +$sql = "begin if (:input < 10) then :output := true; @@ -64,7 +64,7 @@ for ($input = 5; $input < 15; ++$input) { echo "Test 4\n"; -$sql = +$sql = "begin if (mod(:userid,2) = 0) then :b := true; @@ -82,7 +82,7 @@ for ($userid = 1; $userid <= 10; ++$userid) { echo "Test 5\n"; -$sql = +$sql = "declare l boolean; begin diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index bb368fc7da9..84ef14d9574 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 5b22cdc8c4e..317a1db901d 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 57b0c610f1d..3f925e3bbd8 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 438885e12a6..2395b83b886 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 af0ad4e682c..8d4707fadd4 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 b8f2284830a..fbc13b4a254 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 646b3317a1b..96fcb1e51c7 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/bind_long.phpt b/ext/oci8/tests/bind_long.phpt index cbd83128cb7..ca19e7edfd2 100644 --- a/ext/oci8/tests/bind_long.phpt +++ b/ext/oci8/tests/bind_long.phpt @@ -4,7 +4,7 @@ bind LONG field true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- --EXPECTF-- -Test 1 insert numbers +Test 1 insert numbers Warning: oci_execute(): ORA-01438: %s in %sbind_misccoltypes_errs.php on line %d array(1) { @@ -128,7 +128,7 @@ array(1) { } } -Test 2 insert numbers +Test 2 insert numbers Warning: oci_execute(): ORA-01722: %s in %sbind_misccoltypes_errs.php on line %d array(1) { diff --git a/ext/oci8/tests/bind_raw.phpt b/ext/oci8/tests/bind_raw.phpt index c2e8e08768a..a6e6259eef3 100644 --- a/ext/oci8/tests/bind_raw.phpt +++ b/ext/oci8/tests/bind_raw.phpt @@ -4,7 +4,7 @@ bind RAW field true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- = 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/bind_sqltnum_11g.phpt b/ext/oci8/tests/bind_sqltnum_11g.phpt index 1969893604c..3f4a1411a89 100644 --- a/ext/oci8/tests/bind_sqltnum_11g.phpt +++ b/ext/oci8/tests/bind_sqltnum_11g.phpt @@ -4,7 +4,7 @@ Bind with SQLT_NUM diff --git a/ext/oci8/tests/bind_unsupported_1.phpt b/ext/oci8/tests/bind_unsupported_1.phpt index 544b446788e..ba125d99fcb 100644 --- a/ext/oci8/tests/bind_unsupported_1.phpt +++ b/ext/oci8/tests/bind_unsupported_1.phpt @@ -27,7 +27,7 @@ foreach ($types as $t => $v) { $s = oci_parse($c, "select * from dual where dummy = :c1"); $c1 = "Doug"; - oci_bind_by_name($s, ":c1", $c1, -1, $v); + oci_bind_by_name($s, ":c1", $c1, -1, $v); } ?> diff --git a/ext/oci8/tests/bind_unsupported_2.phpt b/ext/oci8/tests/bind_unsupported_2.phpt index b4e2c9b43de..9d0a33df6a5 100644 --- a/ext/oci8/tests/bind_unsupported_2.phpt +++ b/ext/oci8/tests/bind_unsupported_2.phpt @@ -1,8 +1,8 @@ --TEST-- Bind with various unsupported 10g+ bind types --SKIPIF-- - --FILE-- $v) { $s = oci_parse($c, "select * from dual where dummy = :c1"); $c1 = "Doug"; - oci_bind_by_name($s, ":c1", $c1, -1, $v); + oci_bind_by_name($s, ":c1", $c1, -1, $v); } ?> diff --git a/ext/oci8/tests/bind_unsupported_3.phpt b/ext/oci8/tests/bind_unsupported_3.phpt index 5c9dec37295..48b719aa54f 100644 --- a/ext/oci8/tests/bind_unsupported_3.phpt +++ b/ext/oci8/tests/bind_unsupported_3.phpt @@ -1,10 +1,10 @@ --TEST-- -Bind with various bind types not supported by TimesTen +Bind with various bind types not supported by TimesTen --SKIPIF-- false, 'timesten' => true); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- $v) { $s = oci_parse($c, "select * from dual where dummy = :c1"); $c1 = "Doug"; - oci_bind_by_name($s, ":c1", $c1, -1, $v); + oci_bind_by_name($s, ":c1", $c1, -1, $v); } ?> diff --git a/ext/oci8/tests/bug26133.phpt b/ext/oci8/tests/bug26133.phpt index 59f8a17f38d..2da5d483d0f 100644 --- a/ext/oci8/tests/bug26133.phpt +++ b/ext/oci8/tests/bug26133.phpt @@ -36,7 +36,7 @@ $stmtarray = array( ); oci8_test_sql_execute($c, $stmtarray); - + echo "Done\n"; ?> --EXPECT-- diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt index 854e5c15909..906195c60f3 100644 --- a/ext/oci8/tests/bug32325.phpt +++ b/ext/oci8/tests/bug32325.phpt @@ -4,7 +4,7 @@ Bug #32325 (Cannot retrieve collection using OCI8) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- writetemporary("", OCI_TEMP_CLOB); -$success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS); +$query = "UPDATE bug37220_tab + SET bug37220_tab.mycolumn = updateXML(bug37220_tab.mycolumn,'/THETAG',xmltype.createXML(:data)) + WHERE existsNode(bug37220_tab.mycolumn,'/THETAG[@myID=\"1234\"]') = 1"; +$stmt = oci_parse ($c, $query); +$clob = oci_new_descriptor($c, OCI_D_LOB); +oci_bind_by_name($stmt, ':data', $clob, -1, OCI_B_CLOB); +$clob->writetemporary("", OCI_TEMP_CLOB); +$success = oci_execute($stmt, OCI_COMMIT_ON_SUCCESS); oci_free_statement($stmt); -$clob->close(); +$clob->close(); // Query back the change $query = "select * from bug37220_tab"; -$stmt = oci_parse ($c, $query); +$stmt = oci_parse ($c, $query); oci_execute($stmt); diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt index a1eeafc7610..39d1168059c 100644 --- a/ext/oci8/tests/bug37581.phpt +++ b/ext/oci8/tests/bug37581.phpt @@ -4,7 +4,7 @@ Bug #37581 (oci_bind_array_by_name clobbers input array when using SQLT_AFC, AVC true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (empty($dbase)) die ("skip requires network connection alias for DB link loopback"); @@ -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/bug42134.phpt b/ext/oci8/tests/bug42134.phpt index 10b7ef160d2..63091100a1f 100644 --- a/ext/oci8/tests/bug42134.phpt +++ b/ext/oci8/tests/bug42134.phpt @@ -4,7 +4,7 @@ Bug #42134 (Collection error for invalid collection name) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --INI-- oci8.statement_cache_size=20 --FILE-- @@ -24,10 +24,10 @@ $stmtarray = array( end bug42841_proc;", "create or replace package bug43449_pkg is - type cursortype is ref Cursor; + type cursortype is ref Cursor; function testcursor return cursortype; end bug43449_pkg;", - + "create or replace package body bug43449_pkg is function testcursor return cursortype is retCursor cursorType; @@ -50,32 +50,32 @@ function do_bug42841($c) $stmt = oci_parse($c, $sql); $cursor = oci_new_cursor($c); oci_bind_by_name($stmt, ":cursor", $cursor, -1, OCI_B_CURSOR); - + oci_execute($stmt, OCI_DEFAULT); oci_execute($cursor); - + while($row = oci_fetch_array($cursor, OCI_ASSOC + OCI_RETURN_LOBS)) { $data1[] = $row; } - + oci_free_statement($stmt); oci_free_statement($cursor); var_dump($data1); - + echo "Second attempt\n"; - + $sql = "BEGIN bug42841_proc(:cursor); END;"; $stmt = oci_parse($c, $sql); $cursor = oci_new_cursor($c); oci_bind_by_name($stmt, ":cursor", $cursor, -1, OCI_B_CURSOR); - + oci_execute($stmt, OCI_DEFAULT); oci_execute($cursor); - + while($row = oci_fetch_array($cursor, OCI_ASSOC + OCI_RETURN_LOBS)) { $data2[] = $row; } - + oci_free_statement($stmt); oci_free_statement($cursor); var_dump($data2); @@ -90,19 +90,19 @@ function do_bug43449($c) } function bug43449_getCur($c) -{ +{ $cur = oci_new_cursor($c); $stmt = oci_parse($c, 'begin :cur := bug43449_pkg.testcursor; end;'); oci_bind_by_name($stmt, ':cur', $cur, -1, OCI_B_CURSOR); oci_execute($stmt, OCI_DEFAULT); oci_execute($cur, OCI_DEFAULT); - + $ret = array(); - + while (ocifetchinto($cur, $row, OCI_ASSOC)) { $ret[] = $row; } - + oci_free_statement($cur); oci_free_statement($stmt); return $ret; diff --git a/ext/oci8/tests/bug43492.phpt b/ext/oci8/tests/bug43492.phpt index e84fa42556c..7c91ea22b64 100644 --- a/ext/oci8/tests/bug43492.phpt +++ b/ext/oci8/tests/bug43492.phpt @@ -4,7 +4,7 @@ Bug #43492 (Nested cursor leaks) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); diff --git a/ext/oci8/tests/bug44008.phpt b/ext/oci8/tests/bug44008.phpt index faacdc62540..c9930f24398 100644 --- a/ext/oci8/tests/bug44008.phpt +++ b/ext/oci8/tests/bug44008.phpt @@ -4,7 +4,7 @@ Bug #44008 (Incorrect usage of OCI-Lob->close crashes PHP) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); diff --git a/ext/oci8/tests/bug44206.phpt b/ext/oci8/tests/bug44206.phpt index 63805bf6e3a..20c92b0f64c 100644 --- a/ext/oci8/tests/bug44206.phpt +++ b/ext/oci8/tests/bug44206.phpt @@ -4,7 +4,7 @@ Bug #44206 (Test if selecting ref cursors leads to ORA-1000 maximum open cursors true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs: different error handling for this undefined behavior require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- ===DONE=== diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt index 0990a95f3bb..60590ca092a 100644 --- a/ext/oci8/tests/bug47281.phpt +++ b/ext/oci8/tests/bug47281.phpt @@ -12,7 +12,7 @@ if (!isset($matches[0]) || )) { die("skip test works only with Oracle 11.2.0.2 or earlier Oracle client libraries"); } -?> +?> --ENV-- NLS_LANG=.AL32UTF8 --FILE-- @@ -25,7 +25,7 @@ require(dirname(__FILE__).'/connect.inc'); $stmtarray = array( "create or replace procedure bug47281_sp as begin - raise_application_error(-20000, + raise_application_error(-20000, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBcccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccDeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeFggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhIjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjKlllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllM'); end;" ); diff --git a/ext/oci8/tests/bug51253.phpt b/ext/oci8/tests/bug51253.phpt index b38bc7606b7..b25d393ee23 100644 --- a/ext/oci8/tests/bug51253.phpt +++ b/ext/oci8/tests/bug51253.phpt @@ -4,7 +4,7 @@ Bug #51253 (oci_bind_array_by_name() array references) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --ENV-- NLS_LANG=.AL32UTF8 --FILE-- diff --git a/ext/oci8/tests/bug71148.phpt b/ext/oci8/tests/bug71148.phpt index 44bd0e80078..204aab3c808 100644 --- a/ext/oci8/tests/bug71148.phpt +++ b/ext/oci8/tests/bug71148.phpt @@ -127,7 +127,7 @@ var_dump($cache3); oci_free_statement($stmt); -// Test 6: Bind IN OUT parameter within the same scope of execute +// Test 6: Bind IN OUT parameter within the same scope of execute $sql = "call bindproc(:var1, :var2, :var3)"; $cache1 = 'STR1'; diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt index 102c59f81a5..c49dd0ee03d 100644 --- a/ext/oci8/tests/bug71600.phpt +++ b/ext/oci8/tests/bug71600.phpt @@ -4,7 +4,7 @@ Bug #71600 (oci_fetch_all result in segfault when select more than 8 columns) true, 'timesten' => true); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- = 11)) { "grant use on edition myedition1 to $testuser", ); } else { - // Server is Pre 11.2 + // Server is Pre 11.2 $stmtarray = array( "drop user $testuser cascade", "create user $testuser identified by $testpassword", @@ -34,7 +34,7 @@ foreach ($stmtarray as $stmt) { $m = oci_error($s); if (!in_array($m['code'], array( // ignore expected errors 942 // table or view does not exist - , 1918 // user does not exist + , 1918 // user does not exist , 2289 // sequence does not exist , 4080 // trigger does not exist , 38802 // edition does not exist @@ -50,8 +50,8 @@ foreach ($stmtarray as $stmt) { function get_attr($conn,$attr) { - $sel_stmt="select " .$attr. " from v\$session where sid = - (select sid from v\$session where audsid = + $sel_stmt="select " .$attr. " from v\$session where sid = + (select sid from v\$session where audsid = sys_context('userenv','sessionid')) order by 1"; $s2 = oci_parse($conn,$sel_stmt); oci_execute($s2,OCI_DEFAULT); @@ -60,8 +60,8 @@ function get_attr($conn,$attr) } } -/* Pass $conn_type=1 for a connection with oci_connect() - Pass $conn_type=2 for ooci_pconnect +/* Pass $conn_type=1 for a connection with oci_connect() + Pass $conn_type=2 for ooci_pconnect Default will give a oci_new_connect */ function get_conn($conn_type) @@ -87,23 +87,23 @@ function get_conn($conn_type) function set_attr($conn,$attr,$sufix) { - if (!strcmp($attr,'MODULE')) + if (!strcmp($attr,'MODULE')) $r = oci_set_module_name($conn,'PHP TEST'.$sufix); - else if (!strcmp($attr,'ACTION')) + else if (!strcmp($attr,'ACTION')) $r = oci_set_action($conn,'TASK'.$sufix); - else if (!strcmp($attr,'CLIENT_INFO')) + else if (!strcmp($attr,'CLIENT_INFO')) $r = oci_set_client_info($conn,'INFO1'.$sufix); - else if (!strcmp($attr,'CLIENT_IDENTIFIER')) + else if (!strcmp($attr,'CLIENT_IDENTIFIER')) $r = oci_set_client_identifier($conn,'ID00'.$sufix); else echo "Pass one of the above four attributes!!!\n"; if ($r) { echo "Value of $attr has been set successfully\n"; } - + //Do a round-trip here oci_server_version($conn); - return $r; + return $r; } function set_edit_attr($value) @@ -126,7 +126,7 @@ function get_edit_attr ($conn) { function get_sys_attr($conn,$attr) { - $sel_stmt="select " .$attr. " from v\$session where sid = + $sel_stmt="select " .$attr. " from v\$session where sid = (select sid from v\$session where audsid = sys_context('userenv','sessionid')) order by 1"; $s2 = oci_parse($conn,$sel_stmt); oci_execute($s2,OCI_DEFAULT); @@ -141,7 +141,7 @@ function clean_up($c) { "drop edition myedition cascade", "drop user " . $GLOBALS['testuser'] . " cascade", ); - + foreach ($stmtarray as $stmt) { $s = oci_parse($c, $stmt); @oci_execute($s); diff --git a/ext/oci8/tests/conn_attr_1.phpt b/ext/oci8/tests/conn_attr_1.phpt index 745b1cd93f9..d16e10f61cb 100644 --- a/ext/oci8/tests/conn_attr_1.phpt +++ b/ext/oci8/tests/conn_attr_1.phpt @@ -1,7 +1,7 @@ --TEST-- Set and get of connection attributes with all types of connections. --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); @@ -18,7 +18,7 @@ if (!(isset($matches[0]) && $matches[1] >= 10)) { true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); @@ -20,7 +20,7 @@ oci8.privileged_connect = On = 10)) { = 2) || ($matches[1] >= 12) ))) { @@ -22,7 +22,7 @@ if (!(isset($matches[0]) && = 10)) { true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- ===DONE=== ---EXPECT-- +--EXPECT-- array(2) { [0]=> string(1) "1" diff --git a/ext/oci8/tests/cursor_bind_err.phpt b/ext/oci8/tests/cursor_bind_err.phpt index 197aad1d197..3ee539f3d32 100644 --- a/ext/oci8/tests/cursor_bind_err.phpt +++ b/ext/oci8/tests/cursor_bind_err.phpt @@ -4,7 +4,7 @@ binding a cursor (with errors) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { @@ -13,11 +13,11 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } if (!function_exists('oci_set_db_operation')) -{ +{ die("skip function oci_set_db_operation() does not exist"); } ?> @@ -58,4 +58,4 @@ array(1) { string(7) "db_op_1" } ===DONE=== - + diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt index 05c2269ae0b..10c5700223b 100644 --- a/ext/oci8/tests/db_op_2.phpt +++ b/ext/oci8/tests/db_op_2.phpt @@ -1,8 +1,8 @@ --TEST-- oci_set_db_operation: basic test for end-to-end tracing --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { @@ -13,11 +13,11 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } if (!function_exists('oci_set_db_operation')) -{ +{ die("skip function oci_set_db_operation() does not exist"); } ?> @@ -66,4 +66,4 @@ array(2) { string(7) "db_op_2a" } ===DONE=== - + diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt index eaace0fa084..68906aa796c 100644 --- a/ext/oci8/tests/dbmsoutput.phpt +++ b/ext/oci8/tests/dbmsoutput.phpt @@ -4,7 +4,7 @@ PL/SQL: dbms_output true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs (Calling PL/SQL from SQL is not supported in TimesTen) require(dirname(__FILE__).'/skipif.inc'); -?> +?> --INI-- oci8.connection_class=test oci8.old_oci_close_semantics=0 @@ -24,7 +24,7 @@ var_dump($conn1 = oci_connect($user,$password,$dbase)); // Create the package drcp_create_package($conn1); -echo "Test 1b\n"; +echo "Test 1b\n"; // OCI_CONNECT echo " This is with OCI_CONNECT.....\n"; drcp_select_packagevar($conn1); // Returns 0 @@ -35,7 +35,7 @@ echo " Connection conn1 closed....\n"; echo "Test 2\n"; // Second connection should return 0 for the package variable. var_dump($conn2 = oci_connect($user,$password,$dbase)); -echo " Select with connection 2 \n"; +echo " Select with connection 2\n"; drcp_select_packagevar($conn2); // Returns 0 drcp_set_packagevar($conn2,100); @@ -43,7 +43,7 @@ echo "Test 3\n"; // Third connection. There is no oci_close() for conn2 hence this should // return the value set by conn2. var_dump($conn3 = oci_connect($user,$password,$dbase)); -echo " Select with connection 3 \n"; +echo " Select with connection 3\n"; drcp_select_packagevar($conn3); // Returns 100 // Close all the connections @@ -63,7 +63,7 @@ echo " Connection pconn1 closed....\n"; echo "Test 5\n"; var_dump($pconn2 = oci_pconnect($user,$password,$dbase)); -echo " Select with persistent connection 2 \n"; +echo " Select with persistent connection 2\n"; drcp_select_packagevar($pconn2); // Returns 1000 oci_close($pconn2); @@ -80,12 +80,12 @@ Test 1b Connection conn1 closed.... Test 2 resource(%d) of type (oci8 connection) - Select with connection 2 + Select with connection 2 The value of the package variable is 0 Package variable value set to 100 Test 3 resource(%d) of type (oci8 connection) - Select with connection 3 + Select with connection 3 The value of the package variable is 100 Test 4 This is with oci_pconnect()..... @@ -94,7 +94,7 @@ resource(%d) of type (oci8 persistent connection) Connection pconn1 closed.... Test 5 resource(%d) of type (oci8 persistent connection) - Select with persistent connection 2 + Select with persistent connection 2 The value of the package variable is 1000 Done diff --git a/ext/oci8/tests/drcp_connection_class.phpt b/ext/oci8/tests/drcp_connection_class.phpt index c01c144d236..b6ca31ce2a9 100644 --- a/ext/oci8/tests/drcp_connection_class.phpt +++ b/ext/oci8/tests/drcp_connection_class.phpt @@ -2,9 +2,9 @@ DRCP: oci8.connection_class with ini_get() and ini_set() --SKIPIF-- = 11)) { +if (!(isset($matches[0]) && $matches[0] >= 11)) { die("skip works only with Oracle 11g or greater version of Oracle client libraries"); } ?> @@ -16,15 +16,15 @@ oci8.connection_class=test echo "Setting a new connection class now\n"; ini_set('oci8.connection_class',"New cc"); -// Get the New connection class name .Should return New CC +// Get the New connection class name. Should return New CC $new_cc = ini_get('oci8.connection_class'); -echo "The New oci8.connection_class is $new_cc \n"; +echo "The New oci8.connection_class is $new_cc\n"; echo "Done\n"; ?> --EXPECTF-- Setting a new connection class now -The New oci8.connection_class is New cc +The New oci8.connection_class is New cc Done diff --git a/ext/oci8/tests/drcp_pconn_close1.phpt b/ext/oci8/tests/drcp_pconn_close1.phpt index a9b912b26fe..53e7b1e3ef1 100644 --- a/ext/oci8/tests/drcp_pconn_close1.phpt +++ b/ext/oci8/tests/drcp_pconn_close1.phpt @@ -29,9 +29,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : OK \n"; + echo "Both connections share a resource : OK\n"; else - echo "Both connections are different : NOT OK \n"; + echo "Both connections are different : NOT OK\n"; echo "Done\n"; @@ -40,5 +40,5 @@ echo "Done\n"; This is with a OCI_PCONNECT resource(%d) of type (oci8 persistent connection) resource(%d) of type (oci8 persistent connection) -Both connections share a resource : OK +Both connections share a resource : OK Done diff --git a/ext/oci8/tests/drcp_pconn_close2.phpt b/ext/oci8/tests/drcp_pconn_close2.phpt index 5fd2c2355f6..1c64762018c 100644 --- a/ext/oci8/tests/drcp_pconn_close2.phpt +++ b/ext/oci8/tests/drcp_pconn_close2.phpt @@ -31,9 +31,9 @@ oci_close($conn2); // Compare the resource numbers if ($rn1 === $rn2) - echo "Both connections share a resource : NOT OK \n"; + echo "Both connections share a resource : NOT OK\n"; else - echo "Both connections are different : OK \n"; + echo "Both connections are different : OK\n"; echo "Done\n"; @@ -42,5 +42,5 @@ echo "Done\n"; This is with a OCI_PCONNECT resource(%d) of type (oci8 persistent connection) resource(%d) of type (oci8 persistent connection) -Both connections are different : OK +Both connections are different : OK Done diff --git a/ext/oci8/tests/driver_name.phpt b/ext/oci8/tests/driver_name.phpt index a5be162e40e..bc42ad234d2 100644 --- a/ext/oci8/tests/driver_name.phpt +++ b/ext/oci8/tests/driver_name.phpt @@ -1,7 +1,7 @@ --TEST-- Verify that the Driver Name attribute is set --SKIPIF-- -= 2) || ($matches[1] >= 12) ))) { @@ -30,11 +30,11 @@ if (!(isset($matches[0]) && /* In 11.2, there can only be one child edition. So this test will * fail to create the necessary editions if a child edition exists - * already + * already */ $testuser = 'testuser_attr_1'; // Used in conn_attr.inc -$testpassword = 'testuser'; +$testpassword = 'testuser'; require(dirname(__FILE__)."/conn_attr.inc"); @@ -45,18 +45,18 @@ function select_fn($conn) { var_dump($row); } } -/* Create a editon MYEDITION +/* Create a editon MYEDITION create a view view_ed in MYEDITION1. create the same view 'view_ed' with a different definition in MYEDITION. select from both the editions and verify the contents. */ set_edit_attr('MYEDITION'); -$conn = oci_connect($testuser,$testpassword,$dbase); +$conn = oci_connect($testuser,$testpassword,$dbase); if ($conn === false) { $m = oci_error(); die("Error:" . $m['message']); } - + $stmtarray = array( "drop table edit_tab", "create table edit_tab (name varchar2(10),age number,job varchar2(50), salary number)", @@ -73,7 +73,7 @@ select_fn($conn); // Create a different version of view_ed in MYEDITION1. set_edit_attr('MYEDITION1'); -$conn2 = oci_new_connect($testuser,$testpassword,$dbase); +$conn2 = oci_new_connect($testuser,$testpassword,$dbase); $stmt = "create or replace editioning view view_ed as select name,age,job,salary from edit_tab"; $s = oci_parse($conn2, $stmt); oci_execute($s); @@ -83,7 +83,7 @@ get_edit_attr($conn2); select_fn($conn2); // Verify the contents in MYEDITION EDITION. -echo "version of view_ed in MYEDITION \n"; +echo "version of view_ed in MYEDITION\n"; get_edit_attr($conn); select_fn($conn); @@ -135,7 +135,7 @@ array(4) { [3]=> string(%d) "100" } -version of view_ed in MYEDITION +version of view_ed in MYEDITION The value of current EDITION is MYEDITION array(3) { [0]=> diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 12e902667e6..6d56f9be5ca 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -2,14 +2,14 @@ Set and check Oracle 11gR2 "edition" attribute --SKIPIF-- = 2) || ($matches[1] >= 12) ))) { @@ -33,7 +33,7 @@ if (!(isset($matches[0]) && */ $testuser = 'testuser_ed_2'; // Used in conn_attr.inc -$testpassword = 'testuser'; +$testpassword = 'testuser'; require(dirname(__FILE__)."/conn_attr.inc"); @@ -113,7 +113,7 @@ echo "\n\n**Test 1.7 - Test with ALTER SESSION statement to change the edition * set_edit_attr('MYEDITION'); $c1 = get_conn(3); -echo "get the value set to MYEDITION with oci_set_edition \n"; +echo "get the value set to MYEDITION with oci_set_edition\n"; get_edit_attr($c1); $alter_stmt = "alter session set edition = MYEDITION1"; @@ -123,7 +123,7 @@ oci_commit($c1); echo "Get the value set to MYEDITION1 with alter session\n"; get_edit_attr($c1); -echo " Get the value with a new connection \n"; +echo " Get the value with a new connection\n"; $c2 = get_conn(1); get_edit_attr($c2); @@ -131,7 +131,7 @@ echo " Set the value back using oci-set_edition\n"; set_edit_attr('MYEDITION'); get_edit_attr($c2); -echo " Get the value with a new conenction \n"; +echo " Get the value with a new conenction\n"; $c3 = get_conn(1); get_edit_attr($c3); @@ -225,17 +225,17 @@ The value of current EDITION is MYEDITION1 **Test 1.7 - Test with ALTER SESSION statement to change the edition ******* The value of edition has been successfully set Testing with oci_new_connect() -get the value set to MYEDITION with oci_set_edition +get the value set to MYEDITION with oci_set_edition The value of current EDITION is MYEDITION Get the value set to MYEDITION1 with alter session The value of current EDITION is MYEDITION1 - Get the value with a new connection + Get the value with a new connection Testing with oci_connect() The value of current EDITION is MYEDITION Set the value back using oci-set_edition The value of edition has been successfully set The value of current EDITION is MYEDITION - Get the value with a new conenction + Get the value with a new conenction Testing with oci_connect() The value of current EDITION is MYEDITION diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt index 7fedd0ddad6..c3fb2de6640 100644 --- a/ext/oci8/tests/error.phpt +++ b/ext/oci8/tests/error.phpt @@ -4,7 +4,7 @@ oci_error() error message for parsing error true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt index 8540db250a5..29650439e2b 100644 --- a/ext/oci8/tests/error3.phpt +++ b/ext/oci8/tests/error3.phpt @@ -1,7 +1,7 @@ --TEST-- Maximum Oracle error length --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); // Assume runtime client version is >= compile time client version @@ -21,11 +21,11 @@ echo "Test 1\n"; error_reporting(E_ALL); -$s = oci_parse($c, "declare -s varchar2(4000); -begin +$s = oci_parse($c, "declare +s varchar2(4000); +begin s := 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBabcdefghBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC'; -raise_application_error(-20333, s); +raise_application_error(-20333, s); end;"); oci_execute($s); diff --git a/ext/oci8/tests/error_bind.phpt b/ext/oci8/tests/error_bind.phpt index 6ee26ee8250..0b039a16d96 100644 --- a/ext/oci8/tests/error_bind.phpt +++ b/ext/oci8/tests/error_bind.phpt @@ -23,7 +23,7 @@ $stmt = oci_parse($c, "insert into bind_test values (:name)"); oci_bind_by_name($stmt, ":name", $name, 10, SQLT_CHR); var_dump(oci_execute($stmt)); -echo "Test 1 - Assign a resource to the bind variable and execute \n"; +echo "Test 1 - Assign a resource to the bind variable and execute\n"; $name=$c; var_dump(oci_execute($stmt)); @@ -50,7 +50,7 @@ echo "Done\n"; --EXPECTF-- Insert value bool(true) -Test 1 - Assign a resource to the bind variable and execute +Test 1 - Assign a resource to the bind variable and execute Warning: oci_execute(): Invalid variable used for bind in %s on line %d bool(false) diff --git a/ext/oci8/tests/error_bind_2.phpt b/ext/oci8/tests/error_bind_2.phpt index 642716887ea..592702b9319 100644 --- a/ext/oci8/tests/error_bind_2.phpt +++ b/ext/oci8/tests/error_bind_2.phpt @@ -1,8 +1,8 @@ --TEST-- Test some more oci_bind_by_name error conditions --SKIPIF-- - true, 'timesten' => true); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/error_bind_3.phpt b/ext/oci8/tests/error_bind_3.phpt index 7522dfe60a5..47ca71dcd13 100644 --- a/ext/oci8/tests/error_bind_3.phpt +++ b/ext/oci8/tests/error_bind_3.phpt @@ -1,8 +1,8 @@ --TEST-- Test some more oci_bind_by_name error conditions --SKIPIF-- - true, 'timesten' => true); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/error_old.phpt b/ext/oci8/tests/error_old.phpt index c6f9cd300d3..8df1ee5df2f 100644 --- a/ext/oci8/tests/error_old.phpt +++ b/ext/oci8/tests/error_old.phpt @@ -4,7 +4,7 @@ ocierror() true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- --EXPECTF-- diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt index db5c6c554b9..03640e5901c 100644 --- a/ext/oci8/tests/fetch_array.phpt +++ b/ext/oci8/tests/fetch_array.phpt @@ -4,7 +4,7 @@ oci_fetch_array() true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt index 860a5fbb34e..ca92eba3d36 100644 --- a/ext/oci8/tests/imp_res_2.phpt +++ b/ext/oci8/tests/imp_res_2.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: Zero Rows --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt index 0fc4815893d..53c04651282 100644 --- a/ext/oci8/tests/imp_res_3.phpt +++ b/ext/oci8/tests/imp_res_3.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: bigger data size --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_4.phpt b/ext/oci8/tests/imp_res_4.phpt index 762ae772249..d938f9f4cea 100644 --- a/ext/oci8/tests/imp_res_4.phpt +++ b/ext/oci8/tests/imp_res_4.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_fetch --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_5.phpt b/ext/oci8/tests/imp_res_5.phpt index 564a7a37404..7c06dee78f4 100644 --- a/ext/oci8/tests/imp_res_5.phpt +++ b/ext/oci8/tests/imp_res_5.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_fetch_all --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_6.phpt b/ext/oci8/tests/imp_res_6.phpt index f94efe70db9..278c47b3118 100644 --- a/ext/oci8/tests/imp_res_6.phpt +++ b/ext/oci8/tests/imp_res_6.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: alternating oci_fetch_* calls --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt index 05ae5e68579..abcf8aeb1b5 100644 --- a/ext/oci8/tests/imp_res_7.phpt +++ b/ext/oci8/tests/imp_res_7.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: bigger data size --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_call_error.phpt b/ext/oci8/tests/imp_res_call_error.phpt index bae2c47e9ef..774131ee00c 100644 --- a/ext/oci8/tests/imp_res_call_error.phpt +++ b/ext/oci8/tests/imp_res_call_error.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: using SQL 'CALL' --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt index 663d630dfbe..692a1fabb1a 100644 --- a/ext/oci8/tests/imp_res_cancel.phpt +++ b/ext/oci8/tests/imp_res_cancel.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_cancel --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt index f01205dc48e..de85a3d1ca9 100644 --- a/ext/oci8/tests/imp_res_close.phpt +++ b/ext/oci8/tests/imp_res_close.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_free_statement #1 --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt index cac0a5d1c0b..6ba1261f257 100644 --- a/ext/oci8/tests/imp_res_cursor.phpt +++ b/ext/oci8/tests/imp_res_cursor.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: nested cursor --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt index 8c9808d96c3..6f1d7cb2157 100644 --- a/ext/oci8/tests/imp_res_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: interleaved with DBMS_OUTPUT --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt index 54b8295cf92..5cb88569ca7 100644 --- a/ext/oci8/tests/imp_res_field.phpt +++ b/ext/oci8/tests/imp_res_field.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: field tests --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_func_error.phpt b/ext/oci8/tests/imp_res_func_error.phpt index 73c0557930c..a5c7e84241d 100644 --- a/ext/oci8/tests/imp_res_func_error.phpt +++ b/ext/oci8/tests/imp_res_func_error.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: test with a PL/SQL function --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt index 665f773b573..226f1e557be 100644 --- a/ext/oci8/tests/imp_res_get_1.phpt +++ b/ext/oci8/tests/imp_res_get_1.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt index b20b8dd3970..1747e4b4e30 100644 --- a/ext/oci8/tests/imp_res_get_2.phpt +++ b/ext/oci8/tests/imp_res_get_2.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: similar to imp_res_get_1 but with unrolled loop --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt index 15b2efaef0d..dd3e141fa57 100644 --- a/ext/oci8/tests/imp_res_get_3.phpt +++ b/ext/oci8/tests/imp_res_get_3.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test 3 --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_4.phpt b/ext/oci8/tests/imp_res_get_4.phpt index ea7fb8775a7..658ec9c050e 100644 --- a/ext/oci8/tests/imp_res_get_4.phpt +++ b/ext/oci8/tests/imp_res_get_4.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleaved fetches --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt index 3cfa0967a21..cee25cc5095 100644 --- a/ext/oci8/tests/imp_res_get_5.phpt +++ b/ext/oci8/tests/imp_res_get_5.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: get from wrong statement --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -27,7 +27,7 @@ function print_row($row) echo "\n"; } -$plsql = +$plsql = "declare c1 sys_refcursor; begin diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt index d2dcbea6c78..02ea0cbe1f5 100644 --- a/ext/oci8/tests/imp_res_get_all.phpt +++ b/ext/oci8/tests/imp_res_get_all.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_fetch_all --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt index 7dbcecbfe9d..a9a6d723230 100644 --- a/ext/oci8/tests/imp_res_get_cancel.phpt +++ b/ext/oci8/tests/imp_res_get_cancel.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_cancel --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -53,4 +53,4 @@ Test 1 1 3 ===DONE=== - + diff --git a/ext/oci8/tests/imp_res_get_close_1.phpt b/ext/oci8/tests/imp_res_get_close_1.phpt index 0e3b3b0c13d..20f46b4f1cf 100644 --- a/ext/oci8/tests/imp_res_get_close_1.phpt +++ b/ext/oci8/tests/imp_res_get_close_1.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #1 --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -21,7 +21,7 @@ require(dirname(__FILE__).'/connect.inc'); // Initialization -$plsql = +$plsql = "declare c1 sys_refcursor; begin diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt index 419a4f4f053..efc0e6da607 100644 --- a/ext/oci8/tests/imp_res_get_close_2.phpt +++ b/ext/oci8/tests/imp_res_get_close_2.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #2 --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt index 4793a6c8820..3cf0b503de5 100644 --- a/ext/oci8/tests/imp_res_get_close_3.phpt +++ b/ext/oci8/tests/imp_res_get_close_3.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_statement #3 --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt index ccdb6f54903..e00472d18ee 100644 --- a/ext/oci8/tests/imp_res_get_cursor.phpt +++ b/ext/oci8/tests/imp_res_get_cursor.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: nested cursor --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt index cbc2389e468..a20d1eaf69f 100644 --- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleaved with DBMS_OUTPUT --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -153,4 +153,4 @@ array(3) { string(6) "Line 3" } ===DONE=== - + diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt index dbd8f3ef3a2..d36fb661363 100644 --- a/ext/oci8/tests/imp_res_get_exec.phpt +++ b/ext/oci8/tests/imp_res_get_exec.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: Execute twice --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt index 981f4945e24..f97b7987507 100644 --- a/ext/oci8/tests/imp_res_get_none.phpt +++ b/ext/oci8/tests/imp_res_get_none.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: no implicit results --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt index d9c0705b554..2fea690607f 100644 --- a/ext/oci8/tests/imp_res_insert.phpt +++ b/ext/oci8/tests/imp_res_insert.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: Commit modes --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt index 247803581d2..3e52fb117e9 100644 --- a/ext/oci8/tests/imp_res_lob.phpt +++ b/ext/oci8/tests/imp_res_lob.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: LOBs --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> @@ -35,7 +35,7 @@ $stmtarray = array( open c1 for select * from imp_res_lob_tab order by 1; dbms_sql.return_result(c1); open c1 for select * from dual; - dbms_sql.return_result(c1); + dbms_sql.return_result(c1); open c1 for select c2 from imp_res_lob_tab order by c1; dbms_sql.return_result(c1); end;" @@ -50,7 +50,7 @@ $s = oci_parse($c, "begin imp_res_lob_proc(); end;"); oci_execute($s); while (($row = oci_fetch_row($s)) != false) { foreach ($row as $item) { - if (is_object($item)) { + if (is_object($item)) { echo " " . $item->load(); } else { echo " " . $item; @@ -64,7 +64,7 @@ $s = oci_parse($c, "begin imp_res_lob_proc(); end;"); oci_execute($s); $row = oci_fetch_row($s); foreach ($row as $item) { - if (is_object($item)) { + if (is_object($item)) { echo " " . $item->load(); } else { echo " " . $item; diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt index 5acdd518e58..8daa2ff4148 100644 --- a/ext/oci8/tests/imp_res_prefetch.phpt +++ b/ext/oci8/tests/imp_res_prefetch.phpt @@ -1,8 +1,8 @@ --TEST-- Oracle Database 12c Implicit Result Sets: basic test --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); @@ -10,7 +10,7 @@ if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); } preg_match('/^[[:digit:]]+/', oci_client_version(), $matches); -if (!(isset($matches[0]) && $matches[0] >= 12)) { +if (!(isset($matches[0]) && $matches[0] >= 12)) { die("skip works only with Oracle 12c or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/ini_1.phpt b/ext/oci8/tests/ini_1.phpt index 2fba79813e8..0c3597b6194 100644 --- a/ext/oci8/tests/ini_1.phpt +++ b/ext/oci8/tests/ini_1.phpt @@ -1,10 +1,10 @@ --TEST-- Test OCI8 php.ini settings --SKIPIF-- -= 11)) { +if (!(isset($matches[0]) && $matches[0] >= 11)) { die("skip works only with Oracle 11g or greater version of Oracle client libraries"); } ?> diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt index cb94bfae132..a6967fa787f 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_002.phpt b/ext/oci8/tests/lob_002.phpt index 912c27b9892..f2c585b817a 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -4,7 +4,7 @@ oci_lob_write() and friends (with errors) true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- ---EXPECTF-- +--EXPECTF-- Test 1. Check how many rows in the table array(1) { ["NUMROWS"]=> diff --git a/ext/oci8/tests/lob_030.phpt b/ext/oci8/tests/lob_030.phpt index d7fd21b961c..013a3f0c450 100644 --- a/ext/oci8/tests/lob_030.phpt +++ b/ext/oci8/tests/lob_030.phpt @@ -4,7 +4,7 @@ Test piecewise fetch of CLOBs equal to, and larger than PHP_OCI_LOB_BUFFER_SIZE true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- read(), LOB->seek() and LOB->tell() with nul bytes in data true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- write() for multiple inserts true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- tell() . "\n"; echo "Data: " . $row[$i][0]->read(12) . "\n"; } - + echo "Done\n"; ?> diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt index c5c0a209f3c..944952982fb 100644 --- a/ext/oci8/tests/lob_041.phpt +++ b/ext/oci8/tests/lob_041.phpt @@ -4,7 +4,7 @@ Check LOBS are valid after statement free true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --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_043.phpt b/ext/oci8/tests/lob_043.phpt index 4cd159510b2..5d723be4478 100644 --- a/ext/oci8/tests/lob_043.phpt +++ b/ext/oci8/tests/lob_043.phpt @@ -16,7 +16,7 @@ require(dirname(__FILE__).'/connect.inc'); $stmtarray = array( "drop table lob_043_tab", "create table lob_043_tab(id number, c1 clob)", - "begin + "begin for i in 1..50000 loop insert into lob_043_tab (id, c1) values (i, i || ' abcdefghijklmnopq'); end loop; diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt index 28599cc33b5..a4ea684ae00 100644 --- a/ext/oci8/tests/lob_044.phpt +++ b/ext/oci8/tests/lob_044.phpt @@ -4,7 +4,7 @@ oci_lob_truncate() with default parameter value true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- close(); } @@ -57,7 +57,7 @@ $r = @oci_execute($s); if (!$r) { $m = oci_error($s); echo $m['message'], "\n"; -} +} else { $lob->close(); } @@ -71,7 +71,7 @@ $r = @oci_execute($s); if (!$r) { $m = oci_error($s); echo $m['message'], "\n"; -} +} else { $lob->close(); } @@ -87,7 +87,7 @@ $r = @oci_execute($s); if (!$r) { $m = oci_error($s); echo $m['message'], "\n"; -} +} else { $lob->close(); } @@ -101,7 +101,7 @@ $r = @oci_execute($s); if (!$r) { $m = oci_error($s); echo $m['message'], "\n"; -} +} else { $lob->close(); } @@ -115,7 +115,7 @@ $r = @oci_execute($s); if (!$r) { $m = oci_error($s); echo $m['message'], "\n"; -} +} else { $lob->close(); } @@ -188,7 +188,7 @@ $s = oci_parse($c, 'drop table lob_null_tab'); echo "Done\n"; ?> ---EXPECTF-- +--EXPECTF-- Temporary CLOB: NULL Temporary CLOB: '' Temporary CLOB: text diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt index 9a07fb5ac0b..513496942ba 100644 --- a/ext/oci8/tests/lob_temp.phpt +++ b/ext/oci8/tests/lob_temp.phpt @@ -4,7 +4,7 @@ temporary lobs true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --INI-- display_errors = On error_reporting = E_WARNING @@ -28,7 +28,7 @@ $s = oci_parse($c, "select * from dual where :bv = 1"); $bv = 1; oci_bind_by_name($s, ":bv\0:bv", $bv); oci_execute($s); - + ?> ===DONE=== diff --git a/ext/oci8/tests/oci_execute_segfault.phpt b/ext/oci8/tests/oci_execute_segfault.phpt index 59eb8013e9a..08a41a82eca 100644 --- a/ext/oci8/tests/oci_execute_segfault.phpt +++ b/ext/oci8/tests/oci_execute_segfault.phpt @@ -4,7 +4,7 @@ oci_execute() segfault after repeated bind of LOB descriptor true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- --FILE-- @@ -35,7 +35,7 @@ var_dump($c2); $rn2 = (int)$c2; // Despite using the old password this connect should succeed and return the original resource -$c3 = oci_connect("testuser_pw", "testuserpwd", $dbase); +$c3 = oci_connect("testuser_pw", "testuserpwd", $dbase); var_dump($c3); $rn3 = (int)$c3; diff --git a/ext/oci8/tests/password_2.phpt b/ext/oci8/tests/password_2.phpt index 13da9ff7b26..62fddb4c362 100644 --- a/ext/oci8/tests/password_2.phpt +++ b/ext/oci8/tests/password_2.phpt @@ -1,11 +1,11 @@ --TEST-- oci_password_change() for persistent connections --SKIPIF-- - --FILE-- @@ -34,7 +34,7 @@ var_dump($c2); $rn2 = (int)$c2; // Despite using the old password this connect should succeed and return the original resource -$c3 = oci_pconnect("testuser_pw2", "testuserpwd", $dbase); +$c3 = oci_pconnect("testuser_pw2", "testuserpwd", $dbase); var_dump($c3); $rn3 = (int)$c3; diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt index 3c1c7887c2f..42df6905db7 100644 --- a/ext/oci8/tests/pecl_bug10194.phpt +++ b/ext/oci8/tests/pecl_bug10194.phpt @@ -1,5 +1,5 @@ --TEST-- -PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) +PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) --SKIPIF-- true, 'timesten' => false); // test runs on these DBs @@ -8,7 +8,7 @@ if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); } -?> +?> --INI-- memory_limit=10M --FILE-- diff --git a/ext/oci8/tests/pecl_bug10194_blob.phpt b/ext/oci8/tests/pecl_bug10194_blob.phpt index 96f94bcf4c1..aab1cf88821 100644 --- a/ext/oci8/tests/pecl_bug10194_blob.phpt +++ b/ext/oci8/tests/pecl_bug10194_blob.phpt @@ -1,5 +1,5 @@ --TEST-- -PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) +PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) --SKIPIF-- true, 'timesten' => false); // test runs on these DBs @@ -9,14 +9,14 @@ if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); } -?> +?> --INI-- memory_limit=3M --FILE-- ---EXPECTF-- +--EXPECTF-- Before load() Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt index e1a4cc034e2..ca5e568be37 100644 --- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt +++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt @@ -1,7 +1,7 @@ --TEST-- -PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) +PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside the callback) --SKIPIF-- - true, 'timesten' => false); // test runs on thes require(dirname(__FILE__).'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); @@ -16,7 +16,7 @@ memory_limit=6M ---EXPECTF-- +--EXPECTF-- Before load() Fatal error: Allowed memory size of %d bytes exhausted%s(tried to allocate %d bytes) in %s on line %d diff --git a/ext/oci8/tests/pecl_bug16035.phpt b/ext/oci8/tests/pecl_bug16035.phpt index 29ff6439d1c..d557e0a5c03 100644 --- a/ext/oci8/tests/pecl_bug16035.phpt +++ b/ext/oci8/tests/pecl_bug16035.phpt @@ -1,8 +1,8 @@ --TEST-- PECL Bug #16035 (Crash with Oracle 10.2 connecting with a character set but ORACLE_HOME is not set) --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --INI-- error_reporting = E_WARNING --FILE-- diff --git a/ext/oci8/tests/pecl_bug8816.phpt b/ext/oci8/tests/pecl_bug8816.phpt index 71771b21004..9e151f6a8c6 100644 --- a/ext/oci8/tests/pecl_bug8816.phpt +++ b/ext/oci8/tests/pecl_bug8816.phpt @@ -4,7 +4,7 @@ PECL Bug #8816 (issue in php_oci_statement_fetch with more than one piecewise co true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); -?> +?> --FILE-- = 10))) { die("skip expected output only valid when using Oracle 10g or greater database server"); } @@ -21,7 +21,7 @@ if (!(isset($matches[0]) && = 10))) { die("skip expected output only valid when using Oracle 10g or greater database server"); } @@ -21,7 +21,7 @@ if (!(isset($matches[0]) && = 2) || ($matches[1] >= 12) ))) { @@ -57,7 +57,7 @@ oci_execute($s); $data = oci_fetch_array($s); oci_execute($data['CURS1']); -// Calculate round-trips +// Calculate round-trips $initial_rt = print_roundtrips($c); for ($i = 0;$i<10;$i++) { echo "Fetch Row using Nested cursor Query\n"; diff --git a/ext/oci8/tests/refcur_prefetch_4.phpt b/ext/oci8/tests/refcur_prefetch_4.phpt index 131ae6ad6b0..8ec4c983a30 100644 --- a/ext/oci8/tests/refcur_prefetch_4.phpt +++ b/ext/oci8/tests/refcur_prefetch_4.phpt @@ -5,7 +5,7 @@ Prefetch with REF cursor. Test No 4 if (!extension_loaded('oci8')) die("skip no oci8 extension"); require(dirname(__FILE__)."/connect.inc"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); -if (!(isset($matches[0]) && +if (!(isset($matches[0]) && ($matches[1] >= 10))) { die("skip expected output only valid when using Oracle 10g or greater database server"); } @@ -21,7 +21,7 @@ if (!(isset($matches[0]) && true, 'timesten' => true); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); ?> diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt index 1855ed08873..8fb6206f26d 100644 --- a/ext/oci8/tests/xmltype_01.phpt +++ b/ext/oci8/tests/xmltype_01.phpt @@ -1,7 +1,7 @@ --TEST-- Basic XMLType test --SKIPIF-- - true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt index 9a17f5db180..a21e5e47ef0 100644 --- a/ext/oci8/tests/xmltype_02.phpt +++ b/ext/oci8/tests/xmltype_02.phpt @@ -5,7 +5,7 @@ Basic XMLType test #2 $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs require(dirname(__FILE__).'/skipif.inc'); if (!extension_loaded("simplexml")) die ("skip no simplexml extension"); -?> +?> --FILE--