diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2019-03-15 23:36:47 +0100 |
| commit | 6426420f61de0df32a6085924d25b347c8788363 (patch) | |
| tree | ef32814ffbea0ad3c3c38a942f9751302606c736 /ext/oci8 | |
| parent | f26c8644bb340e9e7abb6d1cedb091e9d87dd1d4 (diff) | |
| parent | 26dfce7f36d1c6f737ac241df1315a1b42b932c7 (diff) | |
| download | php-git-6426420f61de0df32a6085924d25b347c8788363.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Replace dirname(__FILE__) by __DIR__ in tests
Diffstat (limited to 'ext/oci8')
349 files changed, 743 insertions, 743 deletions
diff --git a/ext/oci8/tests/array_bind_001.phpt b/ext/oci8/tests/array_bind_001.phpt index 15a8647779..30c22880ba 100644 --- a/ext/oci8/tests/array_bind_001.phpt +++ b/ext/oci8/tests/array_bind_001.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name() and invalid values 1 --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_002.phpt b/ext/oci8/tests/array_bind_002.phpt index 2bf39b5865..14635356ba 100644 --- a/ext/oci8/tests/array_bind_002.phpt +++ b/ext/oci8/tests/array_bind_002.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name() and invalid values 2 --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_003.phpt b/ext/oci8/tests/array_bind_003.phpt index 0979f4340f..c8f415d0ce 100644 --- a/ext/oci8/tests/array_bind_003.phpt +++ b/ext/oci8/tests/array_bind_003.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and invalid values 3 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_004.phpt b/ext/oci8/tests/array_bind_004.phpt index d9dfb01548..0a1b89d1d4 100644 --- a/ext/oci8/tests/array_bind_004.phpt +++ b/ext/oci8/tests/array_bind_004.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and invalid values 4 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_005.phpt b/ext/oci8/tests/array_bind_005.phpt index b9a8b8c820..6575ad70d5 100644 --- a/ext/oci8/tests/array_bind_005.phpt +++ b/ext/oci8/tests/array_bind_005.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and invalid values 5 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_006.phpt b/ext/oci8/tests/array_bind_006.phpt index 56db1aea61..85615d85ea 100644 --- a/ext/oci8/tests/array_bind_006.phpt +++ b/ext/oci8/tests/array_bind_006.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name(), SQLT_CHR and default max_length --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_007.phpt b/ext/oci8/tests/array_bind_007.phpt index 7cde333aad..d4896821c2 100644 --- a/ext/oci8/tests/array_bind_007.phpt +++ b/ext/oci8/tests/array_bind_007.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name() and invalid values 7 --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_008.phpt b/ext/oci8/tests/array_bind_008.phpt index 5b1975cd18..e7d31a1381 100644 --- a/ext/oci8/tests/array_bind_008.phpt +++ b/ext/oci8/tests/array_bind_008.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and invalid values 8 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_009.phpt b/ext/oci8/tests/array_bind_009.phpt index 64b2e8cded..b00efc0c24 100644 --- a/ext/oci8/tests/array_bind_009.phpt +++ b/ext/oci8/tests/array_bind_009.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name() and invalid values 9 --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; var_dump(oci_bind_array_by_name($c, ":c1", $array, 5, 5, SQLT_CHR)); diff --git a/ext/oci8/tests/array_bind_010.phpt b/ext/oci8/tests/array_bind_010.phpt index b5ba85938c..55488df21c 100644 --- a/ext/oci8/tests/array_bind_010.phpt +++ b/ext/oci8/tests/array_bind_010.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name() and invalid values 8 --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, 'SELECT user FROM all_objects'); diff --git a/ext/oci8/tests/array_bind_011.phpt b/ext/oci8/tests/array_bind_011.phpt index 164821c221..711c57e4a2 100644 --- a/ext/oci8/tests/array_bind_011.phpt +++ b/ext/oci8/tests/array_bind_011.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_012.phpt b/ext/oci8/tests/array_bind_012.phpt index e2b74a9ce9..6b198b2a7f 100644 --- a/ext/oci8/tests/array_bind_012.phpt +++ b/ext/oci8/tests/array_bind_012.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, 'SELECT user FROM all_objects'); diff --git a/ext/oci8/tests/array_bind_013.phpt b/ext/oci8/tests/array_bind_013.phpt index 44d4bd1e6d..0d9ddabc15 100644 --- a/ext/oci8/tests/array_bind_013.phpt +++ b/ext/oci8/tests/array_bind_013.phpt @@ -5,7 +5,7 @@ oci_bind_array_by_name(), SQLT_CHR, default max_length and empty array --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, 'SELECT user FROM v$session'); diff --git a/ext/oci8/tests/array_bind_014.phpt b/ext/oci8/tests/array_bind_014.phpt index 51224bc3e0..ca5823bc0f 100644 --- a/ext/oci8/tests/array_bind_014.phpt +++ b/ext/oci8/tests/array_bind_014.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and NUMBERs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_bdouble.phpt b/ext/oci8/tests/array_bind_bdouble.phpt index d3f3490356..5b9b433afe 100644 --- a/ext/oci8/tests/array_bind_bdouble.phpt +++ b/ext/oci8/tests/array_bind_bdouble.phpt @@ -3,13 +3,13 @@ Unsupported type: oci_bind_array_by_name() and SQLT_BDOUBLE --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (!defined('SQLT_BDOUBLE')) die('skip SQLT_BDOUBLE type not available on older Oracle clients'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, "BEGIN array_bind_bdouble_pkg.iobind(:c1); END;"); $array = Array(1.243,2.5658,3.4234,4.2123,5.9999); diff --git a/ext/oci8/tests/array_bind_bfloat.phpt b/ext/oci8/tests/array_bind_bfloat.phpt index 4ec385f54f..598ea504d6 100644 --- a/ext/oci8/tests/array_bind_bfloat.phpt +++ b/ext/oci8/tests/array_bind_bfloat.phpt @@ -3,13 +3,13 @@ Unsupported type: oci_bind_array_by_name() and SQLT_BFLOAT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (!defined('SQLT_BFLOAT')) die('skip SQLT_BFLOAT type not available on older Oracle clients'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, "BEGIN array_bind_bfloat_pkg.iobind(:c1); END;"); $array = Array(1.243,2.5658,3.4234,4.2123,5.9999); diff --git a/ext/oci8/tests/array_bind_date.phpt b/ext/oci8/tests/array_bind_date.phpt index 75d2dbb3ba..c04703d446 100644 --- a/ext/oci8/tests/array_bind_date.phpt +++ b/ext/oci8/tests/array_bind_date.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_ODT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_date1.phpt b/ext/oci8/tests/array_bind_date1.phpt index c0228539a1..5d5d6bdeb6 100644 --- a/ext/oci8/tests/array_bind_date1.phpt +++ b/ext/oci8/tests/array_bind_date1.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_ODT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_float.phpt b/ext/oci8/tests/array_bind_float.phpt index dbd1437696..7b6dfc680c 100644 --- a/ext/oci8/tests/array_bind_float.phpt +++ b/ext/oci8/tests/array_bind_float.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_FLT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_float1.phpt b/ext/oci8/tests/array_bind_float1.phpt index c342c0eb58..8fbb694228 100644 --- a/ext/oci8/tests/array_bind_float1.phpt +++ b/ext/oci8/tests/array_bind_float1.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_FLT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_int.phpt b/ext/oci8/tests/array_bind_int.phpt index 19fa3bf2ac..6a6d709e38 100644 --- a/ext/oci8/tests/array_bind_int.phpt +++ b/ext/oci8/tests/array_bind_int.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_INT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_int1.phpt b/ext/oci8/tests/array_bind_int1.phpt index b730cb2f20..6fa8c5ce69 100644 --- a/ext/oci8/tests/array_bind_int1.phpt +++ b/ext/oci8/tests/array_bind_int1.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_INT --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_str.phpt b/ext/oci8/tests/array_bind_str.phpt index 70c148afcf..ee712d2b64 100644 --- a/ext/oci8/tests/array_bind_str.phpt +++ b/ext/oci8/tests/array_bind_str.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_CHR --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_str1.phpt b/ext/oci8/tests/array_bind_str1.phpt index aabed16d4f..2094e78ba5 100644 --- a/ext/oci8/tests/array_bind_str1.phpt +++ b/ext/oci8/tests/array_bind_str1.phpt @@ -3,12 +3,12 @@ oci_bind_array_by_name() and SQLT_CHR --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/array_bind_uin.phpt b/ext/oci8/tests/array_bind_uin.phpt index 2542ee27df..f35fce7c19 100644 --- a/ext/oci8/tests/array_bind_uin.phpt +++ b/ext/oci8/tests/array_bind_uin.phpt @@ -3,12 +3,12 @@ Unsupported type: oci_bind_array_by_name() and SQLT_UIN --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $statement = oci_parse($c, "BEGIN array_bind_uin_pkg.iobind(:c1); END;"); $array = Array(1.243,2.5658,3.4234,4.2123,5.9999); diff --git a/ext/oci8/tests/b47243_1.phpt b/ext/oci8/tests/b47243_1.phpt index 711c3f79c9..8e0b043518 100644 --- a/ext/oci8/tests/b47243_1.phpt +++ b/ext/oci8/tests/b47243_1.phpt @@ -3,12 +3,12 @@ Bug #47243 (Crash on exit with ZTS mode) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/b47243_2.phpt b/ext/oci8/tests/b47243_2.phpt index 0a71760b60..faf61e6c79 100644 --- a/ext/oci8/tests/b47243_2.phpt +++ b/ext/oci8/tests/b47243_2.phpt @@ -3,12 +3,12 @@ Bug #47243 (Crash on exit with ZTS mode) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/b47243_3.phpt b/ext/oci8/tests/b47243_3.phpt index 20e94b7676..74eadc8df9 100644 --- a/ext/oci8/tests/b47243_3.phpt +++ b/ext/oci8/tests/b47243_3.phpt @@ -3,12 +3,12 @@ Bug #47243 (Crash on exit with ZTS mode) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/bind_boolean_1.phpt b/ext/oci8/tests/bind_boolean_1.phpt index 35da536c05..7c77187056 100644 --- a/ext/oci8/tests/bind_boolean_1.phpt +++ b/ext/oci8/tests/bind_boolean_1.phpt @@ -3,7 +3,7 @@ Basic PL/SQL "BOOLEAN" (SQLT_BOL) bind test --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -16,7 +16,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/bind_char_1.phpt b/ext/oci8/tests/bind_char_1.phpt index 477bb1422f..fbd1d65bd2 100644 --- a/ext/oci8/tests/bind_char_1.phpt +++ b/ext/oci8/tests/bind_char_1.phpt @@ -3,7 +3,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_1_11gR1.phpt b/ext/oci8/tests/bind_char_1_11gR1.phpt index 7a97213cad..ea49c96b75 100644 --- a/ext/oci8/tests/bind_char_1_11gR1.phpt +++ b/ext/oci8/tests/bind_char_1_11gR1.phpt @@ -3,7 +3,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -17,7 +17,7 @@ NLS_LANG=.AL32UTF8 // Output is for 32 bit client to 64bit 11.1.0.6 -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_2.phpt b/ext/oci8/tests/bind_char_2.phpt index 5ab03553b7..8200dcf368 100644 --- a/ext/oci8/tests/bind_char_2.phpt +++ b/ext/oci8/tests/bind_char_2.phpt @@ -3,7 +3,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_2_11gR1.phpt b/ext/oci8/tests/bind_char_2_11gR1.phpt index 00831111b6..3ee9648221 100644 --- a/ext/oci8/tests/bind_char_2_11gR1.phpt +++ b/ext/oci8/tests/bind_char_2_11gR1.phpt @@ -3,7 +3,7 @@ SELECT oci_bind_by_name with SQLT_AFC aka CHAR and dates --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -15,7 +15,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_3.phpt b/ext/oci8/tests/bind_char_3.phpt index 8c86d4dfae..f4d8c1f242 100644 --- a/ext/oci8/tests/bind_char_3.phpt +++ b/ext/oci8/tests/bind_char_3.phpt @@ -3,7 +3,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_3_11gR1.phpt b/ext/oci8/tests/bind_char_3_11gR1.phpt index 3c3d3b36dc..1adcae2a74 100644 --- a/ext/oci8/tests/bind_char_3_11gR1.phpt +++ b/ext/oci8/tests/bind_char_3_11gR1.phpt @@ -3,7 +3,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to CHAR parameter --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -15,7 +15,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_4.phpt b/ext/oci8/tests/bind_char_4.phpt index 60d7ac6c9f..218f0b03cf 100644 --- a/ext/oci8/tests/bind_char_4.phpt +++ b/ext/oci8/tests/bind_char_4.phpt @@ -3,7 +3,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -17,7 +17,7 @@ NLS_LANG=.AL32UTF8 // Same test as bind_char_3 but the PL/SQL function uses VARCHAR2 instead of CHAR -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_char_4_11gR1.phpt b/ext/oci8/tests/bind_char_4_11gR1.phpt index 9bc0ddf428..51350e533e 100644 --- a/ext/oci8/tests/bind_char_4_11gR1.phpt +++ b/ext/oci8/tests/bind_char_4_11gR1.phpt @@ -3,7 +3,7 @@ PL/SQL oci_bind_by_name with SQLT_AFC aka CHAR to VARCHAR2 parameter --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -17,7 +17,7 @@ NLS_LANG=.AL32UTF8 // Same test as bind_char_3 but the PL/SQL function uses VARCHAR2 instead of CHAR -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_empty.phpt b/ext/oci8/tests/bind_empty.phpt index 90e7679371..ae8cbbca2d 100644 --- a/ext/oci8/tests/bind_empty.phpt +++ b/ext/oci8/tests/bind_empty.phpt @@ -5,7 +5,7 @@ binding empty values --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table bind_empty_tab"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/bind_long.phpt b/ext/oci8/tests/bind_long.phpt index ca19e7edfd..7dc1c0db23 100644 --- a/ext/oci8/tests/bind_long.phpt +++ b/ext/oci8/tests/bind_long.phpt @@ -3,12 +3,12 @@ bind LONG field --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmt = oci_parse($c, "drop table phptestlng"); @oci_execute($stmt); @@ -20,7 +20,7 @@ echo "Test 1\n"; $stmt = oci_parse ($c, "insert into phptestlng (id, filetxt) values (:id, :filetxt)"); $i=1; -$filetxt1 = file_get_contents( dirname(__FILE__)."/test.txt"); +$filetxt1 = file_get_contents( __DIR__."/test.txt"); $filetxt = str_replace("\r", "", $filetxt1); oci_bind_by_name( $stmt, ":id", $i, -1); diff --git a/ext/oci8/tests/bind_long_raw.phpt b/ext/oci8/tests/bind_long_raw.phpt index d1a903899c..d008604812 100644 --- a/ext/oci8/tests/bind_long_raw.phpt +++ b/ext/oci8/tests/bind_long_raw.phpt @@ -3,19 +3,19 @@ bind LONG RAW field --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $stmt = oci_parse($c, "create table phptestlngraw( id number(10), fileimage long raw)"); oci_execute($stmt); $stmt = oci_parse ($c, "insert into phptestlngraw (id, fileimage) values (:id, :fileimage)"); $i=1; -$fileimage = file_get_contents( dirname(__FILE__)."/test.gif"); +$fileimage = file_get_contents( __DIR__."/test.gif"); oci_bind_by_name( $stmt, ":id", $i, -1); oci_bind_by_name( $stmt, ":fileimage", $fileimage, -1, SQLT_LBI); diff --git a/ext/oci8/tests/bind_misccoltypes.phpt b/ext/oci8/tests/bind_misccoltypes.phpt index cc2a269aee..0cc307b4d4 100644 --- a/ext/oci8/tests/bind_misccoltypes.phpt +++ b/ext/oci8/tests/bind_misccoltypes.phpt @@ -3,12 +3,12 @@ Bind miscellaneous column types using default types --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_misccoltypes_errs.phpt b/ext/oci8/tests/bind_misccoltypes_errs.phpt index d1ba41b2c3..5c443d0f69 100644 --- a/ext/oci8/tests/bind_misccoltypes_errs.phpt +++ b/ext/oci8/tests/bind_misccoltypes_errs.phpt @@ -5,7 +5,7 @@ Bind miscellaneous column types and generating errors --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_number.phpt b/ext/oci8/tests/bind_number.phpt index 0fc5fedfa4..429bbe0ef7 100644 --- a/ext/oci8/tests/bind_number.phpt +++ b/ext/oci8/tests/bind_number.phpt @@ -9,7 +9,7 @@ precision = 14 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_query.phpt b/ext/oci8/tests/bind_query.phpt index df1d0204cb..12e58d3e33 100644 --- a/ext/oci8/tests/bind_query.phpt +++ b/ext/oci8/tests/bind_query.phpt @@ -5,7 +5,7 @@ Bind with various WHERE conditions --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_raw.phpt b/ext/oci8/tests/bind_raw.phpt index a6e6259eef..dca9730ccb 100644 --- a/ext/oci8/tests/bind_raw.phpt +++ b/ext/oci8/tests/bind_raw.phpt @@ -3,19 +3,19 @@ bind RAW field --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $stmt = oci_parse($c, "create table phptestrawtable( id number(10), fileimage raw(1000))"); oci_execute($stmt); $stmt = oci_parse ($c, "insert into phptestrawtable (id, fileimage) values (:id, :fileimage)"); $i=1; -$fileimage = file_get_contents( dirname(__FILE__)."/test.gif"); +$fileimage = file_get_contents( __DIR__."/test.gif"); $fileimage = substr($fileimage, 0, 300); oci_bind_by_name( $stmt, ":id", $i, -1); diff --git a/ext/oci8/tests/bind_raw_2.phpt b/ext/oci8/tests/bind_raw_2.phpt index d30219acdd..5195b1ca89 100644 --- a/ext/oci8/tests/bind_raw_2.phpt +++ b/ext/oci8/tests/bind_raw_2.phpt @@ -3,19 +3,19 @@ bind RAW field with OCI_B_BIN --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $stmt = oci_parse($c, "create table phptestrawtable( id number(10), fileimage raw(1000))"); oci_execute($stmt); $stmt = oci_parse ($c, "insert into phptestrawtable (id, fileimage) values (:id, :fileimage)"); $i=1; -$fileimage = file_get_contents( dirname(__FILE__)."/test.gif"); +$fileimage = file_get_contents( __DIR__."/test.gif"); $fileimage = substr($fileimage, 0, 300); oci_bind_by_name( $stmt, ":id", $i, -1); diff --git a/ext/oci8/tests/bind_rowid.phpt b/ext/oci8/tests/bind_rowid.phpt index 122ad5e18e..40e5b5e90e 100644 --- a/ext/oci8/tests/bind_rowid.phpt +++ b/ext/oci8/tests/bind_rowid.phpt @@ -5,7 +5,7 @@ Test ROWID bind --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); function do_query($c) { diff --git a/ext/oci8/tests/bind_sqltafc.phpt b/ext/oci8/tests/bind_sqltafc.phpt index 8243851eb3..90bd38f445 100644 --- a/ext/oci8/tests/bind_sqltafc.phpt +++ b/ext/oci8/tests/bind_sqltafc.phpt @@ -5,7 +5,7 @@ Bind tests with SQLT_AFC --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_sqltchr_1.phpt b/ext/oci8/tests/bind_sqltchr_1.phpt index a5c6d77b67..b8c460ca79 100644 --- a/ext/oci8/tests/bind_sqltchr_1.phpt +++ b/ext/oci8/tests/bind_sqltchr_1.phpt @@ -5,7 +5,7 @@ Bind with SQLT_CHR --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_sqltchr_2.phpt b/ext/oci8/tests/bind_sqltchr_2.phpt index e459d2270c..fae96d8925 100644 --- a/ext/oci8/tests/bind_sqltchr_2.phpt +++ b/ext/oci8/tests/bind_sqltchr_2.phpt @@ -5,7 +5,7 @@ PL/SQL bind with SQLT_CHR --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_sqltint.phpt b/ext/oci8/tests/bind_sqltint.phpt index dfefe3d7ed..0924652155 100644 --- a/ext/oci8/tests/bind_sqltint.phpt +++ b/ext/oci8/tests/bind_sqltint.phpt @@ -5,7 +5,7 @@ Bind with SQLT_INT --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_sqltnum.phpt b/ext/oci8/tests/bind_sqltnum.phpt index 5e75a176a8..b8742ee8a8 100644 --- a/ext/oci8/tests/bind_sqltnum.phpt +++ b/ext/oci8/tests/bind_sqltnum.phpt @@ -11,7 +11,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_sqltnum_11g.phpt b/ext/oci8/tests/bind_sqltnum_11g.phpt index 3f4a1411a8..7ef1549120 100644 --- a/ext/oci8/tests/bind_sqltnum_11g.phpt +++ b/ext/oci8/tests/bind_sqltnum_11g.phpt @@ -11,7 +11,7 @@ if (!(isset($matches[0]) && $matches[0] <= 11)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bind_unsupported_1.phpt b/ext/oci8/tests/bind_unsupported_1.phpt index ba125d99fc..f8ae599c42 100644 --- a/ext/oci8/tests/bind_unsupported_1.phpt +++ b/ext/oci8/tests/bind_unsupported_1.phpt @@ -5,7 +5,7 @@ Bind with various unsupported bind types --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // These types are defined in oci8.c diff --git a/ext/oci8/tests/bind_unsupported_2.phpt b/ext/oci8/tests/bind_unsupported_2.phpt index 9d0a33df6a..fefd57d148 100644 --- a/ext/oci8/tests/bind_unsupported_2.phpt +++ b/ext/oci8/tests/bind_unsupported_2.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('oci8')) die("skip no oci8 extension"); --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $types = array( "SQLT_BDOUBLE" => SQLT_BDOUBLE, diff --git a/ext/oci8/tests/bind_unsupported_3.phpt b/ext/oci8/tests/bind_unsupported_3.phpt index 48b719aa54..4fe9e0819c 100644 --- a/ext/oci8/tests/bind_unsupported_3.phpt +++ b/ext/oci8/tests/bind_unsupported_3.phpt @@ -3,12 +3,12 @@ Bind with various bind types not supported by TimesTen --SKIPIF-- <?php $target_dbs = array('oracledb' => false, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $types = array( "SQLT_CLOB" => SQLT_CLOB, diff --git a/ext/oci8/tests/bug26133.phpt b/ext/oci8/tests/bug26133.phpt index 2da5d483d0..1df68ad2d9 100644 --- a/ext/oci8/tests/bug26133.phpt +++ b/ext/oci8/tests/bug26133.phpt @@ -5,7 +5,7 @@ Bug #26133 (ocifreedesc() segfault) --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialize diff --git a/ext/oci8/tests/bug27303_1.phpt b/ext/oci8/tests/bug27303_1.phpt index 3058c1bcae..6310185b7f 100644 --- a/ext/oci8/tests/bug27303_1.phpt +++ b/ext/oci8/tests/bug27303_1.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG= --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmtarray = array( "drop sequence myseq", diff --git a/ext/oci8/tests/bug27303_1_11gR1.phpt b/ext/oci8/tests/bug27303_1_11gR1.phpt index f7e224f45c..1c9296bef8 100644 --- a/ext/oci8/tests/bug27303_1_11gR1.phpt +++ b/ext/oci8/tests/bug27303_1_11gR1.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -13,7 +13,7 @@ if (!(isset($matches[0]) && $matches[1] < 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmtarray = array( "drop sequence myseq", diff --git a/ext/oci8/tests/bug27303_2.phpt b/ext/oci8/tests/bug27303_2.phpt index 76188153e5..039f0e4acc 100644 --- a/ext/oci8/tests/bug27303_2.phpt +++ b/ext/oci8/tests/bug27303_2.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG= --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $stmtarray = array( "drop sequence myseq", diff --git a/ext/oci8/tests/bug27303_2_11gR1.phpt b/ext/oci8/tests/bug27303_2_11gR1.phpt index 0a0cc44845..4c9a175edd 100644 --- a/ext/oci8/tests/bug27303_2_11gR1.phpt +++ b/ext/oci8/tests/bug27303_2_11gR1.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -15,7 +15,7 @@ NLS_LANG= --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $stmtarray = array( "drop sequence myseq", diff --git a/ext/oci8/tests/bug27303_3.phpt b/ext/oci8/tests/bug27303_3.phpt index aafdf61e73..dfc85e08b7 100644 --- a/ext/oci8/tests/bug27303_3.phpt +++ b/ext/oci8/tests/bug27303_3.phpt @@ -5,7 +5,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $create_st = array(); $create_st[] = "drop sequence myseq"; diff --git a/ext/oci8/tests/bug27303_4.phpt b/ext/oci8/tests/bug27303_4.phpt index a88f29807d..5ee7090428 100644 --- a/ext/oci8/tests/bug27303_4.phpt +++ b/ext/oci8/tests/bug27303_4.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { @@ -15,7 +15,7 @@ NLS_LANG= --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $create_st = array(); $create_st[] = "drop sequence myseq"; diff --git a/ext/oci8/tests/bug27303_4_11gR1.phpt b/ext/oci8/tests/bug27303_4_11gR1.phpt index ff21d23a2a..290f26d764 100644 --- a/ext/oci8/tests/bug27303_4_11gR1.phpt +++ b/ext/oci8/tests/bug27303_4_11gR1.phpt @@ -3,7 +3,7 @@ Bug #27303 (OCIBindByName binds numeric PHP values as characters) --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // The bind buffer size edge cases seem to change each DB version. preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] < 12)) { @@ -13,7 +13,7 @@ if (!(isset($matches[0]) && $matches[1] < 12)) { --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $create_st = array(); $create_st[] = "drop sequence myseq"; diff --git a/ext/oci8/tests/bug32325.phpt b/ext/oci8/tests/bug32325.phpt index 925433659b..1dbe8cc6ce 100644 --- a/ext/oci8/tests/bug32325.phpt +++ b/ext/oci8/tests/bug32325.phpt @@ -3,12 +3,12 @@ Bug #32325 (Cannot retrieve collection using OCI8) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialize diff --git a/ext/oci8/tests/bug35973.phpt b/ext/oci8/tests/bug35973.phpt index 4c000d022b..681498b810 100644 --- a/ext/oci8/tests/bug35973.phpt +++ b/ext/oci8/tests/bug35973.phpt @@ -3,12 +3,12 @@ Bug #35973 (Error ORA-24806 occurs when trying to fetch a NCLOB field) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $s1 = oci_parse($c, "drop table test_nclob"); @oci_execute($s1); diff --git a/ext/oci8/tests/bug36010.phpt b/ext/oci8/tests/bug36010.phpt index cd68b66f34..83288dd355 100644 --- a/ext/oci8/tests/bug36010.phpt +++ b/ext/oci8/tests/bug36010.phpt @@ -3,12 +3,12 @@ Bug #36010 (Crash when executing SQL statement with lob parameter twice) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; function f($conn) { diff --git a/ext/oci8/tests/bug36096.phpt b/ext/oci8/tests/bug36096.phpt index 2ec366b46a..1cf5e9106c 100644 --- a/ext/oci8/tests/bug36096.phpt +++ b/ext/oci8/tests/bug36096.phpt @@ -5,7 +5,7 @@ Bug #36096 (oci_result() returns garbage after oci_fetch() failed) --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $sql = "SELECT 'ABC' FROM DUAL WHERE 1<>1"; $stmt = oci_parse($c, $sql); diff --git a/ext/oci8/tests/bug36403.phpt b/ext/oci8/tests/bug36403.phpt index 96ca57380f..0f3b53b923 100644 --- a/ext/oci8/tests/bug36403.phpt +++ b/ext/oci8/tests/bug36403.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug37220.phpt b/ext/oci8/tests/bug37220.phpt index fb62f9df4e..11ee2b23b6 100644 --- a/ext/oci8/tests/bug37220.phpt +++ b/ext/oci8/tests/bug37220.phpt @@ -3,12 +3,12 @@ Bug #37220 (LOB Type mismatch when using windows & oci8.dll) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/bug37581.phpt b/ext/oci8/tests/bug37581.phpt index 642414f9a3..a33ef77c79 100644 --- a/ext/oci8/tests/bug37581.phpt +++ b/ext/oci8/tests/bug37581.phpt @@ -3,12 +3,12 @@ Bug #37581 (oci_bind_array_by_name clobbers input array when using SQLT_AFC, AVC --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $p1 = "create or replace package BUG37581_PKG as type str_array is table of char(2) index by binary_integer; diff --git a/ext/oci8/tests/bug38161.phpt b/ext/oci8/tests/bug38161.phpt index 4187de8fed..32418cb03b 100644 --- a/ext/oci8/tests/bug38161.phpt +++ b/ext/oci8/tests/bug38161.phpt @@ -5,7 +5,7 @@ Bug #38161 (oci_bind_by_name() returns garbage when Oracle didn't set the variab --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $query = "begin if false then :bv := 1; end if; end;"; $stid = oci_parse($c, $query); diff --git a/ext/oci8/tests/bug38173.phpt b/ext/oci8/tests/bug38173.phpt index dd11315b67..2d4cb7c33b 100644 --- a/ext/oci8/tests/bug38173.phpt +++ b/ext/oci8/tests/bug38173.phpt @@ -3,12 +3,12 @@ Bug #38173 (Freeing nested cursors causes OCI8 to segfault) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $create_1 = "CREATE TABLE t1 (id INTEGER)"; $create_2 = "CREATE TABLE t2 (id INTEGER)"; diff --git a/ext/oci8/tests/bug40078.phpt b/ext/oci8/tests/bug40078.phpt index 9fdcb14b7d..0887c83b09 100644 --- a/ext/oci8/tests/bug40078.phpt +++ b/ext/oci8/tests/bug40078.phpt @@ -3,12 +3,12 @@ Bug #40078 (ORA-01405 when fetching NULL values using oci_bind_array_by_name()) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $create_pkg = " CREATE OR REPLACE PACKAGE BUG40078_PKG AS diff --git a/ext/oci8/tests/bug40415.phpt b/ext/oci8/tests/bug40415.phpt index 0530c9c593..1de1f2b40a 100644 --- a/ext/oci8/tests/bug40415.phpt +++ b/ext/oci8/tests/bug40415.phpt @@ -3,12 +3,12 @@ Bug #40415 (Using oci_fetchall with nested cursors) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; // Setup diff --git a/ext/oci8/tests/bug41069.phpt b/ext/oci8/tests/bug41069.phpt index a7606819f3..af322ba7d1 100644 --- a/ext/oci8/tests/bug41069.phpt +++ b/ext/oci8/tests/bug41069.phpt @@ -3,7 +3,7 @@ Bug #41069 (Oracle crash with certain data over a DB-link when prefetch memory l --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (empty($dbase)) die ("skip requires network connection alias for DB link loopback"); if ($test_drcp) die("skip DRCP does not support shared database links"); ?> @@ -12,7 +12,7 @@ oci8.default_prefetch=5 --FILE-- <?php - require(dirname(__FILE__).'/connect.inc'); + require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug42134.phpt b/ext/oci8/tests/bug42134.phpt index 63091100a1..d1e0b97c84 100644 --- a/ext/oci8/tests/bug42134.phpt +++ b/ext/oci8/tests/bug42134.phpt @@ -3,12 +3,12 @@ Bug #42134 (Collection error for invalid collection name) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Test collection creation error for normal connection diff --git a/ext/oci8/tests/bug42173.phpt b/ext/oci8/tests/bug42173.phpt index 67196dafda..33e1adaae4 100644 --- a/ext/oci8/tests/bug42173.phpt +++ b/ext/oci8/tests/bug42173.phpt @@ -3,12 +3,12 @@ Bug #42173 (TIMESTAMP and INTERVAL query and field functions) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmts = array( diff --git a/ext/oci8/tests/bug42496_1.phpt b/ext/oci8/tests/bug42496_1.phpt index ed64b389f0..b3d6cf0203 100644 --- a/ext/oci8/tests/bug42496_1.phpt +++ b/ext/oci8/tests/bug42496_1.phpt @@ -3,13 +3,13 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/bug42496_2.phpt b/ext/oci8/tests/bug42496_2.phpt index 4dff86cc6c..bcb4076601 100644 --- a/ext/oci8/tests/bug42496_2.phpt +++ b/ext/oci8/tests/bug42496_2.phpt @@ -3,13 +3,13 @@ Bug #42496 (LOB fetch leaks cursors, eventually failing with ORA-1000 maximum op --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/bug42841.phpt b/ext/oci8/tests/bug42841.phpt index 140403ce27..eade55fc02 100644 --- a/ext/oci8/tests/bug42841.phpt +++ b/ext/oci8/tests/bug42841.phpt @@ -3,14 +3,14 @@ Bug #42841 (REF CURSOR and oci_new_cursor PHP crash) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --INI-- oci8.statement_cache_size=20 --FILE-- <?php -require dirname(__FILE__).'/details.inc'; +require __DIR__.'/details.inc'; // note a oci_new_connect() occurs lower in the script $c = oci_connect($user, $password, $dbase); diff --git a/ext/oci8/tests/bug43492.phpt b/ext/oci8/tests/bug43492.phpt index 7c91ea22b6..27eed00b0a 100644 --- a/ext/oci8/tests/bug43492.phpt +++ b/ext/oci8/tests/bug43492.phpt @@ -3,12 +3,12 @@ Bug #43492 (Nested cursor leaks) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $stmtarray = array( "DROP table bug43492_tab", diff --git a/ext/oci8/tests/bug43492_2.phpt b/ext/oci8/tests/bug43492_2.phpt index d0bab520f5..03b4c31382 100644 --- a/ext/oci8/tests/bug43492_2.phpt +++ b/ext/oci8/tests/bug43492_2.phpt @@ -3,7 +3,7 @@ Bug #43492 (Nested cursor leaks after related bug #44206 fixed) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php @@ -12,7 +12,7 @@ require(dirname(__FILE__).'/skipif.inc'); // Now that bug 44206 is fixed an automatic clean up will occur - // though it is still recommended in practice. -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $stmtarray = array( "DROP table bug43492_tab", diff --git a/ext/oci8/tests/bug43497.phpt b/ext/oci8/tests/bug43497.phpt index 618836da58..29ff9e6a5c 100644 --- a/ext/oci8/tests/bug43497.phpt +++ b/ext/oci8/tests/bug43497.phpt @@ -3,13 +3,13 @@ Bug #43497 (OCI8 XML/getClobVal aka temporary LOBs leak UGA memory) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; function sessionid($c) // determines and returns current session ID { diff --git a/ext/oci8/tests/bug44008.phpt b/ext/oci8/tests/bug44008.phpt index c9930f2439..0b031aef90 100644 --- a/ext/oci8/tests/bug44008.phpt +++ b/ext/oci8/tests/bug44008.phpt @@ -3,12 +3,12 @@ Bug #44008 (Incorrect usage of OCI-Lob->close crashes PHP) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/bug44113.phpt b/ext/oci8/tests/bug44113.phpt index d05a86b52c..8a48d6aff0 100644 --- a/ext/oci8/tests/bug44113.phpt +++ b/ext/oci8/tests/bug44113.phpt @@ -3,13 +3,13 @@ Bug #44113 (New collection creation can fail with OCI-22303) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug44206.phpt b/ext/oci8/tests/bug44206.phpt index 20c92b0f64..069a840423 100644 --- a/ext/oci8/tests/bug44206.phpt +++ b/ext/oci8/tests/bug44206.phpt @@ -3,12 +3,12 @@ Bug #44206 (Test if selecting ref cursors leads to ORA-1000 maximum open cursors --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Run Test diff --git a/ext/oci8/tests/bug45458.phpt b/ext/oci8/tests/bug45458.phpt index b257f1fc09..3a4b514857 100644 --- a/ext/oci8/tests/bug45458.phpt +++ b/ext/oci8/tests/bug45458.phpt @@ -5,7 +5,7 @@ Bug #45458 (OCI8: Numeric keys for associative arrays are not handled properly) --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/bug46994.phpt b/ext/oci8/tests/bug46994.phpt index 63ddbd0150..079f5df6c4 100644 --- a/ext/oci8/tests/bug46994.phpt +++ b/ext/oci8/tests/bug46994.phpt @@ -3,12 +3,12 @@ Bug #46994 (CLOB size does not update when using CLOB IN OUT param in stored pro --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug47189.phpt b/ext/oci8/tests/bug47189.phpt index 07c3a9e338..a5b5217ac5 100644 --- a/ext/oci8/tests/bug47189.phpt +++ b/ext/oci8/tests/bug47189.phpt @@ -3,12 +3,12 @@ Bug #47189 (Multiple oci_fetch_all calls) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs: different error handling for this undefined behavior -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); echo "Test 1\n"; diff --git a/ext/oci8/tests/bug47281.phpt b/ext/oci8/tests/bug47281.phpt index e7b6dc43cc..01b273129c 100644 --- a/ext/oci8/tests/bug47281.phpt +++ b/ext/oci8/tests/bug47281.phpt @@ -3,7 +3,7 @@ Bug #47281 ($php_errormsg is limited in size of characters) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); // error3.phpt obsoletes this test for newer Oracle client versions // Assume runtime client version is >= compile time client version preg_match('/^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/', oci_client_version(), $matches); @@ -18,7 +18,7 @@ NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug47281_tt.phpt b/ext/oci8/tests/bug47281_tt.phpt index 687655fe8c..acb1eef55e 100644 --- a/ext/oci8/tests/bug47281_tt.phpt +++ b/ext/oci8/tests/bug47281_tt.phpt @@ -3,14 +3,14 @@ Bug #47281 ($php_errormsg is limited in size of characters) --SKIPIF-- <?php $target_dbs = array('oracledb' => false, 'timesten' => true); // test runs on these DBs: shorter message length in TimesTen -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --ENV-- NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/bug51253.phpt b/ext/oci8/tests/bug51253.phpt index 21a0cf8a3f..9b6da41019 100644 --- a/ext/oci8/tests/bug51253.phpt +++ b/ext/oci8/tests/bug51253.phpt @@ -3,12 +3,12 @@ Bug #51253 (oci_bind_array_by_name() array references) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $drop = "DROP table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/bug51291_1.phpt b/ext/oci8/tests/bug51291_1.phpt index 4fa2e23995..406d9b5dcd 100644 --- a/ext/oci8/tests/bug51291_1.phpt +++ b/ext/oci8/tests/bug51291_1.phpt @@ -5,7 +5,7 @@ Bug #51291 (oci_error() doesn't report last error when called two times) --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); echo "Test 1 - Parse\n"; diff --git a/ext/oci8/tests/bug51291_2.phpt b/ext/oci8/tests/bug51291_2.phpt index d2c84af2c4..c39eefbbdc 100644 --- a/ext/oci8/tests/bug51291_2.phpt +++ b/ext/oci8/tests/bug51291_2.phpt @@ -3,12 +3,12 @@ Bug #51291 (oci_error() doesn't report last error when called two times) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); echo "\nTest 1 - Execute - after successful 2nd query with same statement\n"; diff --git a/ext/oci8/tests/bug68298.phpt b/ext/oci8/tests/bug68298.phpt index e05a6ad949..ed15b84997 100644 --- a/ext/oci8/tests/bug68298.phpt +++ b/ext/oci8/tests/bug68298.phpt @@ -8,7 +8,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmtarray = array( "DROP TABLE BUG68298", diff --git a/ext/oci8/tests/bug70700.phpt b/ext/oci8/tests/bug70700.phpt index 5633673406..374163d17e 100644 --- a/ext/oci8/tests/bug70700.phpt +++ b/ext/oci8/tests/bug70700.phpt @@ -8,13 +8,13 @@ ashnazg@php.net <?php if (!extension_loaded('mbstring')) die('skip mbstring is not enabled'); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --ENV-- NLS_LANG=.AL32UTF8 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmt = oci_parse($c, 'DROP TABLE oci8_bug70700'); diff --git a/ext/oci8/tests/bug71148.phpt b/ext/oci8/tests/bug71148.phpt index 204aab3c80..838dbc4fbb 100644 --- a/ext/oci8/tests/bug71148.phpt +++ b/ext/oci8/tests/bug71148.phpt @@ -3,12 +3,12 @@ Bug #71448 (Binding reference overwritten on php7) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialize diff --git a/ext/oci8/tests/bug71422.phpt b/ext/oci8/tests/bug71422.phpt index b294b46dad..6896c5de0d 100644 --- a/ext/oci8/tests/bug71422.phpt +++ b/ext/oci8/tests/bug71422.phpt @@ -7,7 +7,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmtarray = array( "DROP TABLE BUG71422_TEST", diff --git a/ext/oci8/tests/bug71600.phpt b/ext/oci8/tests/bug71600.phpt index fc548d26c1..9cf9f2e971 100644 --- a/ext/oci8/tests/bug71600.phpt +++ b/ext/oci8/tests/bug71600.phpt @@ -3,12 +3,12 @@ Bug #71600 (oci_fetch_all result in segfault when select more than 8 columns) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialize diff --git a/ext/oci8/tests/bug72524.phpt b/ext/oci8/tests/bug72524.phpt index b48ec513ed..f696277f86 100644 --- a/ext/oci8/tests/bug72524.phpt +++ b/ext/oci8/tests/bug72524.phpt @@ -3,12 +3,12 @@ Bug #72524 (Binding null values triggers ORA-24816 error) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialize diff --git a/ext/oci8/tests/bug74625.phpt b/ext/oci8/tests/bug74625.phpt index f3bc7ac60a..9bcaf29788 100644 --- a/ext/oci8/tests/bug74625.phpt +++ b/ext/oci8/tests/bug74625.phpt @@ -6,7 +6,7 @@ if (!extension_loaded('oci8')) die ("skip no oci8 extension"); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/calltimeout1.phpt b/ext/oci8/tests/calltimeout1.phpt index 4411ed0f2c..123e51561a 100644 --- a/ext/oci8/tests/calltimeout1.phpt +++ b/ext/oci8/tests/calltimeout1.phpt @@ -5,7 +5,7 @@ oci_set_call_timeout: test timing out if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { die("skip needs to be run as a user with access to DBMS_LOCK"); } @@ -18,7 +18,7 @@ if (!(isset($matches[0]) && $matches[0] >= 18)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); function mysleep($c, $t) { diff --git a/ext/oci8/tests/close.phpt b/ext/oci8/tests/close.phpt index 6f9d2b8473..d16498bfad 100644 --- a/ext/oci8/tests/close.phpt +++ b/ext/oci8/tests/close.phpt @@ -5,7 +5,7 @@ connect/close/connect --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; oci_close($c); diff --git a/ext/oci8/tests/coll_001.phpt b/ext/oci8/tests/coll_001.phpt index 0b9ddcccc2..4454ecc548 100644 --- a/ext/oci8/tests/coll_001.phpt +++ b/ext/oci8/tests/coll_001.phpt @@ -3,20 +3,20 @@ oci_new_collection() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump(oci_new_collection($c, $type_name)); var_dump(oci_new_collection($c, "NONEXISTENT")); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_002.phpt b/ext/oci8/tests/coll_002.phpt index 6e9ce4bcf1..2de2d2b125 100644 --- a/ext/oci8/tests/coll_002.phpt +++ b/ext/oci8/tests/coll_002.phpt @@ -3,13 +3,13 @@ oci_new_collection() + free() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump($coll1 = oci_new_collection($c, $type_name)); @@ -18,7 +18,7 @@ var_dump($coll1->size()); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_002_func.phpt b/ext/oci8/tests/coll_002_func.phpt index 51fac181b9..4eb246705b 100644 --- a/ext/oci8/tests/coll_002_func.phpt +++ b/ext/oci8/tests/coll_002_func.phpt @@ -3,13 +3,13 @@ oci_new_collection() + free() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump($coll1 = oci_new_collection($c, $type_name)); @@ -18,7 +18,7 @@ var_dump(oci_collection_size($coll1)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_003.phpt b/ext/oci8/tests/coll_003.phpt index c7e2f4065c..c92adecdb4 100644 --- a/ext/oci8/tests/coll_003.phpt +++ b/ext/oci8/tests/coll_003.phpt @@ -3,13 +3,13 @@ collection methods --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = oci_new_collection($c, $type_name); @@ -22,7 +22,7 @@ var_dump($coll1->assignElem(0,2)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_003_func.phpt b/ext/oci8/tests/coll_003_func.phpt index 2450fd738b..d6058dcfab 100644 --- a/ext/oci8/tests/coll_003_func.phpt +++ b/ext/oci8/tests/coll_003_func.phpt @@ -3,13 +3,13 @@ collection methods --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = oci_new_collection($c, $type_name); @@ -22,7 +22,7 @@ var_dump(oci_collection_element_assign($coll1, 0, 2)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_004.phpt b/ext/oci8/tests/coll_004.phpt index b8bec375e1..e4aec166a5 100644 --- a/ext/oci8/tests/coll_004.phpt +++ b/ext/oci8/tests/coll_004.phpt @@ -3,13 +3,13 @@ oci_collection_assign() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = oci_new_collection($c, $type_name); $coll2 = oci_new_collection($c, $type_name); @@ -22,7 +22,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_004_func.phpt b/ext/oci8/tests/coll_004_func.phpt index 1061dbac11..8aa4234773 100644 --- a/ext/oci8/tests/coll_004_func.phpt +++ b/ext/oci8/tests/coll_004_func.phpt @@ -3,13 +3,13 @@ oci_collection_assign() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = oci_new_collection($c, $type_name); $coll2 = oci_new_collection($c, $type_name); @@ -22,7 +22,7 @@ var_dump(oci_collection_element_get($coll2, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_005.phpt b/ext/oci8/tests/coll_005.phpt index 27ed72a1df..72fdbfd9da 100644 --- a/ext/oci8/tests/coll_005.phpt +++ b/ext/oci8/tests/coll_005.phpt @@ -3,20 +3,20 @@ ocinewcollection() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump(ocinewcollection($c, $type_name)); var_dump(ocinewcollection($c, "NONEXISTENT")); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_006.phpt b/ext/oci8/tests/coll_006.phpt index 12e890a536..cc69f9b506 100644 --- a/ext/oci8/tests/coll_006.phpt +++ b/ext/oci8/tests/coll_006.phpt @@ -3,13 +3,13 @@ ocinewcollection() + free() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump($coll1 = ocinewcollection($c, $type_name)); @@ -18,7 +18,7 @@ var_dump($coll1->size()); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_006_func.phpt b/ext/oci8/tests/coll_006_func.phpt index 583e0bb6a3..7bd1152f2c 100644 --- a/ext/oci8/tests/coll_006_func.phpt +++ b/ext/oci8/tests/coll_006_func.phpt @@ -3,13 +3,13 @@ ocinewcollection() + free() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; var_dump($coll1 = ocinewcollection($c, $type_name)); @@ -18,7 +18,7 @@ var_dump(oci_collection_size($coll1)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_007.phpt b/ext/oci8/tests/coll_007.phpt index 89ef9bd6ad..b3b05a5d9c 100644 --- a/ext/oci8/tests/coll_007.phpt +++ b/ext/oci8/tests/coll_007.phpt @@ -3,13 +3,13 @@ collection methods --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = ocinewcollection($c, $type_name); @@ -22,7 +22,7 @@ var_dump($coll1->assignElem(0,2)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_008.phpt b/ext/oci8/tests/coll_008.phpt index 18f8de4ab6..b85dc1e917 100644 --- a/ext/oci8/tests/coll_008.phpt +++ b/ext/oci8/tests/coll_008.phpt @@ -3,13 +3,13 @@ ocicollassign() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = ocinewcollection($c, $type_name); $coll2 = ocinewcollection($c, $type_name); @@ -22,7 +22,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_009.phpt b/ext/oci8/tests/coll_009.phpt index bb3f6aed75..e55a4a210c 100644 --- a/ext/oci8/tests/coll_009.phpt +++ b/ext/oci8/tests/coll_009.phpt @@ -3,12 +3,12 @@ collections and wrong dates --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_009_func.phpt b/ext/oci8/tests/coll_009_func.phpt index 38573bd3a8..fca04599e2 100644 --- a/ext/oci8/tests/coll_009_func.phpt +++ b/ext/oci8/tests/coll_009_func.phpt @@ -3,12 +3,12 @@ collections and wrong dates --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump(oci_collection_element_get($coll2, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_010.phpt b/ext/oci8/tests/coll_010.phpt index 620872c206..33e1b6fd18 100644 --- a/ext/oci8/tests/coll_010.phpt +++ b/ext/oci8/tests/coll_010.phpt @@ -3,12 +3,12 @@ collections and nulls --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_010_func.phpt b/ext/oci8/tests/coll_010_func.phpt index 75a6c1209c..2f67283538 100644 --- a/ext/oci8/tests/coll_010_func.phpt +++ b/ext/oci8/tests/coll_010_func.phpt @@ -3,12 +3,12 @@ collections and nulls --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump(oci_collection_element_get($coll2, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_011.phpt b/ext/oci8/tests/coll_011.phpt index 220ed179a5..13c4613b00 100644 --- a/ext/oci8/tests/coll_011.phpt +++ b/ext/oci8/tests/coll_011.phpt @@ -3,12 +3,12 @@ collections and strings --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -35,7 +35,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_011_func.phpt b/ext/oci8/tests/coll_011_func.phpt index ff121d7820..bc6bd6ea73 100644 --- a/ext/oci8/tests/coll_011_func.phpt +++ b/ext/oci8/tests/coll_011_func.phpt @@ -3,12 +3,12 @@ collections and strings --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -35,7 +35,7 @@ var_dump(oci_collection_element_get($coll2, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_012.phpt b/ext/oci8/tests/coll_012.phpt index c99a5abb3a..615a3aad7a 100644 --- a/ext/oci8/tests/coll_012.phpt +++ b/ext/oci8/tests/coll_012.phpt @@ -3,12 +3,12 @@ collections and correct dates --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump($coll2->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_012_func.phpt b/ext/oci8/tests/coll_012_func.phpt index 1a20b37bc1..41a7084109 100644 --- a/ext/oci8/tests/coll_012_func.phpt +++ b/ext/oci8/tests/coll_012_func.phpt @@ -3,12 +3,12 @@ collections and correct dates --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump(oci_collection_element_get($coll2, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_013.phpt b/ext/oci8/tests/coll_013.phpt index 2bb836ae1a..ef3af0a8e7 100644 --- a/ext/oci8/tests/coll_013.phpt +++ b/ext/oci8/tests/coll_013.phpt @@ -3,12 +3,12 @@ collections and correct dates (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump($coll1->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_013_func.phpt b/ext/oci8/tests/coll_013_func.phpt index 27c2e66868..bb6d7083e3 100644 --- a/ext/oci8/tests/coll_013_func.phpt +++ b/ext/oci8/tests/coll_013_func.phpt @@ -3,12 +3,12 @@ collections and correct dates (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump(oci_collection_element_get($coll1, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_014.phpt b/ext/oci8/tests/coll_014.phpt index de3d46bd29..0af0ead329 100644 --- a/ext/oci8/tests/coll_014.phpt +++ b/ext/oci8/tests/coll_014.phpt @@ -3,12 +3,12 @@ collections and strings (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump($coll1->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_014_func.phpt b/ext/oci8/tests/coll_014_func.phpt index 4acde26e9e..24b0bbf8ba 100644 --- a/ext/oci8/tests/coll_014_func.phpt +++ b/ext/oci8/tests/coll_014_func.phpt @@ -3,12 +3,12 @@ collections and strings (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump(oci_collection_element_get($coll1, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_015.phpt b/ext/oci8/tests/coll_015.phpt index 2d8a0f382b..2ed2375ecc 100644 --- a/ext/oci8/tests/coll_015.phpt +++ b/ext/oci8/tests/coll_015.phpt @@ -3,12 +3,12 @@ collections and numbers (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump($coll1->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_015_func.phpt b/ext/oci8/tests/coll_015_func.phpt index d88b14547e..a9c16aec01 100644 --- a/ext/oci8/tests/coll_015_func.phpt +++ b/ext/oci8/tests/coll_015_func.phpt @@ -3,12 +3,12 @@ collections and numbers (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump(oci_collection_element_get($coll1, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_016.phpt b/ext/oci8/tests/coll_016.phpt index 1ba78007cc..80059688b3 100644 --- a/ext/oci8/tests/coll_016.phpt +++ b/ext/oci8/tests/coll_016.phpt @@ -3,12 +3,12 @@ collections and negative/too big element indexes --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump($coll1->getElem(500)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_016_func.phpt b/ext/oci8/tests/coll_016_func.phpt index ba3bee863a..da26428d8d 100644 --- a/ext/oci8/tests/coll_016_func.phpt +++ b/ext/oci8/tests/coll_016_func.phpt @@ -3,12 +3,12 @@ collections and negative/too big element indexes --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -34,7 +34,7 @@ var_dump(oci_collection_element_get($coll1, 500)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_017.phpt b/ext/oci8/tests/coll_017.phpt index c988e4ffe6..81fdfb2553 100644 --- a/ext/oci8/tests/coll_017.phpt +++ b/ext/oci8/tests/coll_017.phpt @@ -3,12 +3,12 @@ collections and nulls (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump($coll1->getElem(0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_017_func.phpt b/ext/oci8/tests/coll_017_func.phpt index 1aff12d764..c582eb0f8d 100644 --- a/ext/oci8/tests/coll_017_func.phpt +++ b/ext/oci8/tests/coll_017_func.phpt @@ -3,12 +3,12 @@ collections and nulls (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name." @@ -31,7 +31,7 @@ var_dump(oci_collection_element_get($coll1, 0)); echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECT-- diff --git a/ext/oci8/tests/coll_018.phpt b/ext/oci8/tests/coll_018.phpt index 1020861168..07e78e2fd9 100644 --- a/ext/oci8/tests/coll_018.phpt +++ b/ext/oci8/tests/coll_018.phpt @@ -3,13 +3,13 @@ Collection trim tests --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_type.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_type.inc"; $coll1 = oci_new_collection($c, $type_name); @@ -52,7 +52,7 @@ var_dump($coll1->getElem(0)); // this should have gone echo "Done\n"; -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; ?> --EXPECTF-- diff --git a/ext/oci8/tests/coll_019.phpt b/ext/oci8/tests/coll_019.phpt index cfadfe5635..7008ead9e0 100644 --- a/ext/oci8/tests/coll_019.phpt +++ b/ext/oci8/tests/coll_019.phpt @@ -3,12 +3,12 @@ Test collection Oracle error handling collections and numbers (2) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $ora_sql = "DROP TYPE ".$type_name; $statement = oci_parse($c,$ora_sql); @@ -26,7 +26,7 @@ var_dump($coll1->append('a long string')); // invalid type for appe var_dump($coll1->assignElem(1, 'a long string')); // invalid type for assignelem() var_dump($coll1->getElem(0)); -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; echo "Test 1\n"; $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF NUMBER"; @@ -42,7 +42,7 @@ echo "Test 2\n"; var_dump($coll1->assignElem(1, 1234)); // invalid location for number var_dump($coll1->getElem(0)); -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; echo "Test 3\n"; $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF VARCHAR2(1)"; @@ -54,7 +54,7 @@ $coll1 = oci_new_collection($c, $type_name); var_dump($coll1->assignElem(1, 'abc')); // invalid location for string var_dump($coll1->getElem(0)); -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; echo "Test 4\n"; $ora_sql = "CREATE TYPE ".$type_name." AS TABLE OF DATE"; @@ -67,7 +67,7 @@ var_dump($coll1->append(1)); // invalid date format var_dump($coll1->assignElem(1, '01-JAN-06')); // invalid location for date var_dump($coll1->getElem(0)); -require dirname(__FILE__)."/drop_type.inc"; +require __DIR__."/drop_type.inc"; echo "Done\n"; diff --git a/ext/oci8/tests/commit_001.phpt b/ext/oci8/tests/commit_001.phpt index 2696217a0f..de4682eefc 100644 --- a/ext/oci8/tests/commit_001.phpt +++ b/ext/oci8/tests/commit_001.phpt @@ -3,13 +3,13 @@ Test OCI_NO_AUTO_COMMIT constant --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); -require(dirname(__FILE__).'/create_table.inc'); +require(__DIR__."/connect.inc"); +require(__DIR__.'/create_table.inc'); $insert_sql = "insert into ".$schema.$table_name." (id, value) values (1,1)"; @@ -73,7 +73,7 @@ var_dump(oci_fetch_all($select, $all)); var_dump($all); -require(dirname(__FILE__).'/drop_table.inc'); +require(__DIR__.'/drop_table.inc'); echo "Done\n"; ?> diff --git a/ext/oci8/tests/commit_002.phpt b/ext/oci8/tests/commit_002.phpt index ade5fb09bb..b38d9aaa2d 100644 --- a/ext/oci8/tests/commit_002.phpt +++ b/ext/oci8/tests/commit_002.phpt @@ -3,12 +3,12 @@ Test oci_commit failure --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/commit_old.phpt b/ext/oci8/tests/commit_old.phpt index 0e3e08112a..658cfd24b3 100644 --- a/ext/oci8/tests/commit_old.phpt +++ b/ext/oci8/tests/commit_old.phpt @@ -3,13 +3,13 @@ ocicommit()/ocirollback() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema.$table_name." (id, value) VALUES (1,1)"; @@ -63,7 +63,7 @@ var_dump(ocifetchstatement($select, $all)); var_dump($all); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/conn_attr_1.phpt b/ext/oci8/tests/conn_attr_1.phpt index d16e10f61c..1c1f767398 100644 --- a/ext/oci8/tests/conn_attr_1.phpt +++ b/ext/oci8/tests/conn_attr_1.phpt @@ -3,7 +3,7 @@ Set and get of connection attributes with all types of connections. --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); @@ -20,7 +20,7 @@ if (!(isset($matches[0]) && $matches[1] >= 10)) { $testuser = 'testuser_attr_1'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); $attr_array = array('MODULE','ACTION','CLIENT_INFO','CLIENT_IDENTIFIER'); diff --git a/ext/oci8/tests/conn_attr_2.phpt b/ext/oci8/tests/conn_attr_2.phpt index 4ba1a65c2b..898bd52bcd 100644 --- a/ext/oci8/tests/conn_attr_2.phpt +++ b/ext/oci8/tests/conn_attr_2.phpt @@ -3,7 +3,7 @@ Set and get of connection attributes across persistent connections and sysdba co --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); @@ -21,7 +21,7 @@ oci8.privileged_connect = On $testuser = 'testuser_attr_2'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); $attr_array = array('MODULE','ACTION','CLIENT_INFO','CLIENT_IDENTIFIER'); diff --git a/ext/oci8/tests/conn_attr_3.phpt b/ext/oci8/tests/conn_attr_3.phpt index cfc4032a6b..a116be0fab 100644 --- a/ext/oci8/tests/conn_attr_3.phpt +++ b/ext/oci8/tests/conn_attr_3.phpt @@ -3,7 +3,7 @@ Set and get of connection attributes with oci_close(). --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && $matches[1] >= 10)) { $testuser = 'testuser_attr_3'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); echo"**Test Set and get values for the attributes with oci_close() ************\n"; // With oci_connect ,oci_pconnect ,oci_new_connect diff --git a/ext/oci8/tests/conn_attr_4.phpt b/ext/oci8/tests/conn_attr_4.phpt index 7897ddd4c9..46a219c05d 100644 --- a/ext/oci8/tests/conn_attr_4.phpt +++ b/ext/oci8/tests/conn_attr_4.phpt @@ -3,7 +3,7 @@ Set and get of connection attributes with errors. --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); @@ -24,7 +24,7 @@ if (!(isset($matches[0]) && $testuser = 'testuser_attr_4'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); $attr_array = array('MODULE','ACTION','CLIENT_INFO','CLIENT_IDENTIFIER'); diff --git a/ext/oci8/tests/conn_attr_5.phpt b/ext/oci8/tests/conn_attr_5.phpt index 129181dc27..4a58f917d3 100644 --- a/ext/oci8/tests/conn_attr_5.phpt +++ b/ext/oci8/tests/conn_attr_5.phpt @@ -3,7 +3,7 @@ Set and get connection attributes with scope end. --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip output might vary with DRCP"); @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && $matches[1] >= 10)) { $testuser = 'testuser_attr_5'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); echo"**Test - Set and get values for the attributes with scope end ************\n"; diff --git a/ext/oci8/tests/connect.phpt b/ext/oci8/tests/connect.phpt index 390ce1923e..d534e44871 100644 --- a/ext/oci8/tests/connect.phpt +++ b/ext/oci8/tests/connect.phpt @@ -5,7 +5,7 @@ oci_connect() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump(oci_connect($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_1.phpt b/ext/oci8/tests/connect_1.phpt index 647a92ceeb..6d76c8ddcc 100644 --- a/ext/oci8/tests/connect_1.phpt +++ b/ext/oci8/tests/connect_1.phpt @@ -5,7 +5,7 @@ oci_pconnect() & oci_new_connect() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump($c1 = oci_pconnect($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_1_old.phpt b/ext/oci8/tests/connect_1_old.phpt index 8210b82d6c..2014d59fe3 100644 --- a/ext/oci8/tests/connect_1_old.phpt +++ b/ext/oci8/tests/connect_1_old.phpt @@ -5,7 +5,7 @@ ociplogon() & ocinlogon() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump($c1 = ociplogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_old.phpt b/ext/oci8/tests/connect_old.phpt index 390c418a11..a2012bfd19 100644 --- a/ext/oci8/tests/connect_old.phpt +++ b/ext/oci8/tests/connect_old.phpt @@ -5,7 +5,7 @@ ocilogon() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump(ocilogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_scope1.phpt b/ext/oci8/tests/connect_scope1.phpt index 53827847e7..aefee2f882 100644 --- a/ext/oci8/tests/connect_scope1.phpt +++ b/ext/oci8/tests/connect_scope1.phpt @@ -5,7 +5,7 @@ Test oci_connect end-of-scope when statement returned --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope2.phpt b/ext/oci8/tests/connect_scope2.phpt index 1c7e88e896..aa192b1459 100644 --- a/ext/oci8/tests/connect_scope2.phpt +++ b/ext/oci8/tests/connect_scope2.phpt @@ -5,7 +5,7 @@ Test oci_pconnect end-of-scope when statement returned --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try1.phpt b/ext/oci8/tests/connect_scope_try1.phpt index 6dc94792db..d3628f9eaa 100644 --- a/ext/oci8/tests/connect_scope_try1.phpt +++ b/ext/oci8/tests/connect_scope_try1.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try2.phpt b/ext/oci8/tests/connect_scope_try2.phpt index 47e2b384b4..76e6909f44 100644 --- a/ext/oci8/tests/connect_scope_try2.phpt +++ b/ext/oci8/tests/connect_scope_try2.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try3.phpt b/ext/oci8/tests/connect_scope_try3.phpt index 6e1c652ad5..d9cbfce355 100644 --- a/ext/oci8/tests/connect_scope_try3.phpt +++ b/ext/oci8/tests/connect_scope_try3.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try4.phpt b/ext/oci8/tests/connect_scope_try4.phpt index f35f4e68b5..cdefe36ee9 100644 --- a/ext/oci8/tests/connect_scope_try4.phpt +++ b/ext/oci8/tests/connect_scope_try4.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try5.phpt b/ext/oci8/tests/connect_scope_try5.phpt index 325ce2fb99..1e99d0a2e1 100644 --- a/ext/oci8/tests/connect_scope_try5.phpt +++ b/ext/oci8/tests/connect_scope_try5.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_scope_try6.phpt b/ext/oci8/tests/connect_scope_try6.phpt index 6cc54a21bb..84ea97ac43 100644 --- a/ext/oci8/tests/connect_scope_try6.phpt +++ b/ext/oci8/tests/connect_scope_try6.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Initialization diff --git a/ext/oci8/tests/connect_with_charset_001.phpt b/ext/oci8/tests/connect_with_charset_001.phpt index 36963ab5a0..2c8b2e10fd 100644 --- a/ext/oci8/tests/connect_with_charset_001.phpt +++ b/ext/oci8/tests/connect_with_charset_001.phpt @@ -5,7 +5,7 @@ oci_connect() with invalid character set --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; var_dump($c1 = oci_connect($user, $password, $dbase)); var_dump($c2 = oci_connect($user, $password, $dbase, "")); diff --git a/ext/oci8/tests/connect_without_oracle_home.phpt b/ext/oci8/tests/connect_without_oracle_home.phpt index 0e4a37ca3a..d83f30e0e9 100644 --- a/ext/oci8/tests/connect_without_oracle_home.phpt +++ b/ext/oci8/tests/connect_without_oracle_home.phpt @@ -20,7 +20,7 @@ ORACLE_HOME="" --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; if (!empty($dbase)) { var_dump(oci_connect($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_without_oracle_home_11.phpt b/ext/oci8/tests/connect_without_oracle_home_11.phpt index 09f778362c..a7c3fbba83 100644 --- a/ext/oci8/tests/connect_without_oracle_home_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_11.phpt @@ -23,7 +23,7 @@ ORACLE_HOME="" --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; if (!empty($dbase)) { var_dump(oci_connect($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_without_oracle_home_old.phpt b/ext/oci8/tests/connect_without_oracle_home_old.phpt index 1bc7b37c23..d77b3e3699 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old.phpt @@ -16,7 +16,7 @@ ORACLE_HOME="" --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; if (!empty($dbase)) { var_dump(ocilogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt index 07803b9996..c3c21f9d4c 100644 --- a/ext/oci8/tests/connect_without_oracle_home_old_11.phpt +++ b/ext/oci8/tests/connect_without_oracle_home_old_11.phpt @@ -23,7 +23,7 @@ ORACLE_HOME="" --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; if (!empty($dbase)) { var_dump(ocilogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/cursor_bind.phpt b/ext/oci8/tests/cursor_bind.phpt index 6de593a17d..d0f862b0d6 100644 --- a/ext/oci8/tests/cursor_bind.phpt +++ b/ext/oci8/tests/cursor_bind.phpt @@ -3,12 +3,12 @@ bind and fetch cursor from a statement --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialization diff --git a/ext/oci8/tests/cursor_bind_err.phpt b/ext/oci8/tests/cursor_bind_err.phpt index 3ee539f3d3..bf7fbc2931 100644 --- a/ext/oci8/tests/cursor_bind_err.phpt +++ b/ext/oci8/tests/cursor_bind_err.phpt @@ -3,12 +3,12 @@ binding a cursor (with errors) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/cursors.phpt b/ext/oci8/tests/cursors.phpt index a0921855ff..8a33f51649 100644 --- a/ext/oci8/tests/cursors.phpt +++ b/ext/oci8/tests/cursors.phpt @@ -3,13 +3,13 @@ fetching cursor from a statement --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__)."/create_table.inc"; +require __DIR__."/connect.inc"; +require __DIR__."/create_table.inc"; $insert_sql = "INSERT INTO ".$schema.$table_name." (id, value) VALUES (1,1)"; @@ -42,7 +42,7 @@ while ($data = oci_fetch_assoc($stmt)) { var_dump(oci_cancel($data["CURS"])); } -require dirname(__FILE__)."/drop_table.inc"; +require __DIR__."/drop_table.inc"; echo "Done\n"; diff --git a/ext/oci8/tests/cursors_old.phpt b/ext/oci8/tests/cursors_old.phpt index ade8263802..b130da5165 100644 --- a/ext/oci8/tests/cursors_old.phpt +++ b/ext/oci8/tests/cursors_old.phpt @@ -3,12 +3,12 @@ fetching cursor from a statement --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/db_op_1.phpt b/ext/oci8/tests/db_op_1.phpt index b10ee9a984..7ca97952d7 100644 --- a/ext/oci8/tests/db_op_1.phpt +++ b/ext/oci8/tests/db_op_1.phpt @@ -4,7 +4,7 @@ oci_set_db_operation: basic test for end-to-end tracing <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { die("skip needs to be run as a DBA user"); } @@ -20,7 +20,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/db_op_2.phpt b/ext/oci8/tests/db_op_2.phpt index 8710149911..26c5d30865 100644 --- a/ext/oci8/tests/db_op_2.phpt +++ b/ext/oci8/tests/db_op_2.phpt @@ -4,7 +4,7 @@ oci_set_db_operation: test DBOP for end-to-end tracing <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { die("skip needs to be run as a DBA user"); } @@ -24,7 +24,7 @@ if (!function_exists('oci_set_db_operation')) --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); function dq($c, $q) { diff --git a/ext/oci8/tests/dbmsoutput.phpt b/ext/oci8/tests/dbmsoutput.phpt index 6a8a718c8a..40da29654d 100644 --- a/ext/oci8/tests/dbmsoutput.phpt +++ b/ext/oci8/tests/dbmsoutput.phpt @@ -3,12 +3,12 @@ PL/SQL: dbms_output --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/debug.phpt b/ext/oci8/tests/debug.phpt index 729726fdd6..a197639af6 100644 --- a/ext/oci8/tests/debug.phpt +++ b/ext/oci8/tests/debug.phpt @@ -5,7 +5,7 @@ oci_internal_debug() --FILE-- <?php -require(dirname(__FILE__)."/details.inc"); +require(__DIR__."/details.inc"); oci_internal_debug(true); diff --git a/ext/oci8/tests/default_prefetch0.phpt b/ext/oci8/tests/default_prefetch0.phpt index 5d2934e4cb..6a62328713 100644 --- a/ext/oci8/tests/default_prefetch0.phpt +++ b/ext/oci8/tests/default_prefetch0.phpt @@ -7,7 +7,7 @@ oci8.default_prefetch=20 --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/default_prefetch1.phpt b/ext/oci8/tests/default_prefetch1.phpt index 04fbd1a5a5..ca9590a82f 100644 --- a/ext/oci8/tests/default_prefetch1.phpt +++ b/ext/oci8/tests/default_prefetch1.phpt @@ -7,7 +7,7 @@ oci8.default_prefetch=100 --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/default_prefetch2.phpt b/ext/oci8/tests/default_prefetch2.phpt index 33e91150b6..1d2a80b845 100644 --- a/ext/oci8/tests/default_prefetch2.phpt +++ b/ext/oci8/tests/default_prefetch2.phpt @@ -7,7 +7,7 @@ oci8.default_prefetch=100 --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define.phpt b/ext/oci8/tests/define.phpt index b78f698e7c..e3f19e6337 100644 --- a/ext/oci8/tests/define.phpt +++ b/ext/oci8/tests/define.phpt @@ -5,7 +5,7 @@ oci_define_by_name() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define0.phpt b/ext/oci8/tests/define0.phpt index f2f06e3152..b783ec647c 100644 --- a/ext/oci8/tests/define0.phpt +++ b/ext/oci8/tests/define0.phpt @@ -5,7 +5,7 @@ oci_define_by_name() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define1.phpt b/ext/oci8/tests/define1.phpt index be16271d5b..28c4b7f1f4 100644 --- a/ext/oci8/tests/define1.phpt +++ b/ext/oci8/tests/define1.phpt @@ -5,7 +5,7 @@ oci_define_by_name() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define2.phpt b/ext/oci8/tests/define2.phpt index 67cff225c1..a018bbcb44 100644 --- a/ext/oci8/tests/define2.phpt +++ b/ext/oci8/tests/define2.phpt @@ -3,12 +3,12 @@ Test oci_define_by_name types --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop table phptestrawtable", @@ -19,7 +19,7 @@ oci8_test_sql_execute($c, $stmtarray); $stmt = oci_parse ($c, "insert into phptestrawtable (id, fileimage) values (:id, :fileimage)"); $i=1; -$fileimage = file_get_contents( dirname(__FILE__)."/test.gif"); +$fileimage = file_get_contents( __DIR__."/test.gif"); $fileimage = substr($fileimage, 0, 300); var_dump(md5($fileimage)); diff --git a/ext/oci8/tests/define3.phpt b/ext/oci8/tests/define3.phpt index 690924b73a..669ae39d93 100644 --- a/ext/oci8/tests/define3.phpt +++ b/ext/oci8/tests/define3.phpt @@ -3,12 +3,12 @@ Test oci_define_by_name() LOB descriptor --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop table phpdefblobtable", @@ -24,7 +24,7 @@ oci_bind_by_name($stmt,":id",$id); oci_bind_by_name($stmt,":fileimage",$fileimage,-1,OCI_B_BLOB); $id = 1; oci_execute($stmt, OCI_DEFAULT); -$fileimage->savefile(dirname(__FILE__)."/test.gif"); +$fileimage->savefile(__DIR__."/test.gif"); $data = $fileimage->load(); var_dump(md5($data)); // original md5 oci_commit($c); diff --git a/ext/oci8/tests/define4.phpt b/ext/oci8/tests/define4.phpt index c01790bab0..25296f96d3 100644 --- a/ext/oci8/tests/define4.phpt +++ b/ext/oci8/tests/define4.phpt @@ -5,7 +5,7 @@ oci_define_by_name() on partial number of columns --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define5.phpt b/ext/oci8/tests/define5.phpt index f3aeb776a9..2dd9980d45 100644 --- a/ext/oci8/tests/define5.phpt +++ b/ext/oci8/tests/define5.phpt @@ -5,7 +5,7 @@ oci_define_by_name() for statement re-execution --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/define6.phpt b/ext/oci8/tests/define6.phpt index f68ada398c..c23cd452c6 100644 --- a/ext/oci8/tests/define6.phpt +++ b/ext/oci8/tests/define6.phpt @@ -3,12 +3,12 @@ oci_define_by_name tests with REF CURSORs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/define_old.phpt b/ext/oci8/tests/define_old.phpt index d174ef9155..634a86d370 100644 --- a/ext/oci8/tests/define_old.phpt +++ b/ext/oci8/tests/define_old.phpt @@ -5,7 +5,7 @@ ocidefinebyname() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/descriptors.phpt b/ext/oci8/tests/descriptors.phpt index 0b4aeb09f7..193e1e76f8 100644 --- a/ext/oci8/tests/descriptors.phpt +++ b/ext/oci8/tests/descriptors.phpt @@ -3,13 +3,13 @@ commit connection after destroying the descriptor --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -37,7 +37,7 @@ unset($row['BLOB']); oci_commit($c); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/drcp_cclass1.phpt b/ext/oci8/tests/drcp_cclass1.phpt index d004f1f112..6e98b67828 100644 --- a/ext/oci8/tests/drcp_cclass1.phpt +++ b/ext/oci8/tests/drcp_cclass1.phpt @@ -3,7 +3,7 @@ DRCP: Test setting connection class inline --SKIPIF-- <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); if (!$test_drcp) die("skip testing DRCP connection class only works in DRCP mode"); // Looked for :pooled in EZ connect string if (strpos($dbase, "/") !== false && stripos($dbase, ":pooled") === false) @@ -25,7 +25,7 @@ if (isset($matches_sv[0]) && $matches_sv[1] >= 12) { --FILE-- <?php -require(dirname(__FILE__)."/details.inc"); +require(__DIR__."/details.inc"); // Initialization diff --git a/ext/oci8/tests/drcp_characterset.phpt b/ext/oci8/tests/drcp_characterset.phpt index 657d4c5bab..c5a5339e04 100644 --- a/ext/oci8/tests/drcp_characterset.phpt +++ b/ext/oci8/tests/drcp_characterset.phpt @@ -5,7 +5,7 @@ DRCP: oci_pconnect() and oci_connect() with different character sets --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Create connections with oci_connect and oci_pconnect with UTF8 as Charset diff --git a/ext/oci8/tests/drcp_conn_close1.phpt b/ext/oci8/tests/drcp_conn_close1.phpt index 468b2732a6..18ed1cec72 100644 --- a/ext/oci8/tests/drcp_conn_close1.phpt +++ b/ext/oci8/tests/drcp_conn_close1.phpt @@ -8,7 +8,7 @@ oci8.connection_class=test --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Test will open a connection // Close the connection diff --git a/ext/oci8/tests/drcp_conn_close2.phpt b/ext/oci8/tests/drcp_conn_close2.phpt index 6b22862f89..4a20c9cf72 100644 --- a/ext/oci8/tests/drcp_conn_close2.phpt +++ b/ext/oci8/tests/drcp_conn_close2.phpt @@ -8,7 +8,7 @@ oci8.connection_class=test --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Test will open a connection // Close the connection diff --git a/ext/oci8/tests/drcp_connect1.phpt b/ext/oci8/tests/drcp_connect1.phpt index fc6fbc7d81..53d1e25c31 100644 --- a/ext/oci8/tests/drcp_connect1.phpt +++ b/ext/oci8/tests/drcp_connect1.phpt @@ -3,7 +3,7 @@ DRCP: oci_connect() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs (Calling PL/SQL from SQL is not supported in TimesTen) -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --INI-- oci8.connection_class=test @@ -11,8 +11,8 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require dirname(__FILE__)."/details.inc"; -require dirname(__FILE__)."/drcp_functions.inc"; +require __DIR__."/details.inc"; +require __DIR__."/drcp_functions.inc"; // Open a number of connections with oci_connect and oci_pconnect and verify // whether we get a used session with DRCP. diff --git a/ext/oci8/tests/drcp_newconnect.phpt b/ext/oci8/tests/drcp_newconnect.phpt index c2b6f51a25..cf4b6de17b 100644 --- a/ext/oci8/tests/drcp_newconnect.phpt +++ b/ext/oci8/tests/drcp_newconnect.phpt @@ -8,7 +8,7 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Open two connections with oci_new_connect // Verify they are different by comparing the resource ids diff --git a/ext/oci8/tests/drcp_pconn_close1.phpt b/ext/oci8/tests/drcp_pconn_close1.phpt index 53e7b1e3ef..83dad880d9 100644 --- a/ext/oci8/tests/drcp_pconn_close1.phpt +++ b/ext/oci8/tests/drcp_pconn_close1.phpt @@ -8,7 +8,7 @@ oci8.connection_class=test --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Test will open a persistent connection // Close the connection diff --git a/ext/oci8/tests/drcp_pconn_close2.phpt b/ext/oci8/tests/drcp_pconn_close2.phpt index 1c64762018..02bed68358 100644 --- a/ext/oci8/tests/drcp_pconn_close2.phpt +++ b/ext/oci8/tests/drcp_pconn_close2.phpt @@ -8,7 +8,7 @@ oci8.connection_class=test --FILE-- <?php -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; // Test will open a persistent connection // Close the connection diff --git a/ext/oci8/tests/drcp_privileged.phpt b/ext/oci8/tests/drcp_privileged.phpt index 54efc8726c..7b1283065f 100644 --- a/ext/oci8/tests/drcp_privileged.phpt +++ b/ext/oci8/tests/drcp_privileged.phpt @@ -3,7 +3,7 @@ DRCP: privileged connect --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); if (!$test_drcp) die("skip requires DRCP connection"); // Looked for :pooled in EZ connect string if (strpos($dbase, "/") !== false && stripos($dbase, ":pooled") === false) @@ -36,7 +36,7 @@ oci8.privileged_connect=1 // Connecting as SYSDBA or SYSOPER through DRCP will give ORA-1031 -require dirname(__FILE__)."/details.inc"; +require __DIR__."/details.inc"; var_dump(oci_connect($user,$password,$dbase,false,OCI_SYSDBA)); var_dump(oci_connect($user,$password,$dbase,false,OCI_SYSOPER)); var_dump(oci_new_connect($user,$password,$dbase,false,OCI_SYSDBA)); diff --git a/ext/oci8/tests/drcp_scope1.phpt b/ext/oci8/tests/drcp_scope1.phpt index 57f1abe327..78e2e900c9 100644 --- a/ext/oci8/tests/drcp_scope1.phpt +++ b/ext/oci8/tests/drcp_scope1.phpt @@ -7,8 +7,8 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require dirname(__FILE__)."/drcp_functions.inc"; -require dirname(__FILE__)."/details.inc"; +require __DIR__."/drcp_functions.inc"; +require __DIR__."/details.inc"; // Scope considered here is the functional scope // Test will open a connection within a function (function 1). diff --git a/ext/oci8/tests/drcp_scope2.phpt b/ext/oci8/tests/drcp_scope2.phpt index b72e00dbb0..05a4c558ec 100644 --- a/ext/oci8/tests/drcp_scope2.phpt +++ b/ext/oci8/tests/drcp_scope2.phpt @@ -7,8 +7,8 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require dirname(__FILE__)."/drcp_functions.inc"; -require dirname(__FILE__)."/details.inc"; +require __DIR__."/drcp_functions.inc"; +require __DIR__."/details.inc"; // Scope considered here is the functional scope // Test will open a connection within a function (function 1). diff --git a/ext/oci8/tests/drcp_scope3.phpt b/ext/oci8/tests/drcp_scope3.phpt index e77dc9fd7e..975f87bed9 100644 --- a/ext/oci8/tests/drcp_scope3.phpt +++ b/ext/oci8/tests/drcp_scope3.phpt @@ -7,8 +7,8 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require dirname(__FILE__)."/drcp_functions.inc"; -require dirname(__FILE__)."/details.inc"; +require __DIR__."/drcp_functions.inc"; +require __DIR__."/details.inc"; // The test opens a connection within function1 and updates a table // (without committing). Another connection is opened from function diff --git a/ext/oci8/tests/drcp_scope4.phpt b/ext/oci8/tests/drcp_scope4.phpt index 87eaf0cbe6..dced1c3f1c 100644 --- a/ext/oci8/tests/drcp_scope4.phpt +++ b/ext/oci8/tests/drcp_scope4.phpt @@ -7,8 +7,8 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require dirname(__FILE__)."/drcp_functions.inc"; -require dirname(__FILE__)."/details.inc"; +require __DIR__."/drcp_functions.inc"; +require __DIR__."/details.inc"; // The default expected behavior of this test is different between PHP // 5.2 and PHP 5.3 diff --git a/ext/oci8/tests/drcp_scope5.phpt b/ext/oci8/tests/drcp_scope5.phpt index 46163efe2d..d3ccb56da0 100644 --- a/ext/oci8/tests/drcp_scope5.phpt +++ b/ext/oci8/tests/drcp_scope5.phpt @@ -7,8 +7,8 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require dirname(__FILE__)."/drcp_functions.inc"; -require dirname(__FILE__)."/details.inc"; +require __DIR__."/drcp_functions.inc"; +require __DIR__."/details.inc"; // Similar to drcp_scope3.phpt but does a commit before end of // function2, allowing the table to be dropped cleanly at the end. diff --git a/ext/oci8/tests/driver_name.phpt b/ext/oci8/tests/driver_name.phpt index 8cbbf9648a..29b2cef520 100644 --- a/ext/oci8/tests/driver_name.phpt +++ b/ext/oci8/tests/driver_name.phpt @@ -3,7 +3,7 @@ Verify that the Driver Name attribute is set --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip as Output might vary with DRCP"); @@ -22,7 +22,7 @@ if (!(isset($matches[0]) && ($matches[1] == 11 && $matches[2] >= 2) || ($matches ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); echo"**Test 1.1 - Default values for the attribute **************\n"; get_attr($c); diff --git a/ext/oci8/tests/driver_name_11gR2.phpt b/ext/oci8/tests/driver_name_11gR2.phpt index d44f495dea..bb82b92fa3 100644 --- a/ext/oci8/tests/driver_name_11gR2.phpt +++ b/ext/oci8/tests/driver_name_11gR2.phpt @@ -3,7 +3,7 @@ Verify that the Driver Name attribute is set --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip as Output might vary with DRCP"); @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && ($matches[1] == 11 && $matches[2] >= 2) || ($matches ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); echo"**Test 1.1 - Default values for the attribute **************\n"; get_attr($c); diff --git a/ext/oci8/tests/dupcolnames.phpt b/ext/oci8/tests/dupcolnames.phpt index cc1fdd1854..40d2c99b13 100644 --- a/ext/oci8/tests/dupcolnames.phpt +++ b/ext/oci8/tests/dupcolnames.phpt @@ -5,7 +5,7 @@ SELECT tests with duplicate column anmes --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/edition_1.phpt b/ext/oci8/tests/edition_1.phpt index 19c0a5d3b3..9bdf699a70 100644 --- a/ext/oci8/tests/edition_1.phpt +++ b/ext/oci8/tests/edition_1.phpt @@ -3,7 +3,7 @@ Basic test for setting Oracle 11gR2 "edition" attribute --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) { die("skip needs to be run as a DBA user"); } @@ -36,7 +36,7 @@ if (!(isset($matches[0]) && $testuser = 'testuser_attr_1'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); function select_fn($conn) { $s = oci_parse($conn,"select * from view_ed"); diff --git a/ext/oci8/tests/edition_2.phpt b/ext/oci8/tests/edition_2.phpt index 763f59577d..054e685943 100644 --- a/ext/oci8/tests/edition_2.phpt +++ b/ext/oci8/tests/edition_2.phpt @@ -3,7 +3,7 @@ Set and check Oracle 11gR2 "edition" attribute --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) @@ -35,7 +35,7 @@ if (!(isset($matches[0]) && $testuser = 'testuser_ed_2'; // Used in conn_attr.inc $testpassword = 'testuser'; -require(dirname(__FILE__)."/conn_attr.inc"); +require(__DIR__."/conn_attr.inc"); echo"**Test 1.1 - Default value for the attribute **************\n"; get_edit_attr($c); diff --git a/ext/oci8/tests/error.phpt b/ext/oci8/tests/error.phpt index c3fb2de664..f1f74ddce4 100644 --- a/ext/oci8/tests/error.phpt +++ b/ext/oci8/tests/error.phpt @@ -3,12 +3,12 @@ oci_error() error message for parsing error --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump(oci_connect($user, $password, $dbase)); diff --git a/ext/oci8/tests/error2.phpt b/ext/oci8/tests/error2.phpt index 2561d9dd4d..2e1c72fa69 100644 --- a/ext/oci8/tests/error2.phpt +++ b/ext/oci8/tests/error2.phpt @@ -3,13 +3,13 @@ Exercise error code for SUCCESS_WITH_INFO --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); ini_set('error_reporting', E_ALL); diff --git a/ext/oci8/tests/error3.phpt b/ext/oci8/tests/error3.phpt index 29650439e2..c993a97b5d 100644 --- a/ext/oci8/tests/error3.phpt +++ b/ext/oci8/tests/error3.phpt @@ -3,7 +3,7 @@ Maximum Oracle error length --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); // Assume runtime client version is >= compile time client version $cv = explode('.', oci_client_version()); if ($cv[0] < 11 || ($cv[0] == 11 && $cv[1] < 2) || ($cv[0] == 11 && $cv[1] == 2 && $cv[3] < 3)) { @@ -15,7 +15,7 @@ log_errors_max_len=4096 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); echo "Test 1\n"; diff --git a/ext/oci8/tests/error_bind.phpt b/ext/oci8/tests/error_bind.phpt index 0b039a16d9..d36f31b377 100644 --- a/ext/oci8/tests/error_bind.phpt +++ b/ext/oci8/tests/error_bind.phpt @@ -5,7 +5,7 @@ Test some oci_bind_by_name error conditions --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $drop = "drop table bind_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/error_bind_2.phpt b/ext/oci8/tests/error_bind_2.phpt index 592702b931..f60f86984f 100644 --- a/ext/oci8/tests/error_bind_2.phpt +++ b/ext/oci8/tests/error_bind_2.phpt @@ -4,7 +4,7 @@ Test some more oci_bind_by_name error conditions <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/error_bind_3.phpt b/ext/oci8/tests/error_bind_3.phpt index 47ca71dcd1..2ccb2f36ec 100644 --- a/ext/oci8/tests/error_bind_3.phpt +++ b/ext/oci8/tests/error_bind_3.phpt @@ -4,7 +4,7 @@ Test some more oci_bind_by_name error conditions <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $sql = "begin :output1 := 99; diff --git a/ext/oci8/tests/error_old.phpt b/ext/oci8/tests/error_old.phpt index 8df1ee5df2..e25b66516b 100644 --- a/ext/oci8/tests/error_old.phpt +++ b/ext/oci8/tests/error_old.phpt @@ -3,12 +3,12 @@ ocierror() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs: different error messages from TimesTen -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump(ocilogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/error_parse.phpt b/ext/oci8/tests/error_parse.phpt index 458df8715a..1992826618 100644 --- a/ext/oci8/tests/error_parse.phpt +++ b/ext/oci8/tests/error_parse.phpt @@ -10,7 +10,7 @@ Test error handling when persistent connection is passed to oci_error() // was fixed and the behavior of oci_error() for all connections types // was made consistent. -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); // Test parse error for normal connection diff --git a/ext/oci8/tests/error_set.phpt b/ext/oci8/tests/error_set.phpt index b0c53408c3..95673f554a 100644 --- a/ext/oci8/tests/error_set.phpt +++ b/ext/oci8/tests/error_set.phpt @@ -5,7 +5,7 @@ Check oci_set_{action,client_identifier,module_name,client_info} error handling --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); error_reporting(E_ALL); ini_set('display_errors', 'Off'); diff --git a/ext/oci8/tests/exec_fetch.phpt b/ext/oci8/tests/exec_fetch.phpt index b318ee48fc..482fa7c6ef 100644 --- a/ext/oci8/tests/exec_fetch.phpt +++ b/ext/oci8/tests/exec_fetch.phpt @@ -5,7 +5,7 @@ fetch after failed oci_execute() --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $sql = "select 2 from nonex_dual"; $stmt = oci_parse($c, $sql); diff --git a/ext/oci8/tests/execute_mode.phpt b/ext/oci8/tests/execute_mode.phpt index ffa97f0f2f..86b8eafcbb 100644 --- a/ext/oci8/tests/execute_mode.phpt +++ b/ext/oci8/tests/execute_mode.phpt @@ -5,7 +5,7 @@ oci_execute() and invalid execute mode --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $pc = oci_pconnect($user, $password, $dbase); diff --git a/ext/oci8/tests/extauth_01.phpt b/ext/oci8/tests/extauth_01.phpt index 7099b40945..ba48b0eb58 100644 --- a/ext/oci8/tests/extauth_01.phpt +++ b/ext/oci8/tests/extauth_01.phpt @@ -4,7 +4,7 @@ Test External Authentication errors with oci_connect <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); if (substr(PHP_OS, 0, 3) == 'WIN') die("skip feature not available on Windows platforms"); -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --INI-- diff --git a/ext/oci8/tests/fetch.phpt b/ext/oci8/tests/fetch.phpt index a290603487..eeba992db2 100644 --- a/ext/oci8/tests/fetch.phpt +++ b/ext/oci8/tests/fetch.phpt @@ -5,7 +5,7 @@ ocifetch() & ociresult() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/fetch_all1.phpt b/ext/oci8/tests/fetch_all1.phpt index 20afe5967c..2d27f8e02b 100644 --- a/ext/oci8/tests/fetch_all1.phpt +++ b/ext/oci8/tests/fetch_all1.phpt @@ -5,7 +5,7 @@ oci_fetch_all() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/fetch_all2.phpt b/ext/oci8/tests/fetch_all2.phpt index ca43348c2b..cafd0eb509 100644 --- a/ext/oci8/tests/fetch_all2.phpt +++ b/ext/oci8/tests/fetch_all2.phpt @@ -3,13 +3,13 @@ oci_fetch_all() - 2 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; @@ -49,7 +49,7 @@ oci_execute($s); var_dump(oci_fetch_all($s, $all, 0, 1, OCI_BOTH)); var_dump($all); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/fetch_all3.phpt b/ext/oci8/tests/fetch_all3.phpt index 728dc7e3eb..0fdf41140b 100644 --- a/ext/oci8/tests/fetch_all3.phpt +++ b/ext/oci8/tests/fetch_all3.phpt @@ -5,7 +5,7 @@ oci_fetch_all() - all combinations of flags --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/fetch_all4.phpt b/ext/oci8/tests/fetch_all4.phpt index 7c3b5ea83c..ff4f7c400e 100644 --- a/ext/oci8/tests/fetch_all4.phpt +++ b/ext/oci8/tests/fetch_all4.phpt @@ -5,7 +5,7 @@ Test oci_fetch_* array overwriting when query returns no rows --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/fetch_all5.phpt b/ext/oci8/tests/fetch_all5.phpt index 28e1a2e72d..26c7447c2c 100644 --- a/ext/oci8/tests/fetch_all5.phpt +++ b/ext/oci8/tests/fetch_all5.phpt @@ -5,7 +5,7 @@ Test oci_fetch_all with 0 and -1 skip & maxrows --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/fetch_array.phpt b/ext/oci8/tests/fetch_array.phpt index c4a45c6be2..b7f327dcd4 100644 --- a/ext/oci8/tests/fetch_array.phpt +++ b/ext/oci8/tests/fetch_array.phpt @@ -3,13 +3,13 @@ oci_fetch_array() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; @@ -96,7 +96,7 @@ while ($row = oci_fetch_array($s, OCI_NUM+OCI_RETURN_NULLS)) { var_dump($row); } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/fetch_assoc.phpt b/ext/oci8/tests/fetch_assoc.phpt index 5c4c91e1d8..e891858efa 100644 --- a/ext/oci8/tests/fetch_assoc.phpt +++ b/ext/oci8/tests/fetch_assoc.phpt @@ -5,7 +5,7 @@ oci_fetch_assoc() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $stmtarray = array( "drop table fetch_assoc_tab", diff --git a/ext/oci8/tests/fetch_into.phpt b/ext/oci8/tests/fetch_into.phpt index 5235dac8a0..04f6743a75 100644 --- a/ext/oci8/tests/fetch_into.phpt +++ b/ext/oci8/tests/fetch_into.phpt @@ -5,7 +5,7 @@ ocifetchinto() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/fetch_into1.phpt b/ext/oci8/tests/fetch_into1.phpt index 68e5f9cfae..97e511869e 100644 --- a/ext/oci8/tests/fetch_into1.phpt +++ b/ext/oci8/tests/fetch_into1.phpt @@ -3,13 +3,13 @@ various ocifetchinto() tests --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value, string) VALUES (1, 1, NULL)"; @@ -57,7 +57,7 @@ var_dump($all); var_dump(ocifetchinto($s, $all, OCI_NUM+OCI_RETURN_NULLS+OCI_RETURN_LOBS)); var_dump($all); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/fetch_into2.phpt b/ext/oci8/tests/fetch_into2.phpt index 2d72541580..b79e282350 100644 --- a/ext/oci8/tests/fetch_into2.phpt +++ b/ext/oci8/tests/fetch_into2.phpt @@ -3,13 +3,13 @@ ocifetchinto() & wrong number of params --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value, string) VALUES (1, 1, NULL)"; @@ -45,7 +45,7 @@ var_dump($all); var_dump(ocifetchinto($s, $all, 1000000)); var_dump($all); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/fetch_object.phpt b/ext/oci8/tests/fetch_object.phpt index bd49c5ed47..053b3136f3 100644 --- a/ext/oci8/tests/fetch_object.phpt +++ b/ext/oci8/tests/fetch_object.phpt @@ -3,12 +3,12 @@ oci_fetch_object() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/fetch_object_1.phpt b/ext/oci8/tests/fetch_object_1.phpt index 88dcd5ec62..3480aa25b1 100644 --- a/ext/oci8/tests/fetch_object_1.phpt +++ b/ext/oci8/tests/fetch_object_1.phpt @@ -3,12 +3,12 @@ oci_fetch_object() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/fetch_object_2.phpt b/ext/oci8/tests/fetch_object_2.phpt index 1814446aa8..648d1dd073 100644 --- a/ext/oci8/tests/fetch_object_2.phpt +++ b/ext/oci8/tests/fetch_object_2.phpt @@ -3,12 +3,12 @@ oci_fetch_object() with CLOB and NULL --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/fetch_row.phpt b/ext/oci8/tests/fetch_row.phpt index 1b5176974a..b50b65d480 100644 --- a/ext/oci8/tests/fetch_row.phpt +++ b/ext/oci8/tests/fetch_row.phpt @@ -5,7 +5,7 @@ oci_fetch_row() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/field_funcs.phpt b/ext/oci8/tests/field_funcs.phpt index 5448fcbc34..1432dcd4c0 100644 --- a/ext/oci8/tests/field_funcs.phpt +++ b/ext/oci8/tests/field_funcs.phpt @@ -3,13 +3,13 @@ oci_field_*() family --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; @@ -52,7 +52,7 @@ foreach ($row as $num => $field) { } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/field_funcs0.phpt b/ext/oci8/tests/field_funcs0.phpt index 5448fcbc34..1432dcd4c0 100644 --- a/ext/oci8/tests/field_funcs0.phpt +++ b/ext/oci8/tests/field_funcs0.phpt @@ -3,13 +3,13 @@ oci_field_*() family --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; @@ -52,7 +52,7 @@ foreach ($row as $num => $field) { } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/field_funcs1.phpt b/ext/oci8/tests/field_funcs1.phpt index 41d8627ce4..29db4963d4 100644 --- a/ext/oci8/tests/field_funcs1.phpt +++ b/ext/oci8/tests/field_funcs1.phpt @@ -5,7 +5,7 @@ oci_field_*() family: error cases --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/field_funcs2.phpt b/ext/oci8/tests/field_funcs2.phpt index 502d079139..896a63d11b 100644 --- a/ext/oci8/tests/field_funcs2.phpt +++ b/ext/oci8/tests/field_funcs2.phpt @@ -5,7 +5,7 @@ Bug #41917 (invalid scale and precision) --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $s = oci_parse($c, 'drop table field_funcs2_tab'); @oci_execute($s); diff --git a/ext/oci8/tests/field_funcs3.phpt b/ext/oci8/tests/field_funcs3.phpt index e51949cf21..23f4b5ea61 100644 --- a/ext/oci8/tests/field_funcs3.phpt +++ b/ext/oci8/tests/field_funcs3.phpt @@ -5,7 +5,7 @@ oci_field_*() family: basic column types --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialization $stmtarray = array( diff --git a/ext/oci8/tests/field_funcs_old.phpt b/ext/oci8/tests/field_funcs_old.phpt index e088463617..6417de15cd 100644 --- a/ext/oci8/tests/field_funcs_old.phpt +++ b/ext/oci8/tests/field_funcs_old.phpt @@ -3,13 +3,13 @@ ocicolumn*() family --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__."/connect.inc"; +require __DIR__.'/create_table.inc'; $insert_sql = "INSERT INTO ".$schema."".$table_name." (id, value) VALUES (1,1)"; @@ -52,7 +52,7 @@ foreach ($row as $num => $field) { } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/imp_res_1.phpt b/ext/oci8/tests/imp_res_1.phpt index 8f3608dba3..7379b606f2 100644 --- a/ext/oci8/tests/imp_res_1.phpt +++ b/ext/oci8/tests/imp_res_1.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: basic test <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_2.phpt b/ext/oci8/tests/imp_res_2.phpt index 567cefb2ba..b246e2ed77 100644 --- a/ext/oci8/tests/imp_res_2.phpt +++ b/ext/oci8/tests/imp_res_2.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: Zero Rows <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_3.phpt b/ext/oci8/tests/imp_res_3.phpt index 965edb1224..bd48267e96 100644 --- a/ext/oci8/tests/imp_res_3.phpt +++ b/ext/oci8/tests/imp_res_3.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: bigger data size <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_4.phpt b/ext/oci8/tests/imp_res_4.phpt index d938f9f4ce..79e9b39dd3 100644 --- a/ext/oci8/tests/imp_res_4.phpt +++ b/ext/oci8/tests/imp_res_4.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_fetch <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_5.phpt b/ext/oci8/tests/imp_res_5.phpt index 7c06dee78f..26107eda94 100644 --- a/ext/oci8/tests/imp_res_5.phpt +++ b/ext/oci8/tests/imp_res_5.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_fetch_all <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_6.phpt b/ext/oci8/tests/imp_res_6.phpt index 278c47b311..c1ea7d34f3 100644 --- a/ext/oci8/tests/imp_res_6.phpt +++ b/ext/oci8/tests/imp_res_6.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: alternating oci_fetch_* calls <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_7.phpt b/ext/oci8/tests/imp_res_7.phpt index 8502ab2488..6ba9d5fc14 100644 --- a/ext/oci8/tests/imp_res_7.phpt +++ b/ext/oci8/tests/imp_res_7.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: bigger data size <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_call_error.phpt b/ext/oci8/tests/imp_res_call_error.phpt index 774131ee00..5c2ab9988a 100644 --- a/ext/oci8/tests/imp_res_call_error.phpt +++ b/ext/oci8/tests/imp_res_call_error.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: using SQL 'CALL' <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_cancel.phpt b/ext/oci8/tests/imp_res_cancel.phpt index 7c503c3cb9..e3caa86672 100644 --- a/ext/oci8/tests/imp_res_cancel.phpt +++ b/ext/oci8/tests/imp_res_cancel.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_cancel <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $stmtarray = array( "create or replace procedure imp_res_cancel_proc as diff --git a/ext/oci8/tests/imp_res_close.phpt b/ext/oci8/tests/imp_res_close.phpt index de85a3d1ca..3e719b9ee2 100644 --- a/ext/oci8/tests/imp_res_close.phpt +++ b/ext/oci8/tests/imp_res_close.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_free_statement #1 <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_cursor.phpt b/ext/oci8/tests/imp_res_cursor.phpt index 57bdddeab2..221ef80d47 100644 --- a/ext/oci8/tests/imp_res_cursor.phpt +++ b/ext/oci8/tests/imp_res_cursor.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: nested cursor <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_dbmsoutput.phpt b/ext/oci8/tests/imp_res_dbmsoutput.phpt index cb6fae095f..b84ef8c556 100644 --- a/ext/oci8/tests/imp_res_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_dbmsoutput.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: interleaved with DBMS_OUTPUT <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_field.phpt b/ext/oci8/tests/imp_res_field.phpt index 3d10e15dac..c96e7c3ef5 100644 --- a/ext/oci8/tests/imp_res_field.phpt +++ b/ext/oci8/tests/imp_res_field.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: field tests <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_func_error.phpt b/ext/oci8/tests/imp_res_func_error.phpt index a5c7e84241..424ae47bb8 100644 --- a/ext/oci8/tests/imp_res_func_error.phpt +++ b/ext/oci8/tests/imp_res_func_error.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: test with a PL/SQL function <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_1.phpt b/ext/oci8/tests/imp_res_get_1.phpt index 79ad8711ff..7eac1033f4 100644 --- a/ext/oci8/tests/imp_res_get_1.phpt +++ b/ext/oci8/tests/imp_res_get_1.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_2.phpt b/ext/oci8/tests/imp_res_get_2.phpt index 3ed3036f6b..b8c2a08af5 100644 --- a/ext/oci8/tests/imp_res_get_2.phpt +++ b/ext/oci8/tests/imp_res_get_2.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: similar to <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_3.phpt b/ext/oci8/tests/imp_res_get_3.phpt index f0f0b164da..4b39dd1117 100644 --- a/ext/oci8/tests/imp_res_get_3.phpt +++ b/ext/oci8/tests/imp_res_get_3.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: basic test <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -19,7 +19,7 @@ oci8.statement_cache_size = 0 --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_4.phpt b/ext/oci8/tests/imp_res_get_4.phpt index 658ec9c050..193e2f623e 100644 --- a/ext/oci8/tests/imp_res_get_4.phpt +++ b/ext/oci8/tests/imp_res_get_4.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleave <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_5.phpt b/ext/oci8/tests/imp_res_get_5.phpt index eabc7867e9..79bb170a59 100644 --- a/ext/oci8/tests/imp_res_get_5.phpt +++ b/ext/oci8/tests/imp_res_get_5.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: get from w <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); function print_row($row) { diff --git a/ext/oci8/tests/imp_res_get_all.phpt b/ext/oci8/tests/imp_res_get_all.phpt index 98bb8c08d2..a1d99eeebf 100644 --- a/ext/oci8/tests/imp_res_get_all.phpt +++ b/ext/oci8/tests/imp_res_get_all.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_fetch_ <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $plsql = "declare c1 sys_refcursor; diff --git a/ext/oci8/tests/imp_res_get_cancel.phpt b/ext/oci8/tests/imp_res_get_cancel.phpt index e09ddf906a..5bc36f08cd 100644 --- a/ext/oci8/tests/imp_res_get_cancel.phpt +++ b/ext/oci8/tests/imp_res_get_cancel.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_cancel <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $plsql = "declare diff --git a/ext/oci8/tests/imp_res_get_close_1.phpt b/ext/oci8/tests/imp_res_get_close_1.phpt index 20f46b4f1c..a9c2fc455c 100644 --- a/ext/oci8/tests/imp_res_get_close_1.phpt +++ b/ext/oci8/tests/imp_res_get_close_1.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_s <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_close_2.phpt b/ext/oci8/tests/imp_res_get_close_2.phpt index efc0e6da60..d435b8968d 100644 --- a/ext/oci8/tests/imp_res_get_close_2.phpt +++ b/ext/oci8/tests/imp_res_get_close_2.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_s <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_close_3.phpt b/ext/oci8/tests/imp_res_get_close_3.phpt index d57644c924..268c353801 100644 --- a/ext/oci8/tests/imp_res_get_close_3.phpt +++ b/ext/oci8/tests/imp_res_get_close_3.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: oci_free_s <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_cursor.phpt b/ext/oci8/tests/imp_res_get_cursor.phpt index 417c112419..1694fc830a 100644 --- a/ext/oci8/tests/imp_res_get_cursor.phpt +++ b/ext/oci8/tests/imp_res_get_cursor.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: nested cur <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt index 08c9d2f36b..95bb50cd51 100644 --- a/ext/oci8/tests/imp_res_get_dbmsoutput.phpt +++ b/ext/oci8/tests/imp_res_get_dbmsoutput.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: interleave <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_get_exec.phpt b/ext/oci8/tests/imp_res_get_exec.phpt index 6f5a503ec3..f9391cc122 100644 --- a/ext/oci8/tests/imp_res_get_exec.phpt +++ b/ext/oci8/tests/imp_res_get_exec.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: Execute tw <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $plsql = "declare c1 sys_refcursor; diff --git a/ext/oci8/tests/imp_res_get_none.phpt b/ext/oci8/tests/imp_res_get_none.phpt index 73d2913884..87d86c2f9f 100644 --- a/ext/oci8/tests/imp_res_get_none.phpt +++ b/ext/oci8/tests/imp_res_get_none.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: oci_get_implicit_resultset: no implici <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/imp_res_insert.phpt b/ext/oci8/tests/imp_res_insert.phpt index 317d4def66..074f5ee879 100644 --- a/ext/oci8/tests/imp_res_insert.phpt +++ b/ext/oci8/tests/imp_res_insert.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: Commit modes <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_lob.phpt b/ext/oci8/tests/imp_res_lob.phpt index 16f0701e72..48185b6355 100644 --- a/ext/oci8/tests/imp_res_lob.phpt +++ b/ext/oci8/tests/imp_res_lob.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: LOBs <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/imp_res_prefetch.phpt b/ext/oci8/tests/imp_res_prefetch.phpt index c00e4be297..849874bd00 100644 --- a/ext/oci8/tests/imp_res_prefetch.phpt +++ b/ext/oci8/tests/imp_res_prefetch.phpt @@ -4,7 +4,7 @@ Oracle Database 12c Implicit Result Sets: basic test <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && $matches[1] >= 12)) { die("skip expected output only valid when using Oracle Database 12c or greater"); @@ -17,7 +17,7 @@ if (!(isset($matches[0]) && $matches[0] >= 12)) { --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/lob_001.phpt b/ext/oci8/tests/lob_001.phpt Binary files differindex 432239d129..3a3a48dee0 100644 --- a/ext/oci8/tests/lob_001.phpt +++ b/ext/oci8/tests/lob_001.phpt diff --git a/ext/oci8/tests/lob_002.phpt b/ext/oci8/tests/lob_002.phpt index 188f83ddd3..e83ae21187 100644 --- a/ext/oci8/tests/lob_002.phpt +++ b/ext/oci8/tests/lob_002.phpt @@ -3,12 +3,12 @@ oci_lob_write() and friends (with errors) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/lob_003.phpt b/ext/oci8/tests/lob_003.phpt Binary files differindex b0b1d31af4..1edb9bef06 100644 --- a/ext/oci8/tests/lob_003.phpt +++ b/ext/oci8/tests/lob_003.phpt diff --git a/ext/oci8/tests/lob_004.phpt b/ext/oci8/tests/lob_004.phpt index a363199776..d04076fba9 100644 --- a/ext/oci8/tests/lob_004.phpt +++ b/ext/oci8/tests/lob_004.phpt @@ -3,13 +3,13 @@ oci_lob_seek()/rewind()/append() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -51,7 +51,7 @@ $row = oci_fetch_array($s); var_dump($row[0]->read(10000)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_005.phpt b/ext/oci8/tests/lob_005.phpt index e482caafd1..fa910277f1 100644 --- a/ext/oci8/tests/lob_005.phpt +++ b/ext/oci8/tests/lob_005.phpt @@ -3,13 +3,13 @@ oci_lob_is_equal() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -33,7 +33,7 @@ var_dump($row = oci_fetch_array($s)); var_dump(oci_lob_is_equal($row[0], $row['BLOB'])); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_006.phpt b/ext/oci8/tests/lob_006.phpt Binary files differindex 6a38df5e43..9a9b9f6844 100644 --- a/ext/oci8/tests/lob_006.phpt +++ b/ext/oci8/tests/lob_006.phpt diff --git a/ext/oci8/tests/lob_007.phpt b/ext/oci8/tests/lob_007.phpt index 934f012862..9b99f371e3 100644 --- a/ext/oci8/tests/lob_007.phpt +++ b/ext/oci8/tests/lob_007.phpt @@ -3,13 +3,13 @@ oci_lob_write()/size()/load() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -39,7 +39,7 @@ var_dump($row = oci_fetch_array($s)); var_dump($row[0]->size()); var_dump(strlen($row[0]->load())); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_008.phpt b/ext/oci8/tests/lob_008.phpt index 238f619507..53b75302ef 100644 --- a/ext/oci8/tests/lob_008.phpt +++ b/ext/oci8/tests/lob_008.phpt @@ -3,13 +3,13 @@ oci_lob_write()/read()/eof() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -41,7 +41,7 @@ while (!$row[0]->eof()) { } var_dump($len); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_009.phpt b/ext/oci8/tests/lob_009.phpt index 50a9b02c05..090503f927 100644 --- a/ext/oci8/tests/lob_009.phpt +++ b/ext/oci8/tests/lob_009.phpt @@ -3,13 +3,13 @@ oci_lob_import()/read() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -25,7 +25,7 @@ oci_execute($statement, OCI_DEFAULT); var_dump($blob); var_dump($blob->seek(10, OCI_SEEK_CUR)); -var_dump($blob->import(dirname(__FILE__)."/lob_009.txt")); +var_dump($blob->import(__DIR__."/lob_009.txt")); oci_commit($c); $select_sql = "SELECT blob FROM ".$schema.$table_name." FOR UPDATE"; @@ -38,7 +38,7 @@ while (!$row[0]->eof()) { var_dump(str_replace("\r", "", $row[0]->read(1024))); } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_010.phpt b/ext/oci8/tests/lob_010.phpt index f82faf1075..b4a0a77d1e 100644 --- a/ext/oci8/tests/lob_010.phpt +++ b/ext/oci8/tests/lob_010.phpt @@ -3,13 +3,13 @@ oci_lob_save() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -37,7 +37,7 @@ while (!$row[0]->eof()) { var_dump($row[0]->read(1024)); } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_011.phpt b/ext/oci8/tests/lob_011.phpt index bd516e013b..6f008b303c 100644 --- a/ext/oci8/tests/lob_011.phpt +++ b/ext/oci8/tests/lob_011.phpt @@ -3,13 +3,13 @@ oci_lob_copy() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (id, blob) @@ -63,7 +63,7 @@ oci_execute($s, OCI_DEFAULT); var_dump($row2 = oci_fetch_array($s, OCI_RETURN_LOBS)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_012.phpt b/ext/oci8/tests/lob_012.phpt index 480049cfab..94e3010629 100644 --- a/ext/oci8/tests/lob_012.phpt +++ b/ext/oci8/tests/lob_012.phpt @@ -3,13 +3,13 @@ oci_lob_export() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -35,13 +35,13 @@ oci_execute($s, OCI_DEFAULT); $row = oci_fetch_array($s); -var_dump($row[0]->export(dirname(__FILE__)."/lob_012.tmp", 3, 10)); +var_dump($row[0]->export(__DIR__."/lob_012.tmp", 3, 10)); -var_dump(file_get_contents(dirname(__FILE__)."/lob_012.tmp")); +var_dump(file_get_contents(__DIR__."/lob_012.tmp")); -@unlink(dirname(__FILE__)."/lob_012.tmp"); +@unlink(__DIR__."/lob_012.tmp"); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_013.phpt b/ext/oci8/tests/lob_013.phpt index 9120fa76c8..bd703465b5 100644 --- a/ext/oci8/tests/lob_013.phpt +++ b/ext/oci8/tests/lob_013.phpt @@ -3,13 +3,13 @@ lob buffering --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -41,7 +41,7 @@ $row = oci_fetch_array($s, OCI_RETURN_LOBS); var_dump($row[0]); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_014.phpt b/ext/oci8/tests/lob_014.phpt index b73e76fd4f..95029a02e6 100644 --- a/ext/oci8/tests/lob_014.phpt +++ b/ext/oci8/tests/lob_014.phpt @@ -3,13 +3,13 @@ oci_lob_free()/close() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -39,7 +39,7 @@ oci_execute($s); var_dump(oci_fetch_array($s, OCI_NUM + OCI_RETURN_LOBS)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_015.phpt b/ext/oci8/tests/lob_015.phpt index 592eaab9fb..d3d5ee3c5b 100644 --- a/ext/oci8/tests/lob_015.phpt +++ b/ext/oci8/tests/lob_015.phpt @@ -3,13 +3,13 @@ various tests with wrong param count --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -32,7 +32,7 @@ oci_execute($statement, OCI_DEFAULT); var_dump($blob); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_016.phpt b/ext/oci8/tests/lob_016.phpt index 70f93b90e1..098a65835e 100644 --- a/ext/oci8/tests/lob_016.phpt +++ b/ext/oci8/tests/lob_016.phpt @@ -3,12 +3,12 @@ returning multiple lobs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table lob_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/lob_017.phpt b/ext/oci8/tests/lob_017.phpt index ada2dde7e0..c555125a75 100644 --- a/ext/oci8/tests/lob_017.phpt +++ b/ext/oci8/tests/lob_017.phpt @@ -3,12 +3,12 @@ returning multiple lobs (using persistent connection) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $c = oci_pconnect($user, $password, $dbase); diff --git a/ext/oci8/tests/lob_018.phpt b/ext/oci8/tests/lob_018.phpt index 89a02c1d08..be678728f0 100644 --- a/ext/oci8/tests/lob_018.phpt +++ b/ext/oci8/tests/lob_018.phpt @@ -3,12 +3,12 @@ fetching the same lob several times --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/lob_019.phpt b/ext/oci8/tests/lob_019.phpt Binary files differindex fb941851bd..4977b0a6ef 100644 --- a/ext/oci8/tests/lob_019.phpt +++ b/ext/oci8/tests/lob_019.phpt diff --git a/ext/oci8/tests/lob_020.phpt b/ext/oci8/tests/lob_020.phpt Binary files differindex c4ad5276b1..19a689dfd6 100644 --- a/ext/oci8/tests/lob_020.phpt +++ b/ext/oci8/tests/lob_020.phpt diff --git a/ext/oci8/tests/lob_021.phpt b/ext/oci8/tests/lob_021.phpt index 9eee7abd6c..609003603b 100644 --- a/ext/oci8/tests/lob_021.phpt +++ b/ext/oci8/tests/lob_021.phpt @@ -3,13 +3,13 @@ oci_lob_free()/close() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -44,7 +44,7 @@ oci_execute($s); var_dump(oci_fetch_array($s, OCI_NUM + OCI_RETURN_LOBS)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_022.phpt b/ext/oci8/tests/lob_022.phpt index 77a9b064e6..3de78dcd2a 100644 --- a/ext/oci8/tests/lob_022.phpt +++ b/ext/oci8/tests/lob_022.phpt @@ -3,12 +3,12 @@ fetching the same lob several times --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $drop = "DROP table lob_test"; $statement = oci_parse($c, $drop); diff --git a/ext/oci8/tests/lob_023.phpt b/ext/oci8/tests/lob_023.phpt index 09d04f8440..8093ab63af 100644 --- a/ext/oci8/tests/lob_023.phpt +++ b/ext/oci8/tests/lob_023.phpt @@ -3,13 +3,13 @@ oci_lob_import()/read() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -25,12 +25,12 @@ oci_execute($statement, OCI_DEFAULT); var_dump($blob); var_dump($blob->seek(10, OCI_SEEK_CUR)); -var_dump($blob->import(dirname(__FILE__)."/lob_009.txt")); +var_dump($blob->import(__DIR__."/lob_009.txt")); var_dump($blob->import()); var_dump(oci_lob_import($blob)); -var_dump(oci_lob_import($blob, dirname(__FILE__)."/lob_009.txt")); +var_dump(oci_lob_import($blob, __DIR__."/lob_009.txt")); unset($blob->descriptor); -var_dump(oci_lob_import($blob, dirname(__FILE__)."/lob_009.txt")); +var_dump(oci_lob_import($blob, __DIR__."/lob_009.txt")); oci_commit($c); $select_sql = "SELECT blob FROM ".$schema.$table_name." FOR UPDATE"; @@ -43,7 +43,7 @@ while (!$row[0]->eof()) { var_dump(str_replace("\r", "", $row[0]->read(1024))); } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_024.phpt b/ext/oci8/tests/lob_024.phpt index 958cb3ed13..53a043fd95 100644 --- a/ext/oci8/tests/lob_024.phpt +++ b/ext/oci8/tests/lob_024.phpt @@ -3,13 +3,13 @@ oci_lob_load() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -42,7 +42,7 @@ var_dump(oci_lob_load()); unset($row[0]->descriptor); var_dump(oci_lob_load($row[0])); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_025.phpt b/ext/oci8/tests/lob_025.phpt index 7260d9820b..7f3dff8bb4 100644 --- a/ext/oci8/tests/lob_025.phpt +++ b/ext/oci8/tests/lob_025.phpt @@ -3,13 +3,13 @@ oci_lob_read() tests --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -44,7 +44,7 @@ unset($row[0]->descriptor); var_dump(oci_lob_read($row[0],1)); var_dump(oci_lob_eof($row[0])); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_026.phpt b/ext/oci8/tests/lob_026.phpt index 42f0d8f775..acada8a9d3 100644 --- a/ext/oci8/tests/lob_026.phpt +++ b/ext/oci8/tests/lob_026.phpt @@ -3,13 +3,13 @@ oci_lob_seek()/rewind()/append() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -56,7 +56,7 @@ $row = oci_fetch_array($s); var_dump(oci_lob_read($row[0], 10000)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_027.phpt b/ext/oci8/tests/lob_027.phpt index 51868bd8be..ec759ccb0a 100644 --- a/ext/oci8/tests/lob_027.phpt +++ b/ext/oci8/tests/lob_027.phpt @@ -3,13 +3,13 @@ oci_lob_truncate() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -61,7 +61,7 @@ var_dump($row['BLOB']->truncate(0)); oci_commit($c); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_028.phpt b/ext/oci8/tests/lob_028.phpt index e48d33fff1..2c6c77bef8 100644 --- a/ext/oci8/tests/lob_028.phpt +++ b/ext/oci8/tests/lob_028.phpt @@ -3,12 +3,12 @@ Test descriptor types for oci_new_descriptor() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Successful statements diff --git a/ext/oci8/tests/lob_029.phpt b/ext/oci8/tests/lob_029.phpt index 615c2722f2..3f25dda71a 100644 --- a/ext/oci8/tests/lob_029.phpt +++ b/ext/oci8/tests/lob_029.phpt @@ -3,7 +3,7 @@ reading/writing BFILE LOBs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ob_start(); phpinfo(INFO_MODULES); $phpinfo = ob_get_clean(); @@ -16,7 +16,7 @@ if (substr(PHP_OS, 0, 3) == 'WIN') die("skip Test script not ported to Windows") --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); $realdirname = "/tmp"; // Use /tmp because a local dir can give ORA-22288 depending on perms $realfilename1 = "oci8bfiletest1.txt"; diff --git a/ext/oci8/tests/lob_030.phpt b/ext/oci8/tests/lob_030.phpt index 014d40a2a5..39fb1304d0 100644 --- a/ext/oci8/tests/lob_030.phpt +++ b/ext/oci8/tests/lob_030.phpt @@ -3,13 +3,13 @@ Test piecewise fetch of CLOBs equal to, and larger than PHP_OCI_LOB_BUFFER_SIZE --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; function insert_verify($c, $tn, $id, $length) { @@ -57,7 +57,7 @@ insert_verify($c, $schema.$table_name, 5, 1049028-1); echo "Test 6: A CLOB of 1049028+1 bytes\n"; insert_verify($c, $schema.$table_name, 6, 1049028+1); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_031.phpt b/ext/oci8/tests/lob_031.phpt index 9916844292..52119856d6 100644 --- a/ext/oci8/tests/lob_031.phpt +++ b/ext/oci8/tests/lob_031.phpt @@ -3,13 +3,13 @@ Test LOB->read(), LOB->seek() and LOB->tell() with nul bytes in data --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -86,7 +86,7 @@ echo "15. ".$row[0]->tell(). "\n"; $row[0]->seek(-4, OCI_SEEK_END); echo "16. ".$row[0]->tell(). "\n"; -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_032.phpt b/ext/oci8/tests/lob_032.phpt index f3077997d7..989615d049 100644 --- a/ext/oci8/tests/lob_032.phpt +++ b/ext/oci8/tests/lob_032.phpt @@ -3,13 +3,13 @@ oci_lob_write() and friends --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (id, clob) @@ -26,7 +26,7 @@ oci_execute($statement, OCI_DEFAULT); oci_commit($c); // This will cause subsequent ->write() to fail $clob->write("data"); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_033.phpt b/ext/oci8/tests/lob_033.phpt index 05bafa8f58..0fa59237e5 100644 --- a/ext/oci8/tests/lob_033.phpt +++ b/ext/oci8/tests/lob_033.phpt @@ -3,13 +3,13 @@ various oci_lob_write() error messages --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (id, blob) @@ -29,7 +29,7 @@ oci_execute($statement, OCI_DEFAULT); var_dump($blob->save("")); var_dump($blob->save("data", 100)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_034.phpt b/ext/oci8/tests/lob_034.phpt index e911d343fb..da88e653d1 100644 --- a/ext/oci8/tests/lob_034.phpt +++ b/ext/oci8/tests/lob_034.phpt @@ -3,13 +3,13 @@ lob buffering - 2 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -34,7 +34,7 @@ var_dump($blob->flush(-1)); oci_commit($c); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_035.phpt b/ext/oci8/tests/lob_035.phpt index 665b760d1c..12f0644e41 100644 --- a/ext/oci8/tests/lob_035.phpt +++ b/ext/oci8/tests/lob_035.phpt @@ -3,13 +3,13 @@ oci_lob_copy() - 2 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (id, blob) @@ -77,7 +77,7 @@ oci_execute($s, OCI_DEFAULT); var_dump($row2 = oci_fetch_array($s, OCI_RETURN_LOBS)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_036.phpt b/ext/oci8/tests/lob_036.phpt index da1ce3b881..b440a4ea13 100644 --- a/ext/oci8/tests/lob_036.phpt +++ b/ext/oci8/tests/lob_036.phpt @@ -3,13 +3,13 @@ Exercise cleanup code when LOB buffering is on --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -31,7 +31,7 @@ var_dump($blob->write("test")); $blob = null; -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_037.phpt b/ext/oci8/tests/lob_037.phpt index a8c868a869..a26357615b 100644 --- a/ext/oci8/tests/lob_037.phpt +++ b/ext/oci8/tests/lob_037.phpt @@ -3,13 +3,13 @@ Fetching two different lobs and using them after fetch --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; /* insert the first LOB */ $ora_sql = "INSERT INTO @@ -58,7 +58,7 @@ $rows[1] = oci_fetch_assoc($s); var_dump($rows[0]['BLOB']->read(1000)); var_dump($rows[1]['BLOB']->read(1000)); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_038.phpt b/ext/oci8/tests/lob_038.phpt index effb466214..48749d9143 100644 --- a/ext/oci8/tests/lob_038.phpt +++ b/ext/oci8/tests/lob_038.phpt @@ -3,13 +3,13 @@ Array fetch CLOB and BLOB --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; echo "Test 1: CLOB\n"; @@ -55,11 +55,11 @@ while ($row = oci_fetch_array($s, OCI_ASSOC)) { } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Test 2: BLOB\n"; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -99,7 +99,7 @@ while ($row = oci_fetch_array($s, OCI_ASSOC)) { } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_039.phpt b/ext/oci8/tests/lob_039.phpt index db398e3976..bde7c4b2c3 100644 --- a/ext/oci8/tests/lob_039.phpt +++ b/ext/oci8/tests/lob_039.phpt @@ -3,13 +3,13 @@ Test CLOB->write() for multiple inserts --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; echo "Test 1: CLOB\n"; @@ -43,7 +43,7 @@ oci_fetch_all($s, $res); var_dump($res); -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/lob_040.phpt b/ext/oci8/tests/lob_040.phpt index 779b3b16f2..2c0d361a59 100644 --- a/ext/oci8/tests/lob_040.phpt +++ b/ext/oci8/tests/lob_040.phpt @@ -3,15 +3,15 @@ Bug #37706 (Test LOB locator reuse. Extends simple test of lob_037.phpt) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php define('NUMLOBS', 200); -require(dirname(__FILE__).'/connect.inc'); -require(dirname(__FILE__).'/create_table.inc'); +require(__DIR__.'/connect.inc'); +require(__DIR__.'/create_table.inc'); for ($i = 0; $i < NUMLOBS; $i++) { $s = oci_parse($c, "insert into ".$schema.$table_name." (id, clob) values(".$i.", '".$i."aaaa".$i.$i."aaaaaaaaaaaaaaaaaaaaaaaaaaaz')"); diff --git a/ext/oci8/tests/lob_041.phpt b/ext/oci8/tests/lob_041.phpt index 2243b978a0..dd0bfd58be 100644 --- a/ext/oci8/tests/lob_041.phpt +++ b/ext/oci8/tests/lob_041.phpt @@ -3,12 +3,12 @@ Check LOBS are valid after statement free --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/lob_042.phpt b/ext/oci8/tests/lob_042.phpt index fd87c5de75..a6d1cc9588 100644 --- a/ext/oci8/tests/lob_042.phpt +++ b/ext/oci8/tests/lob_042.phpt @@ -3,13 +3,13 @@ Check various LOB error messages --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); -require(dirname(__FILE__).'/create_table.inc'); +require(__DIR__.'/connect.inc'); +require(__DIR__.'/create_table.inc'); $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) @@ -38,7 +38,7 @@ var_dump($blob->read(2)); var_dump($blob->import("does_not_exist")); var_dump($blob->saveFile("does_not_exist")); -require(dirname(__FILE__).'/drop_table.inc'); +require(__DIR__.'/drop_table.inc'); echo "Done\n"; diff --git a/ext/oci8/tests/lob_043.phpt b/ext/oci8/tests/lob_043.phpt index b4ac8d240b..25e6870832 100644 --- a/ext/oci8/tests/lob_043.phpt +++ b/ext/oci8/tests/lob_043.phpt @@ -3,13 +3,13 @@ Bug #49560 (LOB resource destructor and refcount test) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/lob_044.phpt b/ext/oci8/tests/lob_044.phpt index 4ed661c0e6..a2007c9c4b 100644 --- a/ext/oci8/tests/lob_044.phpt +++ b/ext/oci8/tests/lob_044.phpt @@ -3,12 +3,12 @@ oci_lob_truncate() with default parameter value --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization diff --git a/ext/oci8/tests/lob_aliases.phpt b/ext/oci8/tests/lob_aliases.phpt index 8707533d63..d344557b47 100644 --- a/ext/oci8/tests/lob_aliases.phpt +++ b/ext/oci8/tests/lob_aliases.phpt @@ -3,7 +3,7 @@ LOB method aliases --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/oci8/tests/lob_null.phpt b/ext/oci8/tests/lob_null.phpt index f4dac4de7a..2543aeef81 100644 --- a/ext/oci8/tests/lob_null.phpt +++ b/ext/oci8/tests/lob_null.phpt @@ -3,12 +3,12 @@ Test null data for CLOBs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; // Initialization diff --git a/ext/oci8/tests/lob_temp.phpt b/ext/oci8/tests/lob_temp.phpt index 59db20fc13..dd74499d68 100644 --- a/ext/oci8/tests/lob_temp.phpt +++ b/ext/oci8/tests/lob_temp.phpt @@ -3,12 +3,12 @@ temporary lobs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $blob = oci_new_descriptor($c,OCI_D_LOB); var_dump($blob->writeTemporary("test")); diff --git a/ext/oci8/tests/lob_temp1.phpt b/ext/oci8/tests/lob_temp1.phpt index de1e30630a..76423c3802 100644 --- a/ext/oci8/tests/lob_temp1.phpt +++ b/ext/oci8/tests/lob_temp1.phpt @@ -3,12 +3,12 @@ closing temporary lobs --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; +require __DIR__.'/connect.inc'; $blob = oci_new_descriptor($c,OCI_D_LOB); var_dump($blob->writeTemporary("test")); diff --git a/ext/oci8/tests/lob_temp2.phpt b/ext/oci8/tests/lob_temp2.phpt index 8592fa1750..e789014d36 100644 --- a/ext/oci8/tests/lob_temp2.phpt +++ b/ext/oci8/tests/lob_temp2.phpt @@ -4,13 +4,13 @@ Writing temporary lob before binding <?php if (!extension_loaded('oci8')) die ("skip no oci8 extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); -require(dirname(__FILE__).'/create_table.inc'); +require(__DIR__.'/connect.inc'); +require(__DIR__.'/create_table.inc'); $ora_sql = "INSERT INTO ".$schema.$table_name." (clob) VALUES (:v_clob)"; diff --git a/ext/oci8/tests/null_byte_1.phpt b/ext/oci8/tests/null_byte_1.phpt index 0869d94123..61b5ecc2fe 100644 --- a/ext/oci8/tests/null_byte_1.phpt +++ b/ext/oci8/tests/null_byte_1.phpt @@ -16,7 +16,7 @@ error_reporting = E_WARNING // See http://news.php.net/php.internals/50202 // http://svn.php.net/viewvc?view=revision&revision=311870 -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/null_byte_2.phpt b/ext/oci8/tests/null_byte_2.phpt index 0bb9a38f65..e95564e322 100644 --- a/ext/oci8/tests/null_byte_2.phpt +++ b/ext/oci8/tests/null_byte_2.phpt @@ -3,7 +3,7 @@ Null bytes in SQL statements --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --INI-- display_errors = On @@ -11,7 +11,7 @@ error_reporting = E_WARNING --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/null_byte_3.phpt b/ext/oci8/tests/null_byte_3.phpt index 73d5c26c0b..f44d218aa0 100644 --- a/ext/oci8/tests/null_byte_3.phpt +++ b/ext/oci8/tests/null_byte_3.phpt @@ -8,7 +8,7 @@ error_reporting = E_WARNING --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/num.phpt b/ext/oci8/tests/num.phpt index 0fe85ccddc..d23450734f 100644 --- a/ext/oci8/tests/num.phpt +++ b/ext/oci8/tests/num.phpt @@ -5,7 +5,7 @@ oci_num_*() family --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/oci_execute_segfault.phpt b/ext/oci8/tests/oci_execute_segfault.phpt index 08a41a82ec..957318e758 100644 --- a/ext/oci8/tests/oci_execute_segfault.phpt +++ b/ext/oci8/tests/oci_execute_segfault.phpt @@ -3,13 +3,13 @@ oci_execute() segfault after repeated bind of LOB descriptor --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob, clob) @@ -38,7 +38,7 @@ while ($arr = oci_fetch_assoc($s)) { var_dump($result); } -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; diff --git a/ext/oci8/tests/old_oci_close.phpt b/ext/oci8/tests/old_oci_close.phpt index f15b7febea..bc33108faf 100644 --- a/ext/oci8/tests/old_oci_close.phpt +++ b/ext/oci8/tests/old_oci_close.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=1 --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; var_dump($c); var_dump(oci_close($c)); diff --git a/ext/oci8/tests/old_oci_close1.phpt b/ext/oci8/tests/old_oci_close1.phpt index 02b68f45c7..96d1afe8ac 100644 --- a/ext/oci8/tests/old_oci_close1.phpt +++ b/ext/oci8/tests/old_oci_close1.phpt @@ -7,7 +7,7 @@ oci8.old_oci_close_semantics=0 --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; var_dump($c); var_dump(oci_close($c)); diff --git a/ext/oci8/tests/password.phpt b/ext/oci8/tests/password.phpt index d48950efcd..b3f3bfce0c 100644 --- a/ext/oci8/tests/password.phpt +++ b/ext/oci8/tests/password.phpt @@ -3,7 +3,7 @@ oci_password_change() for non-persistent connections --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/details.inc"); +require(__DIR__."/details.inc"); if (empty($dbase)) die ("skip requires database connection string be set"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip password change not supported in DRCP Mode"); @@ -11,7 +11,7 @@ if ($test_drcp) die("skip password change not supported in DRCP Mode"); --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop user testuser_pw cascade", @@ -64,7 +64,7 @@ echo "Done\n"; --CLEAN-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop user testuser_pw cascade" diff --git a/ext/oci8/tests/password_2.phpt b/ext/oci8/tests/password_2.phpt index 62fddb4c36..b3e9e3058f 100644 --- a/ext/oci8/tests/password_2.phpt +++ b/ext/oci8/tests/password_2.phpt @@ -3,7 +3,7 @@ oci_password_change() for persistent connections --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/details.inc"); +require(__DIR__."/details.inc"); if (empty($dbase)) die ("skip requires database connection string be set"); if (strcasecmp($user, "system") && strcasecmp($user, "sys")) die("skip needs to be run as a DBA user"); if ($test_drcp) die("skip password change not supported in DRCP Mode"); @@ -11,7 +11,7 @@ if ($test_drcp) die("skip password change not supported in DRCP Mode"); --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop user testuser_pw2 cascade", @@ -63,7 +63,7 @@ echo "Done\n"; --CLEAN-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop user testuser_pw2 cascade" diff --git a/ext/oci8/tests/password_new.phpt b/ext/oci8/tests/password_new.phpt index 9977b10a7b..6e9d2f4780 100644 --- a/ext/oci8/tests/password_new.phpt +++ b/ext/oci8/tests/password_new.phpt @@ -3,8 +3,8 @@ oci_password_change() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes -require(dirname(__FILE__).'/skipif.inc'); -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/skipif.inc'); +require(__DIR__.'/connect.inc'); if (empty($dbase)) die ("skip requires database connection string be set"); if ($test_drcp) die("skip password change not supported in DRCP Mode"); @@ -33,7 +33,7 @@ if (isset($matches_sv[0]) && $matches_sv[1] >= 12) { --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $new_password = "test"; var_dump(oci_password_change($dbase, $user, $password, $new_password)); diff --git a/ext/oci8/tests/password_old.phpt b/ext/oci8/tests/password_old.phpt index b2365292a4..f791e25c3a 100644 --- a/ext/oci8/tests/password_old.phpt +++ b/ext/oci8/tests/password_old.phpt @@ -3,8 +3,8 @@ ocipasswordchange() --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes -require(dirname(__FILE__).'/skipif.inc'); -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/skipif.inc'); +require(__DIR__.'/connect.inc'); if (empty($dbase)) die ("skip requires database connection string be set"); if ($test_drcp) die("skip password change not supported in DRCP Mode"); @@ -33,7 +33,7 @@ if (isset($matches_sv[0]) && $matches_sv[1] >= 12) { --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $new_password = "test"; var_dump(ocipasswordchange($dbase, $user, $password, $new_password)); diff --git a/ext/oci8/tests/pecl_bug10194.phpt b/ext/oci8/tests/pecl_bug10194.phpt index 9ec102ad0d..c0265af34f 100644 --- a/ext/oci8/tests/pecl_bug10194.phpt +++ b/ext/oci8/tests/pecl_bug10194.phpt @@ -3,7 +3,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (getenv("USE_ZEND_ALLOC") === "0") { die("skip Zend MM disabled"); @@ -14,8 +14,8 @@ memory_limit=10M --FILE-- <?php -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (clob) @@ -46,7 +46,7 @@ oci_execute($statement); $row = oci_fetch_assoc($statement); var_dump(strlen($row['CLOB']->load())); /* here it should fail */ -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/pecl_bug10194_blob.phpt b/ext/oci8/tests/pecl_bug10194_blob.phpt index aab1cf8882..860bd5688f 100644 --- a/ext/oci8/tests/pecl_bug10194_blob.phpt +++ b/ext/oci8/tests/pecl_bug10194_blob.phpt @@ -3,7 +3,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platforms only"); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (getenv("USE_ZEND_ALLOC") === "0") { @@ -17,8 +17,8 @@ memory_limit=3M // This test is dependent on the behavior of the memory manager -require(dirname(__FILE__).'/connect.inc'); -require(dirname(__FILE__).'/create_table.inc'); +require(__DIR__.'/connect.inc'); +require(__DIR__.'/create_table.inc'); $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) VALUES (empty_blob())"; @@ -48,7 +48,7 @@ echo "Before load()\n"; $row = oci_fetch_assoc($statement); var_dump(strlen($row['BLOB']->load())); /* here it should fail */ -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/pecl_bug10194_blob_64.phpt b/ext/oci8/tests/pecl_bug10194_blob_64.phpt index ca5e568be3..bfb60f310a 100644 --- a/ext/oci8/tests/pecl_bug10194_blob_64.phpt +++ b/ext/oci8/tests/pecl_bug10194_blob_64.phpt @@ -3,7 +3,7 @@ PECL Bug #10194 (segfault in Instant Client when memory_limit is reached inside --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on thes -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request'); if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platforms only"); if (getenv("USE_ZEND_ALLOC") === "0") { @@ -17,8 +17,8 @@ memory_limit=6M // This test is dependent on the behavior of the memory manager -require dirname(__FILE__).'/connect.inc'; -require dirname(__FILE__).'/create_table.inc'; +require __DIR__.'/connect.inc'; +require __DIR__.'/create_table.inc'; $ora_sql = "INSERT INTO ".$schema.$table_name." (blob) VALUES (empty_blob())"; @@ -49,7 +49,7 @@ echo "Before load()\n"; $row = oci_fetch_assoc($statement); var_dump(strlen($row['BLOB']->load())); /* here it should fail */ -require dirname(__FILE__).'/drop_table.inc'; +require __DIR__.'/drop_table.inc'; echo "Done\n"; ?> diff --git a/ext/oci8/tests/pecl_bug16842.phpt b/ext/oci8/tests/pecl_bug16842.phpt index 52c6df8e33..c4a3fc2650 100644 --- a/ext/oci8/tests/pecl_bug16842.phpt +++ b/ext/oci8/tests/pecl_bug16842.phpt @@ -3,14 +3,14 @@ PECL Bug #16842 (NO_DATA_FOUND exception is a warning) --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --INI-- error_reporting = E_WARNING --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/pecl_bug6109.phpt b/ext/oci8/tests/pecl_bug6109.phpt index d0762fa883..f5cee7065d 100644 --- a/ext/oci8/tests/pecl_bug6109.phpt +++ b/ext/oci8/tests/pecl_bug6109.phpt @@ -5,7 +5,7 @@ PECL Bug #6109 (Error messages not kept) --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Run Test diff --git a/ext/oci8/tests/pecl_bug8816.phpt b/ext/oci8/tests/pecl_bug8816.phpt index 9e151f6a8c..30b76265dc 100644 --- a/ext/oci8/tests/pecl_bug8816.phpt +++ b/ext/oci8/tests/pecl_bug8816.phpt @@ -3,12 +3,12 @@ PECL Bug #8816 (issue in php_oci_statement_fetch with more than one piecewise co --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $create_1 = "CREATE TABLE t1 (id INTEGER, l1 LONG)"; $create_2 = "CREATE TABLE t2 (id INTEGER, l2 LONG)"; diff --git a/ext/oci8/tests/persistent.phpt b/ext/oci8/tests/persistent.phpt index 1bdfc3c90f..a89f3967e7 100644 --- a/ext/oci8/tests/persistent.phpt +++ b/ext/oci8/tests/persistent.phpt @@ -5,7 +5,7 @@ reusing persistent connections --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; var_dump(oci_pconnect($user, $password, $dbase)); var_dump(oci_pconnect($user, $password, $dbase)); diff --git a/ext/oci8/tests/prefetch.phpt b/ext/oci8/tests/prefetch.phpt index b163a89e94..fa71b5ac6a 100644 --- a/ext/oci8/tests/prefetch.phpt +++ b/ext/oci8/tests/prefetch.phpt @@ -5,7 +5,7 @@ oci_set_prefetch() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialize diff --git a/ext/oci8/tests/prefetch_old.phpt b/ext/oci8/tests/prefetch_old.phpt index 7f50993a64..58bdae7565 100644 --- a/ext/oci8/tests/prefetch_old.phpt +++ b/ext/oci8/tests/prefetch_old.phpt @@ -5,7 +5,7 @@ ocisetprefetch() --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); $stmtarray = array( "drop table prefetch_old_tab", diff --git a/ext/oci8/tests/privileged_connect.phpt b/ext/oci8/tests/privileged_connect.phpt index cb19d73907..5d9fbb0a45 100644 --- a/ext/oci8/tests/privileged_connect.phpt +++ b/ext/oci8/tests/privileged_connect.phpt @@ -5,7 +5,7 @@ privileged connect tests --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; oci_connect("", "", "", false, OCI_SYSOPER); oci_connect("", "", "", false, OCI_SYSDBA); diff --git a/ext/oci8/tests/privileged_connect1.phpt b/ext/oci8/tests/privileged_connect1.phpt index a4b8b76ba7..181dba5f1d 100644 --- a/ext/oci8/tests/privileged_connect1.phpt +++ b/ext/oci8/tests/privileged_connect1.phpt @@ -7,7 +7,7 @@ oci8.privileged_connect=1 --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; oci_connect("", "", "", false, OCI_SYSOPER); oci_connect("", "", "", false, OCI_SYSDBA); diff --git a/ext/oci8/tests/refcur_prefetch_1.phpt b/ext/oci8/tests/refcur_prefetch_1.phpt index 97fc7dce20..1f00b9b031 100644 --- a/ext/oci8/tests/refcur_prefetch_1.phpt +++ b/ext/oci8/tests/refcur_prefetch_1.phpt @@ -3,7 +3,7 @@ Prefetch with REF cursor. Test different values for prefetch with oci_set_prefet --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && ($matches[1] >= 10))) { @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Creates the necessary package and tables. $stmtarray = array( diff --git a/ext/oci8/tests/refcur_prefetch_2.phpt b/ext/oci8/tests/refcur_prefetch_2.phpt index 586aece8f0..10f0764a7a 100644 --- a/ext/oci8/tests/refcur_prefetch_2.phpt +++ b/ext/oci8/tests/refcur_prefetch_2.phpt @@ -3,7 +3,7 @@ Prefetch with REF cursor. Test No 2 --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && ($matches[1] >= 10))) { @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; // Creates the necessary package and tables. $stmtarray = array( diff --git a/ext/oci8/tests/refcur_prefetch_3.phpt b/ext/oci8/tests/refcur_prefetch_3.phpt index 8129fb2ec9..bfc2faf5bf 100644 --- a/ext/oci8/tests/refcur_prefetch_3.phpt +++ b/ext/oci8/tests/refcur_prefetch_3.phpt @@ -5,7 +5,7 @@ oci8.default_prefetch=5 --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && (($matches[1] == 11 && $matches[2] >= 2) || @@ -23,7 +23,7 @@ if (!(isset($matches[0]) && ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; //Create tables here $stmtarray = array( diff --git a/ext/oci8/tests/refcur_prefetch_4.phpt b/ext/oci8/tests/refcur_prefetch_4.phpt index 8ec4c983a3..8aee48cfee 100644 --- a/ext/oci8/tests/refcur_prefetch_4.phpt +++ b/ext/oci8/tests/refcur_prefetch_4.phpt @@ -3,7 +3,7 @@ Prefetch with REF cursor. Test No 4 --SKIPIF-- <?php if (!extension_loaded('oci8')) die("skip no oci8 extension"); if (!extension_loaded('oci8')) die("skip no oci8 extension"); -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); preg_match('/.*Release ([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)*/', oci_server_version($c), $matches); if (!(isset($matches[0]) && ($matches[1] >= 10))) { @@ -19,7 +19,7 @@ if (!(isset($matches[0]) && ?> --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; // Creates the necessary package and tables. $stmtarray = array( diff --git a/ext/oci8/tests/select_null.phpt b/ext/oci8/tests/select_null.phpt index 23e5923b8e..a6f0c645d7 100644 --- a/ext/oci8/tests/select_null.phpt +++ b/ext/oci8/tests/select_null.phpt @@ -5,7 +5,7 @@ SELECTing NULL values --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $pc = oci_pconnect($user, $password, $dbase); diff --git a/ext/oci8/tests/serverversion.phpt b/ext/oci8/tests/serverversion.phpt index 1c4b7d7d26..2667cc5539 100644 --- a/ext/oci8/tests/serverversion.phpt +++ b/ext/oci8/tests/serverversion.phpt @@ -5,7 +5,7 @@ oci_server_version() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump($c = oci_connect($user, $password, $dbase)); diff --git a/ext/oci8/tests/statement_cache.phpt b/ext/oci8/tests/statement_cache.phpt index 8ab9ddc8c1..78d1b57c89 100644 --- a/ext/oci8/tests/statement_cache.phpt +++ b/ext/oci8/tests/statement_cache.phpt @@ -3,14 +3,14 @@ statement cache --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => true); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php // Note: with TimesTen, the column will be called "EXP" -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $pc = oci_pconnect($user, $password, $dbase); diff --git a/ext/oci8/tests/statement_type.phpt b/ext/oci8/tests/statement_type.phpt index ed71240a95..e294cac60e 100644 --- a/ext/oci8/tests/statement_type.phpt +++ b/ext/oci8/tests/statement_type.phpt @@ -5,7 +5,7 @@ oci_statement_type() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $sqls = Array( "SELECT * FROM table", diff --git a/ext/oci8/tests/statement_type_old.phpt b/ext/oci8/tests/statement_type_old.phpt index 2626d6203c..aa0565e27b 100644 --- a/ext/oci8/tests/statement_type_old.phpt +++ b/ext/oci8/tests/statement_type_old.phpt @@ -5,7 +5,7 @@ ocistatementtype() --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; if (!empty($dbase)) { var_dump($c = ocilogon($user, $password, $dbase)); diff --git a/ext/oci8/tests/testping.phpt b/ext/oci8/tests/testping.phpt index 720ba8d071..2c64c440d7 100644 --- a/ext/oci8/tests/testping.phpt +++ b/ext/oci8/tests/testping.phpt @@ -7,7 +7,7 @@ oci8.ping_interval=0 --FILE-- <?php -require(dirname(__FILE__).'/details.inc'); +require(__DIR__.'/details.inc'); for ($i = 0; $i < 2; $i++) { if (!empty($dbase)) { diff --git a/ext/oci8/tests/uncommitted.phpt b/ext/oci8/tests/uncommitted.phpt index cb90e4a514..c8e8a8d581 100644 --- a/ext/oci8/tests/uncommitted.phpt +++ b/ext/oci8/tests/uncommitted.phpt @@ -5,7 +5,7 @@ uncommitted connection --FILE-- <?php -require dirname(__FILE__)."/connect.inc"; +require __DIR__."/connect.inc"; $stmt = oci_parse($c, "select 1 from dual"); oci_execute($stmt, OCI_DEFAULT); diff --git a/ext/oci8/tests/xmltype_01.phpt b/ext/oci8/tests/xmltype_01.phpt index 8fb6206f26..debbe14f83 100644 --- a/ext/oci8/tests/xmltype_01.phpt +++ b/ext/oci8/tests/xmltype_01.phpt @@ -4,12 +4,12 @@ Basic XMLType test <?php if (!extension_loaded("simplexml")) die("skip no simplexml extension"); $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); ?> --FILE-- <?php -require(dirname(__FILE__)."/connect.inc"); +require(__DIR__."/connect.inc"); // Initialization diff --git a/ext/oci8/tests/xmltype_02.phpt b/ext/oci8/tests/xmltype_02.phpt index a21e5e47ef..35f8750255 100644 --- a/ext/oci8/tests/xmltype_02.phpt +++ b/ext/oci8/tests/xmltype_02.phpt @@ -3,13 +3,13 @@ Basic XMLType test #2 --SKIPIF-- <?php $target_dbs = array('oracledb' => true, 'timesten' => false); // test runs on these DBs -require(dirname(__FILE__).'/skipif.inc'); +require(__DIR__.'/skipif.inc'); if (!extension_loaded("simplexml")) die ("skip no simplexml extension"); ?> --FILE-- <?php -require(dirname(__FILE__).'/connect.inc'); +require(__DIR__.'/connect.inc'); // Initialization |