diff options
Diffstat (limited to 'ext/dba')
62 files changed, 193 insertions, 193 deletions
diff --git a/ext/dba/tests/bug36436.phpt b/ext/dba/tests/bug36436.phpt index 40cc5283cd..fa1d6140f6 100644 --- a/ext/dba/tests/bug36436.phpt +++ b/ext/dba/tests/bug36436.phpt @@ -3,13 +3,13 @@ Bug #36436 (DBA problem with Berkeley DB4) --SKIPIF-- <?php $handler = 'db4'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = 'db4'; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); $db = dba_popen($db_filename, 'c', 'db4'); @@ -27,7 +27,7 @@ dba_close($db); ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- resource(%d) of type (dba persistent) diff --git a/ext/dba/tests/bug38698.phpt b/ext/dba/tests/bug38698.phpt index 254d3e37c6..6ace7c02aa 100644 --- a/ext/dba/tests/bug38698.phpt +++ b/ext/dba/tests/bug38698.phpt @@ -3,7 +3,7 @@ Bug #38698 (Bug #38698 for some keys cdbmake creates corrupted db and cdb can't --SKIPIF-- <?php $handler = 'cdb_make'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php @@ -12,7 +12,7 @@ function isLittleEndian() { return 0x00FF === current(unpack('v', pack('S',0x00FF))); } -$db_file = dirname(__FILE__) .'/129php.cdb'; +$db_file = __DIR__ .'/129php.cdb'; if (($db_make=dba_open($db_file, "n", 'cdb_make'))!==FALSE) { if (isLittleEndian() === FALSE) { diff --git a/ext/dba/tests/bug48240.phpt b/ext/dba/tests/bug48240.phpt index 547c7a9ccc..75e70da965 100644 --- a/ext/dba/tests/bug48240.phpt +++ b/ext/dba/tests/bug48240.phpt @@ -3,13 +3,13 @@ Bug #48240 (DBA Segmentation fault dba_nextkey) --SKIPIF-- <?php $handler = 'db4'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = 'db4'; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); $db = dba_open($db_filename, 'c', 'db4'); @@ -21,7 +21,7 @@ dba_close($db); ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- bool(false) diff --git a/ext/dba/tests/bug49125.phpt b/ext/dba/tests/bug49125.phpt index c1ecc50846..70f59c97c9 100644 --- a/ext/dba/tests/bug49125.phpt +++ b/ext/dba/tests/bug49125.phpt @@ -3,7 +3,7 @@ Bug #49125 (Error in dba_exists C code) --SKIPIF-- <?php $handler = 'db4'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php @@ -11,7 +11,7 @@ Bug #49125 (Error in dba_exists C code) error_reporting(E_ALL); $handler = 'db4'; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); $db = dba_popen($db_filename, 'c', 'db4'); @@ -24,7 +24,7 @@ dba_close($db); ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- bool(true) diff --git a/ext/dba/tests/bug65708.phpt b/ext/dba/tests/bug65708.phpt index ede2511c9e..8bec60a543 100644 --- a/ext/dba/tests/bug65708.phpt +++ b/ext/dba/tests/bug65708.phpt @@ -2,14 +2,14 @@ Bug #65708 (dba functions cast $key param to string in-place, bypassing copy on write) --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php error_reporting(E_ALL); -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); $db = dba_popen($db_filename, 'c'); @@ -29,7 +29,7 @@ dba_close($db); ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- integer diff --git a/ext/dba/tests/bug72157.phpt b/ext/dba/tests/bug72157.phpt index 3443f4bb40..71fa8730b8 100644 --- a/ext/dba/tests/bug72157.phpt +++ b/ext/dba/tests/bug72157.phpt @@ -2,7 +2,7 @@ Bug #72157 (use-after-free caused by dba_open) --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/dba/tests/bug72885.phpt b/ext/dba/tests/bug72885.phpt index bef95fd5c8..f8bcc7e7ab 100644 --- a/ext/dba/tests/bug72885.phpt +++ b/ext/dba/tests/bug72885.phpt @@ -3,12 +3,12 @@ Bug #72885 flatfile: dba_fetch() fails to read replaced entry --SKIPIF-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); $db = dba_open($db_filename, 'c', 'flatfile'); dba_insert('foo', 'bar', $db); @@ -20,7 +20,7 @@ dba_close($db); ===DONE=== --CLEAN-- <?php -require_once(dirname(__FILE__) .'/clean.inc'); +require_once(__DIR__ .'/clean.inc'); ?> --EXPECT-- bool(true) diff --git a/ext/dba/tests/dba001.phpt b/ext/dba/tests/dba001.phpt index e5a8f58f85..836d03da74 100644 --- a/ext/dba/tests/dba001.phpt +++ b/ext/dba/tests/dba001.phpt @@ -2,12 +2,12 @@ DBA File Creation Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { echo "database file created\n"; @@ -18,7 +18,7 @@ DBA File Creation Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba002.phpt b/ext/dba/tests/dba002.phpt index 051c51b9b5..73b2d42df9 100644 --- a/ext/dba/tests/dba002.phpt +++ b/ext/dba/tests/dba002.phpt @@ -2,12 +2,12 @@ DBA Insert/Fetch Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("key1", "This is a test insert", $db_file); @@ -19,7 +19,7 @@ DBA Insert/Fetch Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba003.phpt b/ext/dba/tests/dba003.phpt index 6d1e26bfac..af73282c9f 100644 --- a/ext/dba/tests/dba003.phpt +++ b/ext/dba/tests/dba003.phpt @@ -2,12 +2,12 @@ DBA Insert/Replace/Fetch Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("key1", "This is a test insert", $db_file); @@ -21,7 +21,7 @@ DBA Insert/Replace/Fetch Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba004.phpt b/ext/dba/tests/dba004.phpt index 69bc717ea4..c197d761d4 100644 --- a/ext/dba/tests/dba004.phpt +++ b/ext/dba/tests/dba004.phpt @@ -2,12 +2,12 @@ DBA Multiple Insert/Fetch Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -25,7 +25,7 @@ DBA Multiple Insert/Fetch Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba005.phpt b/ext/dba/tests/dba005.phpt index 4e43beab19..5173283755 100644 --- a/ext/dba/tests/dba005.phpt +++ b/ext/dba/tests/dba005.phpt @@ -2,12 +2,12 @@ DBA FirstKey/NextKey Loop Test With 5 Items --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -32,7 +32,7 @@ DBA FirstKey/NextKey Loop Test With 5 Items ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba006.phpt b/ext/dba/tests/dba006.phpt index 7f359a2fd8..84814f2bcf 100644 --- a/ext/dba/tests/dba006.phpt +++ b/ext/dba/tests/dba006.phpt @@ -2,12 +2,12 @@ DBA FirstKey/NextKey with 2 deletes --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -34,7 +34,7 @@ DBA FirstKey/NextKey with 2 deletes ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba007.phpt b/ext/dba/tests/dba007.phpt index fbd78212f2..7c8e2b0bd4 100644 --- a/ext/dba/tests/dba007.phpt +++ b/ext/dba/tests/dba007.phpt @@ -2,16 +2,16 @@ DBA Multiple File Creation Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); if (!function_exists('dba_list')) die('skip dba_list() not available'); die("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; - $db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; - $db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; + $db_file1 = $db_filename1 = __DIR__.'/test1.dbm'; + $db_file2 = $db_filename2 = __DIR__.'/test2.dbm'; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { echo "database file created\n"; } else { @@ -35,7 +35,7 @@ DBA Multiple File Creation Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba009.phpt b/ext/dba/tests/dba009.phpt index 3da48b0cc7..d1d612243b 100644 --- a/ext/dba/tests/dba009.phpt +++ b/ext/dba/tests/dba009.phpt @@ -2,12 +2,12 @@ DBA dba_popen Test --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); print("info $HND handler used"); ?> --FILE-- <?php - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db=dba_popen($db_file, "n", $handler))!==FALSE) { echo "Opened\n"; @@ -26,7 +26,7 @@ DBA dba_popen Test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba010.phpt b/ext/dba/tests/dba010.phpt index d411c56adb..f5cb08871a 100644 --- a/ext/dba/tests/dba010.phpt +++ b/ext/dba/tests/dba010.phpt @@ -2,12 +2,12 @@ DBA with array keys --SKIPIF-- <?php - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert(array("", "name0") , "Content String 1", $db_file); @@ -37,7 +37,7 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba011.phpt b/ext/dba/tests/dba011.phpt index 1642587a43..1a4742c618 100644 --- a/ext/dba/tests/dba011.phpt +++ b/ext/dba/tests/dba011.phpt @@ -2,12 +2,12 @@ DBA argument tests --SKIPIF-- <?php -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; var_dump(dba_open($db_file, 'n')); var_dump(dba_open($db_file, 'n', 'bogus')); @@ -17,7 +17,7 @@ var_dump(dba_open($db_file, 'n', $handler, 2, 3, 4, 5, 6, 7, 8)); ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba012.phpt b/ext/dba/tests/dba012.phpt index 612d543249..022ca03fc3 100644 --- a/ext/dba/tests/dba012.phpt +++ b/ext/dba/tests/dba012.phpt @@ -3,14 +3,14 @@ DBA dba.default_handler tests --SKIPIF-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); ?> --INI-- dba.default_handler=flatfile --FILE-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; echo "Test 1\n"; @@ -28,7 +28,7 @@ var_dump(dba_open($db_filename, 'n')); ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba013.phpt b/ext/dba/tests/dba013.phpt index 661275c07d..8a446cf9a8 100644 --- a/ext/dba/tests/dba013.phpt +++ b/ext/dba/tests/dba013.phpt @@ -2,12 +2,12 @@ DBA with array key with empty array --SKIPIF-- <?php -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { @@ -19,7 +19,7 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba014.phpt b/ext/dba/tests/dba014.phpt index 799fe830a5..410c3af3c1 100644 --- a/ext/dba/tests/dba014.phpt +++ b/ext/dba/tests/dba014.phpt @@ -2,12 +2,12 @@ DBA with array key with array containing too many elements --SKIPIF-- <?php -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { @@ -19,7 +19,7 @@ if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: %s diff --git a/ext/dba/tests/dba015.phpt b/ext/dba/tests/dba015.phpt index 4cd0ea101a..7d268cbe20 100644 --- a/ext/dba/tests/dba015.phpt +++ b/ext/dba/tests/dba015.phpt @@ -3,14 +3,14 @@ DBA with persistent connections --SKIPIF-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; echo "Test 1\n"; @@ -51,7 +51,7 @@ echo dba_fetch("key2", $db_file1), "\n"; ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba016.phpt b/ext/dba/tests/dba016.phpt index 4b0052352a..60bf4da4bf 100644 --- a/ext/dba/tests/dba016.phpt +++ b/ext/dba/tests/dba016.phpt @@ -3,13 +3,13 @@ DBA lock modifier error message test --SKIPIF-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = "flatfile"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile'); @@ -18,7 +18,7 @@ $db_file1 = dba_popen($db_filename, 'n-t', 'flatfile'); ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_cdb.phpt b/ext/dba/tests/dba_cdb.phpt index 998fc41638..87e9992179 100644 --- a/ext/dba/tests/dba_cdb.phpt +++ b/ext/dba/tests/dba_cdb.phpt @@ -3,19 +3,19 @@ DBA CDB handler test --SKIPIF-- <?php $handler = 'cdb'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die('info CDB does not support replace or delete'); ?> --FILE-- <?php $handler = 'cdb'; - require_once(dirname(__FILE__) .'/test.inc'); - require_once(dirname(__FILE__) .'/dba_handler.inc'); + require_once(__DIR__ .'/test.inc'); + require_once(__DIR__ .'/dba_handler.inc'); ?> ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: cdb diff --git a/ext/dba/tests/dba_cdb_001.phpt b/ext/dba/tests/dba_cdb_001.phpt index a0dc438636..82a1c0b585 100644 --- a/ext/dba/tests/dba_cdb_001.phpt +++ b/ext/dba/tests/dba_cdb_001.phpt @@ -3,14 +3,14 @@ DBA CDB handler test --SKIPIF-- <?php $handler = 'cdb'; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die('info CDB does not support replace or delete'); ?> --FILE-- <?php $handler = 'cdb'; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "Test 0\n"; @@ -64,7 +64,7 @@ else { ===DONE=== --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- Test 0 diff --git a/ext/dba/tests/dba_cdb_make.phpt b/ext/dba/tests/dba_cdb_make.phpt index 0a1fd79b36..33fcd6ea47 100644 --- a/ext/dba/tests/dba_cdb_make.phpt +++ b/ext/dba/tests/dba_cdb_make.phpt @@ -3,16 +3,16 @@ DBA CDB_MAKE handler test --SKIPIF-- <?php $handler = 'cdb_make'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); die('info CDB_MAKE does not support reading'); ?> --FILE-- <?php $handler = 'cdb_make'; - require_once(dirname(__FILE__) .'/test.inc'); + require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; // print md5 checksum of test.cdb which is generated by cdb_make program - var_dump(md5_file(dirname(__FILE__).'/test.cdb')); + var_dump(md5_file(__DIR__.'/test.cdb')); if (($db_make=dba_open($db_file, "n", $handler))!==FALSE) { dba_insert("1", "1", $db_make); dba_insert("2", "2", $db_make); @@ -32,7 +32,7 @@ DBA CDB_MAKE handler test ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: cdb_make diff --git a/ext/dba/tests/dba_cdb_read.phpt b/ext/dba/tests/dba_cdb_read.phpt index 9d65f8b732..91ca6e9853 100644 --- a/ext/dba/tests/dba_cdb_read.phpt +++ b/ext/dba/tests/dba_cdb_read.phpt @@ -3,13 +3,13 @@ DBA CDB handler test (read only) --SKIPIF-- <?php $handler = 'cdb_make'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php echo "database handler: cdb\n"; $handler = 'cdb'; - $db_file = dirname(__FILE__).'/test.cdb'; + $db_file = __DIR__.'/test.cdb'; if (($db_file=dba_open($db_file, "r", $handler))!==FALSE) { // read key sequence $a = dba_firstkey($db_file); diff --git a/ext/dba/tests/dba_db1.phpt b/ext/dba/tests/dba_db1.phpt index 01d96feec5..c378aaf3c2 100644 --- a/ext/dba/tests/dba_db1.phpt +++ b/ext/dba/tests/dba_db1.phpt @@ -3,13 +3,13 @@ DBA DB1 handler test --SKIPIF-- <?php $handler = 'db1'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'db1'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --EXPECT-- diff --git a/ext/dba/tests/dba_db2.phpt b/ext/dba/tests/dba_db2.phpt index 09fefb581e..8662189cbd 100644 --- a/ext/dba/tests/dba_db2.phpt +++ b/ext/dba/tests/dba_db2.phpt @@ -3,13 +3,13 @@ DBA DB2 handler test --SKIPIF-- <?php $handler = 'db2'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'db2'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --EXPECT-- diff --git a/ext/dba/tests/dba_db3.phpt b/ext/dba/tests/dba_db3.phpt index 9c78eb3726..670680cb8a 100644 --- a/ext/dba/tests/dba_db3.phpt +++ b/ext/dba/tests/dba_db3.phpt @@ -3,13 +3,13 @@ DBA DB3 handler test --SKIPIF-- <?php $handler = 'db3'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'db3'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --EXPECT-- diff --git a/ext/dba/tests/dba_db4_000.phpt b/ext/dba/tests/dba_db4_000.phpt index 21e4a18394..afeedff47c 100644 --- a/ext/dba/tests/dba_db4_000.phpt +++ b/ext/dba/tests/dba_db4_000.phpt @@ -3,18 +3,18 @@ DBA DB4 handler test --SKIPIF-- <?php $handler = 'db4'; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = 'db4'; -require_once(dirname(__FILE__) .'/test.inc'); -require_once(dirname(__FILE__) .'/dba_handler.inc'); +require_once(__DIR__ .'/test.inc'); +require_once(__DIR__ .'/dba_handler.inc'); ?> ===DONE=== --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_001.phpt b/ext/dba/tests/dba_db4_001.phpt index 73b5da75c3..c7a851f3ef 100644 --- a/ext/dba/tests/dba_db4_001.phpt +++ b/ext/dba/tests/dba_db4_001.phpt @@ -3,14 +3,14 @@ DBA DB4 New File Creation open("c") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_open($db_filename, "c", $handler)) !== FALSE) { echo "database file created\n"; @@ -24,7 +24,7 @@ if (($db_file = dba_open($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_002.phpt b/ext/dba/tests/dba_db4_002.phpt index 1ab3117b6e..d37e55b855 100644 --- a/ext/dba/tests/dba_db4_002.phpt +++ b/ext/dba/tests/dba_db4_002.phpt @@ -3,14 +3,14 @@ DBA DB4 New File Creation open("n") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { echo "database file created\n"; @@ -24,7 +24,7 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_003.phpt b/ext/dba/tests/dba_db4_003.phpt index 5690bd9250..7bb664a9dc 100644 --- a/ext/dba/tests/dba_db4_003.phpt +++ b/ext/dba/tests/dba_db4_003.phpt @@ -3,14 +3,14 @@ DBA DB4 File Creation open("c") with existing file --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; var_dump(file_put_contents($db_filename, "Dummy contents")); @@ -33,7 +33,7 @@ echo "$s\n"; ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_004.phpt b/ext/dba/tests/dba_db4_004.phpt index dd89f2d062..7e0445fb74 100644 --- a/ext/dba/tests/dba_db4_004.phpt +++ b/ext/dba/tests/dba_db4_004.phpt @@ -3,14 +3,14 @@ DBA DB4 Truncate Existing File open("n") --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; var_dump(file_put_contents($db_filename, "Dummy contents")); @@ -31,7 +31,7 @@ if (($db_file = dba_open($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_005.phpt b/ext/dba/tests/dba_db4_005.phpt index f0cf858e9a..7240e6e56a 100644 --- a/ext/dba/tests/dba_db4_005.phpt +++ b/ext/dba/tests/dba_db4_005.phpt @@ -3,14 +3,14 @@ DBA DB4 New File Creation popen("c") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { echo "database file created\n"; @@ -24,7 +24,7 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_006.phpt b/ext/dba/tests/dba_db4_006.phpt index 7823922a9f..75694141d4 100644 --- a/ext/dba/tests/dba_db4_006.phpt +++ b/ext/dba/tests/dba_db4_006.phpt @@ -3,14 +3,14 @@ DBA DB4 New File Creation popen("n") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { echo "database file created\n"; @@ -24,7 +24,7 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_007.phpt b/ext/dba/tests/dba_db4_007.phpt index 193d2ed341..bfa67dd5d6 100644 --- a/ext/dba/tests/dba_db4_007.phpt +++ b/ext/dba/tests/dba_db4_007.phpt @@ -3,14 +3,14 @@ DBA DB4 File Creation popen("c") with existing invalid file --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; var_dump(file_put_contents($db_filename, "Dummy contents")); @@ -29,7 +29,7 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_008.phpt b/ext/dba/tests/dba_db4_008.phpt index e5a9467555..457818c929 100644 --- a/ext/dba/tests/dba_db4_008.phpt +++ b/ext/dba/tests/dba_db4_008.phpt @@ -3,14 +3,14 @@ DBA DB4 Truncate Existing File popen("n") --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; var_dump(file_put_contents($db_filename, "Dummy contents")); @@ -31,7 +31,7 @@ if (($db_file = dba_popen($db_filename, "n", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_009.phpt b/ext/dba/tests/dba_db4_009.phpt index 8069c84bf8..48d7f3a30f 100644 --- a/ext/dba/tests/dba_db4_009.phpt +++ b/ext/dba/tests/dba_db4_009.phpt @@ -3,16 +3,16 @@ DBA DB4 Multiple File Creation Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; -$db_file1 = $db_filename1 = dirname(__FILE__).'/test1.dbm'; -$db_file2 = $db_filename2 = dirname(__FILE__).'/test2.dbm'; +$db_file1 = $db_filename1 = __DIR__.'/test1.dbm'; +$db_file2 = $db_filename2 = __DIR__.'/test2.dbm'; if (($db_file=dba_open($db_file, "n", $handler))!==FALSE) { echo "database file created\n"; } else { @@ -36,7 +36,7 @@ dba_close($db_file); ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_011.phpt b/ext/dba/tests/dba_db4_011.phpt index cdd57bc5ca..311bdf29f1 100644 --- a/ext/dba/tests/dba_db4_011.phpt +++ b/ext/dba/tests/dba_db4_011.phpt @@ -3,13 +3,13 @@ DBA DB4 with repeated key --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_filename, "c", $handler))!==FALSE) { var_dump(dba_insert("key1", "Content String 1", $db_file)); @@ -25,7 +25,7 @@ if (($db_file=dba_open($db_filename, "c", $handler))!==FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_012.phpt b/ext/dba/tests/dba_db4_012.phpt index e626ba0c11..09a9b0da1c 100644 --- a/ext/dba/tests/dba_db4_012.phpt +++ b/ext/dba/tests/dba_db4_012.phpt @@ -3,14 +3,14 @@ DBA DB4 New File Creation open("rl") --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_open($db_filename, "rl", $handler)) !== FALSE) { echo "database file created\n"; @@ -22,7 +22,7 @@ if (($db_file = dba_open($db_filename, "rl", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_013.phpt b/ext/dba/tests/dba_db4_013.phpt index 133f90f88a..f107dd8574 100644 --- a/ext/dba/tests/dba_db4_013.phpt +++ b/ext/dba/tests/dba_db4_013.phpt @@ -3,14 +3,14 @@ DBA DB4 File open("rl") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { @@ -30,7 +30,7 @@ if (($db_file = dba_popen($db_filename, "rl", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_014.phpt b/ext/dba/tests/dba_db4_014.phpt index 38d272dd28..6b6b9b2ed3 100644 --- a/ext/dba/tests/dba_db4_014.phpt +++ b/ext/dba/tests/dba_db4_014.phpt @@ -3,14 +3,14 @@ DBA DB4 File open("wl") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_open($db_filename, "wl", $handler)) !== FALSE) { @@ -23,7 +23,7 @@ if (($db_file = dba_open($db_filename, "wl", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_015.phpt b/ext/dba/tests/dba_db4_015.phpt index 0bd79ed7f5..a99b984cde 100644 --- a/ext/dba/tests/dba_db4_015.phpt +++ b/ext/dba/tests/dba_db4_015.phpt @@ -3,14 +3,14 @@ DBA DB4 File open("wl") & Insert Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { @@ -30,7 +30,7 @@ if (($db_file = dba_popen($db_filename, "wl", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_016.phpt b/ext/dba/tests/dba_db4_016.phpt index 618fc868e5..3e1eb87262 100644 --- a/ext/dba/tests/dba_db4_016.phpt +++ b/ext/dba/tests/dba_db4_016.phpt @@ -3,14 +3,14 @@ DBA DB4 File Creation popen("c") with existing valid file --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { @@ -45,7 +45,7 @@ if (($db_file = dba_popen($db_filename, "c", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_017.phpt b/ext/dba/tests/dba_db4_017.phpt index 8a2dbdd9ff..04ad544a78 100644 --- a/ext/dba/tests/dba_db4_017.phpt +++ b/ext/dba/tests/dba_db4_017.phpt @@ -3,13 +3,13 @@ DBA DB4 file creation dba_open("cd") --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file = dba_open($db_filename, "cd", $handler)) !== FALSE) { @@ -28,7 +28,7 @@ if (($db_file = dba_open($db_filename, "cd", $handler)) !== FALSE) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_018.phpt b/ext/dba/tests/dba_db4_018.phpt index fb696e9f5f..e4b4cfcf27 100644 --- a/ext/dba/tests/dba_db4_018.phpt +++ b/ext/dba/tests/dba_db4_018.phpt @@ -3,14 +3,14 @@ DBA DB4 with persistent connections --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; echo "Test 1\n"; @@ -51,7 +51,7 @@ echo dba_fetch("key2", $db_file1), "\n"; ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --XFAIL-- Test 6 crashes with dba pointer of NULL, bug http://bugs.php.net/bug.php?id=51278 diff --git a/ext/dba/tests/dba_db4_handlers.phpt b/ext/dba/tests/dba_db4_handlers.phpt index 41c397bdf4..92f93ad4a6 100644 --- a/ext/dba/tests/dba_db4_handlers.phpt +++ b/ext/dba/tests/dba_db4_handlers.phpt @@ -3,13 +3,13 @@ DBA DB4 Handler Test --SKIPIF-- <?php $handler="db4"; -require(dirname(__FILE__) .'/skipif.inc'); +require(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler="db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; function check($h) @@ -40,7 +40,7 @@ foreach ($h as $key => $val) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTREGEX-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_optimize.phpt b/ext/dba/tests/dba_db4_optimize.phpt index e8b5d6bb65..8a039b7152 100644 --- a/ext/dba/tests/dba_db4_optimize.phpt +++ b/ext/dba/tests/dba_db4_optimize.phpt @@ -3,13 +3,13 @@ DBA DB4 Optimize Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -29,7 +29,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php exit(0); ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_db4_sync.phpt b/ext/dba/tests/dba_db4_sync.phpt index a72aed4e71..e659333907 100644 --- a/ext/dba/tests/dba_db4_sync.phpt +++ b/ext/dba/tests/dba_db4_sync.phpt @@ -3,13 +3,13 @@ DBA DB4 Sync Test --SKIPIF-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/skipif.inc'); +require_once(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler = "db4"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -29,7 +29,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php exit(0); ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: db4 diff --git a/ext/dba/tests/dba_dbm.phpt b/ext/dba/tests/dba_dbm.phpt index 26ea91f9f2..39f0a99fae 100644 --- a/ext/dba/tests/dba_dbm.phpt +++ b/ext/dba/tests/dba_dbm.phpt @@ -3,18 +3,18 @@ DBA DBM handler test --SKIPIF-- <?php $handler = 'dbm'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'dbm'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: dbm diff --git a/ext/dba/tests/dba_flatfile.phpt b/ext/dba/tests/dba_flatfile.phpt index c6064239c6..4fcaafe32d 100644 --- a/ext/dba/tests/dba_flatfile.phpt +++ b/ext/dba/tests/dba_flatfile.phpt @@ -3,18 +3,18 @@ DBA FlatFile handler test --SKIPIF-- <?php $handler = 'flatfile'; - require_once(dirname(__FILE__) .'/skipif.inc'); + require_once(__DIR__ .'/skipif.inc'); ?> --FILE-- <?php $handler = 'flatfile'; - require_once(dirname(__FILE__) .'/test.inc'); - require_once(dirname(__FILE__) .'/dba_handler.inc'); + require_once(__DIR__ .'/test.inc'); + require_once(__DIR__ .'/dba_handler.inc'); ?> ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: flatfile diff --git a/ext/dba/tests/dba_gdbm.phpt b/ext/dba/tests/dba_gdbm.phpt index 18ee455e4d..8ca2adfe04 100644 --- a/ext/dba/tests/dba_gdbm.phpt +++ b/ext/dba/tests/dba_gdbm.phpt @@ -3,14 +3,14 @@ DBA GDBM handler test --SKIPIF-- <?php $handler = 'gdbm'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'gdbm'; - require_once dirname(__FILE__) .'/test.inc'; + require_once __DIR__ .'/test.inc'; $lock_flag = ''; // lock in library - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/dba_handler.inc'; // Read during write is system dependent. Important is that there is no deadlock ?> diff --git a/ext/dba/tests/dba_handlers.phpt b/ext/dba/tests/dba_handlers.phpt index 3c9d174514..f3c299ce2a 100644 --- a/ext/dba/tests/dba_handlers.phpt +++ b/ext/dba/tests/dba_handlers.phpt @@ -3,13 +3,13 @@ DBA Handler Test --SKIPIF-- <?php $handler="flatfile"; -require(dirname(__FILE__) .'/skipif.inc'); +require(__DIR__ .'/skipif.inc'); die("info $HND handler used"); ?> --FILE-- <?php $handler="flatfile"; -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; function check($h) @@ -48,7 +48,7 @@ foreach ($h as $key => $val) { ?> --CLEAN-- <?php -require(dirname(__FILE__) .'/clean.inc'); +require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_inifile.phpt b/ext/dba/tests/dba_inifile.phpt index ad7b72a82d..c21413f1ac 100644 --- a/ext/dba/tests/dba_inifile.phpt +++ b/ext/dba/tests/dba_inifile.phpt @@ -3,18 +3,18 @@ DBA INIFILE handler test --SKIPIF-- <?php $handler = 'inifile'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'inifile'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECT-- database handler: inifile diff --git a/ext/dba/tests/dba_lmdb.phpt b/ext/dba/tests/dba_lmdb.phpt index b32cd58bbd..3ca8bfeb07 100644 --- a/ext/dba/tests/dba_lmdb.phpt +++ b/ext/dba/tests/dba_lmdb.phpt @@ -3,19 +3,19 @@ DBA LMDB handler test --SKIPIF-- <?php $handler = 'lmdb'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'lmdb'; - require_once dirname(__FILE__) .'/test.inc'; + require_once __DIR__ .'/test.inc'; $lock_flag = ''; // lock in library - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --CLEAN-- <?php - require_once dirname(__FILE__) .'/clean.inc'; + require_once __DIR__ .'/clean.inc'; ?> --EXPECTF-- database handler: lmdb diff --git a/ext/dba/tests/dba_ndbm.phpt b/ext/dba/tests/dba_ndbm.phpt index a3478862eb..616bcb2c6b 100644 --- a/ext/dba/tests/dba_ndbm.phpt +++ b/ext/dba/tests/dba_ndbm.phpt @@ -3,13 +3,13 @@ DBA NDBM handler test --SKIPIF-- <?php $handler = 'ndbm'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'ndbm'; - require_once dirname(__FILE__) .'/test.inc'; - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/test.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --EXPECT-- diff --git a/ext/dba/tests/dba_optimize.phpt b/ext/dba/tests/dba_optimize.phpt index 21e135de81..9aee57e39f 100644 --- a/ext/dba/tests/dba_optimize.phpt +++ b/ext/dba/tests/dba_optimize.phpt @@ -2,12 +2,12 @@ DBA Optimize Test --SKIPIF-- <?php - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -34,7 +34,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php exit(0); ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_qdbm.phpt b/ext/dba/tests/dba_qdbm.phpt index 45fed53824..4f2a097c38 100644 --- a/ext/dba/tests/dba_qdbm.phpt +++ b/ext/dba/tests/dba_qdbm.phpt @@ -3,19 +3,19 @@ DBA QDBM handler test --SKIPIF-- <?php $handler = 'qdbm'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $handler = 'qdbm'; - require_once dirname(__FILE__) .'/test.inc'; + require_once __DIR__ .'/test.inc'; $lock_flag = ''; // lock in library - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: qdbm diff --git a/ext/dba/tests/dba_split.phpt b/ext/dba/tests/dba_split.phpt index 1f660daf09..77a0f3b5a0 100644 --- a/ext/dba/tests/dba_split.phpt +++ b/ext/dba/tests/dba_split.phpt @@ -2,7 +2,7 @@ DBA Split Test --SKIPIF-- <?php - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; die("info $HND handler used"); ?> --FILE-- diff --git a/ext/dba/tests/dba_sync.phpt b/ext/dba/tests/dba_sync.phpt index 5b2ae5bb76..5c123a2647 100644 --- a/ext/dba/tests/dba_sync.phpt +++ b/ext/dba/tests/dba_sync.phpt @@ -2,12 +2,12 @@ DBA Sync Test --SKIPIF-- <?php - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; die("info $HND handler used"); ?> --FILE-- <?php -require_once(dirname(__FILE__) .'/test.inc'); +require_once(__DIR__ .'/test.inc'); echo "database handler: $handler\n"; if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { dba_insert("key1", "Content String 1", $db_file); @@ -34,7 +34,7 @@ if (($db_file=dba_open($db_filename, "n", $handler))!==FALSE) { <?php exit(0); ?> --CLEAN-- <?php - require(dirname(__FILE__) .'/clean.inc'); + require(__DIR__ .'/clean.inc'); ?> --EXPECTF-- database handler: flatfile diff --git a/ext/dba/tests/dba_tcadb.phpt b/ext/dba/tests/dba_tcadb.phpt index bc21ee189a..04246a29f3 100644 --- a/ext/dba/tests/dba_tcadb.phpt +++ b/ext/dba/tests/dba_tcadb.phpt @@ -3,20 +3,20 @@ DBA TCADB handler test --SKIPIF-- <?php $handler = 'tcadb'; - require_once dirname(__FILE__) .'/skipif.inc'; + require_once __DIR__ .'/skipif.inc'; ?> --FILE-- <?php $lock_flag = 'l'; - $db_filename = $db_file = dirname(__FILE__) .'/test0.tch'; + $db_filename = $db_file = __DIR__ .'/test0.tch'; @unlink($db_filename); @unlink($db_filename.'.lck'); - require_once dirname(__FILE__) .'/dba_handler.inc'; + require_once __DIR__ .'/dba_handler.inc'; ?> ===DONE=== --CLEAN-- <?php -$db_filename = $db_file = dirname(__FILE__) .'/test0.tch'; +$db_filename = $db_file = __DIR__ .'/test0.tch'; @unlink($db_filename); @unlink($db_filename.'.lck'); ?> |