com php-src: Replace `dirname(__FILE__)` with `__DIR__` in tests: ext/sqlite3/tests/ bug45798.phpt ext/sqlite3/tests/bug4715 9.phpt
ext/sqlite3/tests/bug53463.phpt ex t/sqlite3/tests/sqlite3_01_open-mb.phpt ext/sql ite3/tests/sqlite3_01_open.phpt ext/sqlite3/t
ests/sqlite3_02_create.phpt ext/sqlite3/tests/s qlite3_02_open.phpt ext/sqlite3/tests/sqlite3 _03_insert.phpt ext/sqlite3/tests/sqlite3_0
4_update.phpt ext/sqlite3/tests/sqlite3_05_ delete.phpt ext/
| From: | Christoph Michael Becker | Date: | Fri, 02 Sep 2016 22:56:09 +0000 |
| Subject: | com php-src: Replace `dirname(__FILE__)` with `__DIR__` in tests: ext/sqlite3/tests/ bug45798.phpt ext/sqlite3/tests/bug4715 9.phpt ext/sqlite3/tests/bug53463.phpt ex t/sqlite3/tests/sqlite3_01_open-mb.phpt ext/sql ite3/tests/sqlite3_01_open.phpt ext/sqlite3/t ests/sqlite3_02_create.phpt ext/sqlite3/tests/s qlite3_02_open.phpt ext/sqlite3/tests/sqlite3 _03_insert.phpt ext/sqlite3/tests/sqlite3_0 4_update.phpt ext/sqlite3/tests/sqlite3_05_ delete.phpt ext/ |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-94270@lists.php.net to get a copy of this message | ||
Commit: 2c91684394e009fa6e036d8be062bfb3ae36179d
Author: Christoph M. Becker <cmbecker69@gmx.de> Sat, 3 Sep 2016 00:55:12 +0200
Parents: f2ee4dec995f7845abd7dde8fca9929c0363ff9a
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2c91684394e009fa6e036d8be062bfb3ae36179d
Log:
Replace
diff --git a/ext/sqlite3/tests/bug45798.phpt b/ext/sqlite3/tests/bug45798.phpt index 1beacc4..9637c1f 100644 --- a/ext/sqlite3/tests/bug45798.phpt +++ b/ext/sqlite3/tests/bug45798.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #45798 (sqlite3 doesn't notice if variable was bound) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $db->exec('CREATE TABLE test (time INTEGER, id STRING)'); diff --git a/ext/sqlite3/tests/bug47159.phpt b/ext/sqlite3/tests/bug47159.phpt index f8ffa28..7d91e1a 100644 --- a/ext/sqlite3/tests/bug47159.phpt +++ b/ext/sqlite3/tests/bug47159.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #45798 (sqlite3 doesn't track unexecuted statements) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $stmt = $db->prepare("SELECT 1"); diff --git a/ext/sqlite3/tests/bug53463.phpt b/ext/sqlite3/tests/bug53463.phpt index dcfc13d..3d90781 100644 --- a/ext/sqlite3/tests/bug53463.phpt +++ b/ext/sqlite3/tests/bug53463.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #53463 (sqlite3 columnName() segfaults on bad column_number) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt index ad9b147..e77ba38 100644 --- a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt +++ b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt @@ -1,13 +1,13 @@ --TEST-- SQLite3::open/close tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -$db_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . '私はガラスを食べられます.db'; +$db_file = __DIR__ . DIRECTORY_SEPARATOR . '私はガラスを食べられます.db'; $db = new SQLite3($db_file); -//require_once(dirname(__FILE__) . '/new_db.inc'); +//require_once(__DIR__ . '/new_db.inc'); var_dump($db); var_dump($db->close()); diff --git a/ext/sqlite3/tests/sqlite3_01_open.phpt b/ext/sqlite3/tests/sqlite3_01_open.phpt index 11c4827..f5cc452 100644 --- a/ext/sqlite3/tests/sqlite3_01_open.phpt +++ b/ext/sqlite3/tests/sqlite3_01_open.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::open/close tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); var_dump($db); var_dump($db->close()); diff --git a/ext/sqlite3/tests/sqlite3_02_create.phpt b/ext/sqlite3/tests/sqlite3_02_create.phpt index 5a1aa71..913df09 100644 --- a/ext/sqlite3/tests/sqlite3_02_create.phpt +++ b/ext/sqlite3/tests/sqlite3_02_create.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query CREATE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE test (time INTEGER, id STRING)')); diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt index b9b4953..87f4b91 100644 --- a/ext/sqlite3/tests/sqlite3_02_open.phpt +++ b/ext/sqlite3/tests/sqlite3_02_open.phpt @@ -4,7 +4,7 @@ SQLite3::open test, testing for function parameters Felix De Vliegher # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_03_insert.phpt b/ext/sqlite3/tests/sqlite3_03_insert.phpt index 7a9feda..1a0690a 100644 --- a/ext/sqlite3/tests/sqlite3_03_insert.phpt +++ b/ext/sqlite3/tests/sqlite3_03_insert.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query INSERT tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_04_update.phpt b/ext/sqlite3/tests/sqlite3_04_update.phpt index 4a84fdd..3ce7d9c 100644 --- a/ext/sqlite3/tests/sqlite3_04_update.phpt +++ b/ext/sqlite3/tests/sqlite3_04_update.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query UPDATE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_05_delete.phpt b/ext/sqlite3/tests/sqlite3_05_delete.phpt index b35e7c1..9ce50c4 100644 --- a/ext/sqlite3/tests/sqlite3_05_delete.phpt +++ b/ext/sqlite3/tests/sqlite3_05_delete.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query DELETE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt index 403adbb..710813e 100644 --- a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Variable test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt index 7a3d950..d9a2408 100644 --- a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Value test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_08_udf.phpt b/ext/sqlite3/tests/sqlite3_08_udf.phpt index d6a326c..061b8a0 100644 --- a/ext/sqlite3/tests/sqlite3_08_udf.phpt +++ b/ext/sqlite3/tests/sqlite3_08_udf.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::createFunction --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php @@ -10,7 +10,7 @@ function my_udf_md5($foo) return md5($foo); } -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt index ccc6a8b..994503d 100644 --- a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt +++ b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::prepare Bound Variable Blob test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt index 35852ba..712ad2e 100644 --- a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt +++ b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Value test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt index 8e2d428..44fb533 100644 --- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt +++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::prepare number of rows --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(__DIR__ . '/skipif.inc'); // Create an instance of the ReflectionMethod class try { $method = new ReflectionMethod('sqlite3result', 'numRows'); @@ -12,7 +12,7 @@ try { --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt index 2bfd0af..eac5a59 100644 --- a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt +++ b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query Unfinalized statement tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt index 573d87f..daeacc0 100644 --- a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt +++ b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query Skip all cleanup --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt index 8cfe089..0c8aefb 100644 --- a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt +++ b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::querySingle tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt index de9fdef..0f2330e 100644 --- a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt +++ b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query SELECT with no results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_17_version.phpt b/ext/sqlite3/tests/sqlite3_17_version.phpt index 4550057..117358e 100644 --- a/ext/sqlite3/tests/sqlite3_17_version.phpt +++ b/ext/sqlite3/tests/sqlite3_17_version.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::version() --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php print_r(SQLite3::version()); diff --git a/ext/sqlite3/tests/sqlite3_18_changes.phpt b/ext/sqlite3/tests/sqlite3_18_changes.phpt index 6802db3..4de4a85 100644 --- a/ext/sqlite3/tests/sqlite3_18_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_18_changes.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::changes() tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt index 4451bdf..7f243b7 100644 --- a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt +++ b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3 columnType and columnName --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_20_error.phpt b/ext/sqlite3/tests/sqlite3_20_error.phpt index d98644a..a9324c3 100644 --- a/ext/sqlite3/tests/sqlite3_20_error.phpt +++ b/ext/sqlite3/tests/sqlite3_20_error.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3 error functions --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "SELECTING from invalid table\n"; $result = $db->query("SELECT * FROM non_existent_table"); diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt index a667a12..5221807 100644 --- a/ext/sqlite3/tests/sqlite3_21_security.phpt +++ b/ext/sqlite3/tests/sqlite3_21_security.phpt @@ -1,14 +1,14 @@ --TEST-- SQLite3 open_basedir checks --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --INI-- open_basedir=. --FILE-- <?php chdir(__DIR__); -$directory = dirname(__FILE__) . '/'; +$directory = __DIR__ . '/'; $file = uniqid() . '.db'; echo "Within test directory\n"; diff --git a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt index 091dcd4..52a533d 100644 --- a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt +++ b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt @@ -2,7 +2,7 @@ SQLite3 load extension --SKIPIF-- <?php -require_once(dirname(__FILE__) . '/skipif.inc'); +require_once(__DIR__ . '/skipif.inc'); $r = new ReflectionClass("sqlite3"); if (!$r->hasMethod("loadExtension")) { die("skip - sqlite3 doesn't have loadExtension enabled"); @@ -14,9 +14,9 @@ sqlite3.extension_dir=. --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); -$directory = dirname(__FILE__); +$directory = __DIR__; touch($directory . '/myext.txt'); diff --git a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt index 4091ff8..6552c22 100644 --- a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt +++ b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::escapeString --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt index 83d0a29..52752e5 100644 --- a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt +++ b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::lastInsertRowID tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt index 6626ed6..1eef666 100644 --- a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt +++ b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::createAggregate() test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); function sum_list_step($context, $rows, $string) { if (empty($context)) diff --git a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt index eda1bd5..ffd05d3 100644 --- a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::reset prepared statement --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt index ea7e8bf..646cb47 100644 --- a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt +++ b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::reset prepared statement results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt index 77a69b3..a17e1fb 100644 --- a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt +++ b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3_stmt::clear prepared statement results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt index 9448b30..6ea000a 100644 --- a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt +++ b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::createFunction - Basic test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $func = 'strtoupper'; var_dump($db->createfunction($func, $func)); diff --git a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt index ed51153..1daa4b1 100644 --- a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt +++ b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::blobOpen stream test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_31_changes.phpt b/ext/sqlite3/tests/sqlite3_31_changes.phpt index 1667b34..589a498 100644 --- a/ext/sqlite3/tests/sqlite3_31_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_31_changes.phpt @@ -4,7 +4,7 @@ SQLite3::changes (parameters) tests Ward Hus #@PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt index b30266b..47a08f2 100644 --- a/ext/sqlite3/tests/sqlite3_31_open.phpt +++ b/ext/sqlite3/tests/sqlite3_31_open.phpt @@ -4,7 +4,7 @@ SQLite3::re-initialize object tests Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_32_changes.phpt b/ext/sqlite3/tests/sqlite3_32_changes.phpt index 0aad451..52666fd 100644 --- a/ext/sqlite3/tests/sqlite3_32_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_32_changes.phpt @@ -4,7 +4,7 @@ SQLite3::changes empty str tests Ward Hus #@ PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt b/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt index 8a05c57..3c30bdb 100644 --- a/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt +++ b/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt @@ -4,7 +4,7 @@ SQLite3::createAggregate Test that an error is thrown when no parameters are pre James Cauwelier # Belgium PHP TestFest --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt b/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt index c696ef9..049a774 100644 --- a/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt +++ b/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt @@ -4,7 +4,7 @@ SQLite3::lastInsertRowID parameter test Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt index 7a1bb28..fe7c8fb 100644 --- a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt +++ b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt @@ -4,7 +4,7 @@ SQLite3::createAggregate() Test whether a supplied PHP function is valid when us James Cauwelier # Belgium PHP TestFest (2009) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt index b7b418c..716ec9d 100644 --- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt +++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt @@ -6,7 +6,7 @@ Jelle Lampaert --INI-- sqlite3.extension_dir=/tmp --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_reset.phpt b/ext/sqlite3/tests/sqlite3_33_reset.phpt index 5f513fb..531874c 100644 --- a/ext/sqlite3/tests/sqlite3_33_reset.phpt +++ b/ext/sqlite3/tests/sqlite3_33_reset.phpt @@ -4,7 +4,7 @@ SQLite3:: reset Ward Hus & James Cauwelier #@ PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt index 1d2721b..20ad370 100644 --- a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt +++ b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt @@ -4,7 +4,7 @@ SQLite3::loadExtension with disabled extensions Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt index 0c542a1..23392e5 100644 --- a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt +++ b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3_stmt::readOnly check --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(__DIR__ . '/skipif.inc'); $version = SQLite3::version(); if ($version['versionNumber'] < 3007004) { die("skip"); @@ -10,7 +10,7 @@ if ($version['versionNumber'] < 3007004) { --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt index c4d88c6..90fbd9d 100644 --- a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt +++ b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt @@ -1,11 +1,11 @@ --TEST-- Test SQLite3::createCollation() by adding strnatcmp() as an SQL COLLATE sequence --SKIPIF-- -<?php require_once dirname(__FILE__) . '/skipif.inc'; ?> +<?php require_once __DIR__ . '/skipif.inc'; ?> --FILE-- <?php -require_once dirname(__FILE__) . '/new_db.inc'; +require_once __DIR__ . '/new_db.inc'; $db->createCollation('NAT', 'strnatcmp'); diff --git a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt index 321f883..d04e596 100644 --- a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt +++ b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68849 bindValue is not using the right data type --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt index 108956b..c35af94 100644 --- a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt +++ b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::execute() with a resource bound for blob param --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); var_dump($db->exec('CREATE TABLE test (id STRING, data BLOB)')); $insert_stmt = $db->prepare("INSERT INTO test (id, data) VALUES (1, ?)"); diff --git a/ext/sqlite3/tests/sqlite3_close_error.phpt b/ext/sqlite3/tests/sqlite3_close_error.phpt index d242352..dad8cb9 100644 --- a/ext/sqlite3/tests/sqlite3_close_error.phpt +++ b/ext/sqlite3/tests/sqlite3_close_error.phpt @@ -4,7 +4,7 @@ SQLite3::close parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_close_with_params.phpt b/ext/sqlite3/tests/sqlite3_close_with_params.phpt index 98e0483..6e44dbf 100644 --- a/ext/sqlite3/tests/sqlite3_close_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_close_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::close test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt index ebb59eb..767f9d0 100644 --- a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt +++ b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt @@ -4,7 +4,7 @@ SQLite3::enableExceptions test Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt index c94b521..c3af188 100644 --- a/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::exec test, testing for wrong type parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt b/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt index 243392b..281adb4 100644 --- a/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::lastErrorCode test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt b/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt index c2fa35d..1d4c6d3 100644 --- a/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::lastErrorMsg test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt index 9811f86..d3f9064 100644 --- a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt +++ b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt @@ -4,7 +4,7 @@ SQLite3::loadExtension test with wrong parameter type Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt index 940056b..c183269 100644 --- a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt +++ b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt @@ -4,7 +4,7 @@ SQLite3::open test with empty string argument via the constructor Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(''); diff --git a/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt index 439e397..03242d9 100644 --- a/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::blobOpen test, testing stream with wrong parameter count Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php class SQLite3_Test_Stream diff --git a/ext/sqlite3/tests/sqlite3_prepare_001.phpt b/ext/sqlite3/tests/sqlite3_prepare_001.phpt index f9e5fad..baf0c83 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_001.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_001.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3 - memory leak on SQLite3Result and SQLite3Stmt --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt index 5cdf322..2793e5f 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test, testing for faulty statement Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt index dea7d91..391bc54 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test with empty string argument Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt index b7eb564..3010e32 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test, testing for wrong parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt b/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt index d04fb66..779d254 100644 --- a/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt @@ -4,7 +4,7 @@ SQLite3Stmt::clear test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_query_error.phpt b/ext/sqlite3/tests/sqlite3_query_error.phpt index ab7f700..f5d64fd 100644 --- a/ext/sqlite3/tests/sqlite3_query_error.phpt +++ b/ext/sqlite3/tests/sqlite3_query_error.phpt @@ -4,7 +4,7 @@ SQLite3::query parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt index 85889c7..9d19dbe 100644 --- a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt +++ b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt @@ -4,7 +4,7 @@ SQLite3::query parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_version_noparam.phpt b/ext/sqlite3/tests/sqlite3_version_noparam.phpt index 19d6ec5..2b8e77b 100644 --- a/ext/sqlite3/tests/sqlite3_version_noparam.phpt +++ b/ext/sqlite3/tests/sqlite3_version_noparam.phpt @@ -4,7 +4,7 @@ SQLite3::version test, testing for missing function parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt b/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt index cb49b75..657d19f 100644 --- a/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt +++ b/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt @@ -4,7 +4,7 @@ SQLite3Result::fetchArray() test, testing two params causes a failure Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt b/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt index 5f8306c..52ab6ef 100644 --- a/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt +++ b/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt @@ -4,7 +4,7 @@ SQLite3Result::numColumns parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt b/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt index b397ac6..2c263ba 100644 --- a/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt +++ b/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt @@ -4,7 +4,7 @@ SQLite3Result::reset test, testing an exception is raised when calling reset wit Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt index a4b29e3..97ef1f7 100644 --- a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3Stmt::paramCount basic test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE foobar (id INTEGER, name STRING, city STRING)')); diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt index 2aac6c2..64016db 100644 --- a/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3Stmt::paramCount error test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE foobar (id INTEGER, name STRING, city STRING)')); diff --git a/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt b/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt index b0dfc20..f2fa74a 100644 --- a/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt @@ -4,7 +4,7 @@ SQLite3Stmt::reset with parameter test Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:');
dirname(__FILE__) with __DIR__ in tests
Changed paths:
M ext/sqlite3/tests/bug45798.phpt
M ext/sqlite3/tests/bug47159.phpt
M ext/sqlite3/tests/bug53463.phpt
M ext/sqlite3/tests/sqlite3_01_open-mb.phpt
M ext/sqlite3/tests/sqlite3_01_open.phpt
M ext/sqlite3/tests/sqlite3_02_create.phpt
M ext/sqlite3/tests/sqlite3_02_open.phpt
M ext/sqlite3/tests/sqlite3_03_insert.phpt
M ext/sqlite3/tests/sqlite3_04_update.phpt
M ext/sqlite3/tests/sqlite3_05_delete.phpt
M ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt
M ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt
M ext/sqlite3/tests/sqlite3_08_udf.phpt
M ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt
M ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt
M ext/sqlite3/tests/sqlite3_11_numrows.phpt
M ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt
M ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt
M ext/sqlite3/tests/sqlite3_14_querysingle.phpt
M ext/sqlite3/tests/sqlite3_16_select_no_results.phpt
M ext/sqlite3/tests/sqlite3_17_version.phpt
M ext/sqlite3/tests/sqlite3_18_changes.phpt
M ext/sqlite3/tests/sqlite3_19_columninfo.phpt
M ext/sqlite3/tests/sqlite3_20_error.phpt
M ext/sqlite3/tests/sqlite3_21_security.phpt
M ext/sqlite3/tests/sqlite3_22_loadextension.phpt
M ext/sqlite3/tests/sqlite3_23_escape_string.phpt
M ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt
M ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt
M ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt
M ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt
M ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt
M ext/sqlite3/tests/sqlite3_29_createfunction.phpt
M ext/sqlite3/tests/sqlite3_30_blobopen.phpt
M ext/sqlite3/tests/sqlite3_31_changes.phpt
M ext/sqlite3/tests/sqlite3_31_open.phpt
M ext/sqlite3/tests/sqlite3_32_changes.phpt
M ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt
M ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt
M ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt
M ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt
M ext/sqlite3/tests/sqlite3_33_reset.phpt
M ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt
M ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt
M ext/sqlite3/tests/sqlite3_36_create_collation.phpt
M ext/sqlite3/tests/sqlite3_bind_bug68849.phpt
M ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt
M ext/sqlite3/tests/sqlite3_close_error.phpt
M ext/sqlite3/tests/sqlite3_close_with_params.phpt
M ext/sqlite3/tests/sqlite3_enable_exceptions.phpt
M ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt
M ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt
M ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt
M ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt
M ext/sqlite3/tests/sqlite3_open_empty_string.phpt
M ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt
M ext/sqlite3/tests/sqlite3_prepare_001.phpt
M ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt
M ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt
M ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt
M ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt
M ext/sqlite3/tests/sqlite3_query_error.phpt
M ext/sqlite3/tests/sqlite3_querysingle_error.phpt
M ext/sqlite3/tests/sqlite3_version_noparam.phpt
M ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt
M ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt
M ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt
M ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt
M ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt
M ext/sqlite3/tests/sqlite3stmt_reset_params.phpt
diff --git a/ext/sqlite3/tests/bug45798.phpt b/ext/sqlite3/tests/bug45798.phpt index 1beacc4..9637c1f 100644 --- a/ext/sqlite3/tests/bug45798.phpt +++ b/ext/sqlite3/tests/bug45798.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #45798 (sqlite3 doesn't notice if variable was bound) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $db->exec('CREATE TABLE test (time INTEGER, id STRING)'); diff --git a/ext/sqlite3/tests/bug47159.phpt b/ext/sqlite3/tests/bug47159.phpt index f8ffa28..7d91e1a 100644 --- a/ext/sqlite3/tests/bug47159.phpt +++ b/ext/sqlite3/tests/bug47159.phpt @@ -1,11 +1,11 @@ --TEST-- Bug #45798 (sqlite3 doesn't track unexecuted statements) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $stmt = $db->prepare("SELECT 1"); diff --git a/ext/sqlite3/tests/bug53463.phpt b/ext/sqlite3/tests/bug53463.phpt index dcfc13d..3d90781 100644 --- a/ext/sqlite3/tests/bug53463.phpt +++ b/ext/sqlite3/tests/bug53463.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #53463 (sqlite3 columnName() segfaults on bad column_number) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt index ad9b147..e77ba38 100644 --- a/ext/sqlite3/tests/sqlite3_01_open-mb.phpt +++ b/ext/sqlite3/tests/sqlite3_01_open-mb.phpt @@ -1,13 +1,13 @@ --TEST-- SQLite3::open/close tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -$db_file = dirname(__FILE__) . DIRECTORY_SEPARATOR . '私はガラスを食べられます.db'; +$db_file = __DIR__ . DIRECTORY_SEPARATOR . '私はガラスを食べられます.db'; $db = new SQLite3($db_file); -//require_once(dirname(__FILE__) . '/new_db.inc'); +//require_once(__DIR__ . '/new_db.inc'); var_dump($db); var_dump($db->close()); diff --git a/ext/sqlite3/tests/sqlite3_01_open.phpt b/ext/sqlite3/tests/sqlite3_01_open.phpt index 11c4827..f5cc452 100644 --- a/ext/sqlite3/tests/sqlite3_01_open.phpt +++ b/ext/sqlite3/tests/sqlite3_01_open.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::open/close tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); var_dump($db); var_dump($db->close()); diff --git a/ext/sqlite3/tests/sqlite3_02_create.phpt b/ext/sqlite3/tests/sqlite3_02_create.phpt index 5a1aa71..913df09 100644 --- a/ext/sqlite3/tests/sqlite3_02_create.phpt +++ b/ext/sqlite3/tests/sqlite3_02_create.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query CREATE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE test (time INTEGER, id STRING)')); diff --git a/ext/sqlite3/tests/sqlite3_02_open.phpt b/ext/sqlite3/tests/sqlite3_02_open.phpt index b9b4953..87f4b91 100644 --- a/ext/sqlite3/tests/sqlite3_02_open.phpt +++ b/ext/sqlite3/tests/sqlite3_02_open.phpt @@ -4,7 +4,7 @@ SQLite3::open test, testing for function parameters Felix De Vliegher # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_03_insert.phpt b/ext/sqlite3/tests/sqlite3_03_insert.phpt index 7a9feda..1a0690a 100644 --- a/ext/sqlite3/tests/sqlite3_03_insert.phpt +++ b/ext/sqlite3/tests/sqlite3_03_insert.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query INSERT tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_04_update.phpt b/ext/sqlite3/tests/sqlite3_04_update.phpt index 4a84fdd..3ce7d9c 100644 --- a/ext/sqlite3/tests/sqlite3_04_update.phpt +++ b/ext/sqlite3/tests/sqlite3_04_update.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query UPDATE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_05_delete.phpt b/ext/sqlite3/tests/sqlite3_05_delete.phpt index b35e7c1..9ce50c4 100644 --- a/ext/sqlite3/tests/sqlite3_05_delete.phpt +++ b/ext/sqlite3/tests/sqlite3_05_delete.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query DELETE tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt index 403adbb..710813e 100644 --- a/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_06_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Variable test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt index 7a3d950..d9a2408 100644 --- a/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_07_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Value test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_08_udf.phpt b/ext/sqlite3/tests/sqlite3_08_udf.phpt index d6a326c..061b8a0 100644 --- a/ext/sqlite3/tests/sqlite3_08_udf.phpt +++ b/ext/sqlite3/tests/sqlite3_08_udf.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::createFunction --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php @@ -10,7 +10,7 @@ function my_udf_md5($foo) return md5($foo); } -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt index ccc6a8b..994503d 100644 --- a/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt +++ b/ext/sqlite3/tests/sqlite3_09_blob_bound_param.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::prepare Bound Variable Blob test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt index 35852ba..712ad2e 100644 --- a/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt +++ b/ext/sqlite3/tests/sqlite3_10_bound_value_name.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::prepare Bound Value test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_11_numrows.phpt b/ext/sqlite3/tests/sqlite3_11_numrows.phpt index 8e2d428..44fb533 100644 --- a/ext/sqlite3/tests/sqlite3_11_numrows.phpt +++ b/ext/sqlite3/tests/sqlite3_11_numrows.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::prepare number of rows --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(__DIR__ . '/skipif.inc'); // Create an instance of the ReflectionMethod class try { $method = new ReflectionMethod('sqlite3result', 'numRows'); @@ -12,7 +12,7 @@ try { --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt index 2bfd0af..eac5a59 100644 --- a/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt +++ b/ext/sqlite3/tests/sqlite3_12_unfinalized_stmt_cleanup.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query Unfinalized statement tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt index 573d87f..daeacc0 100644 --- a/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt +++ b/ext/sqlite3/tests/sqlite3_13_skip_all_cleanup.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query Skip all cleanup --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt index 8cfe089..0c8aefb 100644 --- a/ext/sqlite3/tests/sqlite3_14_querysingle.phpt +++ b/ext/sqlite3/tests/sqlite3_14_querysingle.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::querySingle tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt index de9fdef..0f2330e 100644 --- a/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt +++ b/ext/sqlite3/tests/sqlite3_16_select_no_results.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::query SELECT with no results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_17_version.phpt b/ext/sqlite3/tests/sqlite3_17_version.phpt index 4550057..117358e 100644 --- a/ext/sqlite3/tests/sqlite3_17_version.phpt +++ b/ext/sqlite3/tests/sqlite3_17_version.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3::version() --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php print_r(SQLite3::version()); diff --git a/ext/sqlite3/tests/sqlite3_18_changes.phpt b/ext/sqlite3/tests/sqlite3_18_changes.phpt index 6802db3..4de4a85 100644 --- a/ext/sqlite3/tests/sqlite3_18_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_18_changes.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::changes() tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt index 4451bdf..7f243b7 100644 --- a/ext/sqlite3/tests/sqlite3_19_columninfo.phpt +++ b/ext/sqlite3/tests/sqlite3_19_columninfo.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3 columnType and columnName --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_20_error.phpt b/ext/sqlite3/tests/sqlite3_20_error.phpt index d98644a..a9324c3 100644 --- a/ext/sqlite3/tests/sqlite3_20_error.phpt +++ b/ext/sqlite3/tests/sqlite3_20_error.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3 error functions --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "SELECTING from invalid table\n"; $result = $db->query("SELECT * FROM non_existent_table"); diff --git a/ext/sqlite3/tests/sqlite3_21_security.phpt b/ext/sqlite3/tests/sqlite3_21_security.phpt index a667a12..5221807 100644 --- a/ext/sqlite3/tests/sqlite3_21_security.phpt +++ b/ext/sqlite3/tests/sqlite3_21_security.phpt @@ -1,14 +1,14 @@ --TEST-- SQLite3 open_basedir checks --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --INI-- open_basedir=. --FILE-- <?php chdir(__DIR__); -$directory = dirname(__FILE__) . '/'; +$directory = __DIR__ . '/'; $file = uniqid() . '.db'; echo "Within test directory\n"; diff --git a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt index 091dcd4..52a533d 100644 --- a/ext/sqlite3/tests/sqlite3_22_loadextension.phpt +++ b/ext/sqlite3/tests/sqlite3_22_loadextension.phpt @@ -2,7 +2,7 @@ SQLite3 load extension --SKIPIF-- <?php -require_once(dirname(__FILE__) . '/skipif.inc'); +require_once(__DIR__ . '/skipif.inc'); $r = new ReflectionClass("sqlite3"); if (!$r->hasMethod("loadExtension")) { die("skip - sqlite3 doesn't have loadExtension enabled"); @@ -14,9 +14,9 @@ sqlite3.extension_dir=. --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); -$directory = dirname(__FILE__); +$directory = __DIR__; touch($directory . '/myext.txt'); diff --git a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt index 4091ff8..6552c22 100644 --- a/ext/sqlite3/tests/sqlite3_23_escape_string.phpt +++ b/ext/sqlite3/tests/sqlite3_23_escape_string.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::escapeString --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt index 83d0a29..52752e5 100644 --- a/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt +++ b/ext/sqlite3/tests/sqlite3_24_last_insert_rowid.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::lastInsertRowID tests --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt index 6626ed6..1eef666 100644 --- a/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt +++ b/ext/sqlite3/tests/sqlite3_25_create_aggregate.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::createAggregate() test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); function sum_list_step($context, $rows, $string) { if (empty($context)) diff --git a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt index eda1bd5..ffd05d3 100644 --- a/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt +++ b/ext/sqlite3/tests/sqlite3_26_reset_prepared_stmt.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::reset prepared statement --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt index ea7e8bf..646cb47 100644 --- a/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt +++ b/ext/sqlite3/tests/sqlite3_27_reset_prepared_stmt_result.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::reset prepared statement results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt index 77a69b3..a17e1fb 100644 --- a/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt +++ b/ext/sqlite3/tests/sqlite3_28_clear_bindings.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3_stmt::clear prepared statement results --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt index 9448b30..6ea000a 100644 --- a/ext/sqlite3/tests/sqlite3_29_createfunction.phpt +++ b/ext/sqlite3/tests/sqlite3_29_createfunction.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3::createFunction - Basic test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); $func = 'strtoupper'; var_dump($db->createfunction($func, $func)); diff --git a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt index ed51153..1daa4b1 100644 --- a/ext/sqlite3/tests/sqlite3_30_blobopen.phpt +++ b/ext/sqlite3/tests/sqlite3_30_blobopen.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::blobOpen stream test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_31_changes.phpt b/ext/sqlite3/tests/sqlite3_31_changes.phpt index 1667b34..589a498 100644 --- a/ext/sqlite3/tests/sqlite3_31_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_31_changes.phpt @@ -4,7 +4,7 @@ SQLite3::changes (parameters) tests Ward Hus #@PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_31_open.phpt b/ext/sqlite3/tests/sqlite3_31_open.phpt index b30266b..47a08f2 100644 --- a/ext/sqlite3/tests/sqlite3_31_open.phpt +++ b/ext/sqlite3/tests/sqlite3_31_open.phpt @@ -4,7 +4,7 @@ SQLite3::re-initialize object tests Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_32_changes.phpt b/ext/sqlite3/tests/sqlite3_32_changes.phpt index 0aad451..52666fd 100644 --- a/ext/sqlite3/tests/sqlite3_32_changes.phpt +++ b/ext/sqlite3/tests/sqlite3_32_changes.phpt @@ -4,7 +4,7 @@ SQLite3::changes empty str tests Ward Hus #@ PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt b/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt index 8a05c57..3c30bdb 100644 --- a/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt +++ b/ext/sqlite3/tests/sqlite3_32_createAggregate_paramCount.phpt @@ -4,7 +4,7 @@ SQLite3::createAggregate Test that an error is thrown when no parameters are pre James Cauwelier # Belgium PHP TestFest --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt b/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt index c696ef9..049a774 100644 --- a/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt +++ b/ext/sqlite3/tests/sqlite3_32_last_insert_rowid_param.phpt @@ -4,7 +4,7 @@ SQLite3::lastInsertRowID parameter test Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt index 7a1bb28..fe7c8fb 100644 --- a/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt +++ b/ext/sqlite3/tests/sqlite3_33_createAggregate_notcallable.phpt @@ -4,7 +4,7 @@ SQLite3::createAggregate() Test whether a supplied PHP function is valid when us James Cauwelier # Belgium PHP TestFest (2009) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt index b7b418c..716ec9d 100644 --- a/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt +++ b/ext/sqlite3/tests/sqlite3_33_load_extension_param.phpt @@ -6,7 +6,7 @@ Jelle Lampaert --INI-- sqlite3.extension_dir=/tmp --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_33_reset.phpt b/ext/sqlite3/tests/sqlite3_33_reset.phpt index 5f513fb..531874c 100644 --- a/ext/sqlite3/tests/sqlite3_33_reset.phpt +++ b/ext/sqlite3/tests/sqlite3_33_reset.phpt @@ -4,7 +4,7 @@ SQLite3:: reset Ward Hus & James Cauwelier #@ PHP TESTFEST 2009 (BELGIUM) --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt index 1d2721b..20ad370 100644 --- a/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt +++ b/ext/sqlite3/tests/sqlite3_34_load_extension_ext_dir.phpt @@ -4,7 +4,7 @@ SQLite3::loadExtension with disabled extensions Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt index 0c542a1..23392e5 100644 --- a/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt +++ b/ext/sqlite3/tests/sqlite3_35_stmt_readonly.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3_stmt::readOnly check --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); +<?php require_once(__DIR__ . '/skipif.inc'); $version = SQLite3::version(); if ($version['versionNumber'] < 3007004) { die("skip"); @@ -10,7 +10,7 @@ if ($version['versionNumber'] < 3007004) { --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); define('TIMENOW', time()); echo "Creating Table\n"; diff --git a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt index c4d88c6..90fbd9d 100644 --- a/ext/sqlite3/tests/sqlite3_36_create_collation.phpt +++ b/ext/sqlite3/tests/sqlite3_36_create_collation.phpt @@ -1,11 +1,11 @@ --TEST-- Test SQLite3::createCollation() by adding strnatcmp() as an SQL COLLATE sequence --SKIPIF-- -<?php require_once dirname(__FILE__) . '/skipif.inc'; ?> +<?php require_once __DIR__ . '/skipif.inc'; ?> --FILE-- <?php -require_once dirname(__FILE__) . '/new_db.inc'; +require_once __DIR__ . '/new_db.inc'; $db->createCollation('NAT', 'strnatcmp'); diff --git a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt index 321f883..d04e596 100644 --- a/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt +++ b/ext/sqlite3/tests/sqlite3_bind_bug68849.phpt @@ -1,7 +1,7 @@ --TEST-- Bug #68849 bindValue is not using the right data type --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt index 108956b..c35af94 100644 --- a/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt +++ b/ext/sqlite3/tests/sqlite3_blob_bind_resource.phpt @@ -1,12 +1,12 @@ --TEST-- SQLite3::execute() with a resource bound for blob param --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); -require_once(dirname(__FILE__) . '/stream_test.inc'); +require_once(__DIR__ . '/new_db.inc'); +require_once(__DIR__ . '/stream_test.inc'); var_dump($db->exec('CREATE TABLE test (id STRING, data BLOB)')); $insert_stmt = $db->prepare("INSERT INTO test (id, data) VALUES (1, ?)"); diff --git a/ext/sqlite3/tests/sqlite3_close_error.phpt b/ext/sqlite3/tests/sqlite3_close_error.phpt index d242352..dad8cb9 100644 --- a/ext/sqlite3/tests/sqlite3_close_error.phpt +++ b/ext/sqlite3/tests/sqlite3_close_error.phpt @@ -4,7 +4,7 @@ SQLite3::close parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_close_with_params.phpt b/ext/sqlite3/tests/sqlite3_close_with_params.phpt index 98e0483..6e44dbf 100644 --- a/ext/sqlite3/tests/sqlite3_close_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_close_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::close test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt index ebb59eb..767f9d0 100644 --- a/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt +++ b/ext/sqlite3/tests/sqlite3_enable_exceptions.phpt @@ -4,7 +4,7 @@ SQLite3::enableExceptions test Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt index c94b521..c3af188 100644 --- a/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_exec_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::exec test, testing for wrong type parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt b/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt index 243392b..281adb4 100644 --- a/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_lasterrorcode_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::lastErrorCode test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt b/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt index c2fa35d..1d4c6d3 100644 --- a/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_lasterrormsg_with_params.phpt @@ -4,7 +4,7 @@ SQLite3::lastErrorMsg test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt index 9811f86..d3f9064 100644 --- a/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt +++ b/ext/sqlite3/tests/sqlite3_loadextension_with_wrong_param.phpt @@ -4,7 +4,7 @@ SQLite3::loadExtension test with wrong parameter type Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt index 940056b..c183269 100644 --- a/ext/sqlite3/tests/sqlite3_open_empty_string.phpt +++ b/ext/sqlite3/tests/sqlite3_open_empty_string.phpt @@ -4,7 +4,7 @@ SQLite3::open test with empty string argument via the constructor Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(''); diff --git a/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt index 439e397..03242d9 100644 --- a/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_openblob_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::blobOpen test, testing stream with wrong parameter count Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php class SQLite3_Test_Stream diff --git a/ext/sqlite3/tests/sqlite3_prepare_001.phpt b/ext/sqlite3/tests/sqlite3_prepare_001.phpt index f9e5fad..baf0c83 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_001.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_001.phpt @@ -1,7 +1,7 @@ --TEST-- SQLite3 - memory leak on SQLite3Result and SQLite3Stmt --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt index 5cdf322..2793e5f 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_faultystmt.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test, testing for faulty statement Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt index dea7d91..391bc54 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_with_empty_string.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test with empty string argument Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt b/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt index b7eb564..3010e32 100644 --- a/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt +++ b/ext/sqlite3/tests/sqlite3_prepare_wrongparams.phpt @@ -4,7 +4,7 @@ SQLite3::prepare test, testing for wrong parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt b/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt index d04fb66..779d254 100644 --- a/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt +++ b/ext/sqlite3/tests/sqlite3_prepared_stmt_clear_with_params.phpt @@ -4,7 +4,7 @@ SQLite3Stmt::clear test with parameters Thijs Feryn <thijs@feryn.eu> #TestFest PHPBelgium 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_query_error.phpt b/ext/sqlite3/tests/sqlite3_query_error.phpt index ab7f700..f5d64fd 100644 --- a/ext/sqlite3/tests/sqlite3_query_error.phpt +++ b/ext/sqlite3/tests/sqlite3_query_error.phpt @@ -4,7 +4,7 @@ SQLite3::query parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt index 85889c7..9d19dbe 100644 --- a/ext/sqlite3/tests/sqlite3_querysingle_error.phpt +++ b/ext/sqlite3/tests/sqlite3_querysingle_error.phpt @@ -4,7 +4,7 @@ SQLite3::query parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3_version_noparam.phpt b/ext/sqlite3/tests/sqlite3_version_noparam.phpt index 19d6ec5..2b8e77b 100644 --- a/ext/sqlite3/tests/sqlite3_version_noparam.phpt +++ b/ext/sqlite3/tests/sqlite3_version_noparam.phpt @@ -4,7 +4,7 @@ SQLite3::version test, testing for missing function parameters Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php diff --git a/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt b/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt index cb49b75..657d19f 100644 --- a/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt +++ b/ext/sqlite3/tests/sqlite3result_fetcharray_with_two_params_fails.phpt @@ -4,7 +4,7 @@ SQLite3Result::fetchArray() test, testing two params causes a failure Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt b/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt index 5f8306c..52ab6ef 100644 --- a/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt +++ b/ext/sqlite3/tests/sqlite3result_numcolumns_error.phpt @@ -4,7 +4,7 @@ SQLite3Result::numColumns parameters Jachim Coudenys # TestFest 2009 Belgium --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt b/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt index b397ac6..2c263ba 100644 --- a/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt +++ b/ext/sqlite3/tests/sqlite3result_reset_with_params_fails.phpt @@ -4,7 +4,7 @@ SQLite3Result::reset test, testing an exception is raised when calling reset wit Michelangelo van Dam # Belgian PHP Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:'); diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt index a4b29e3..97ef1f7 100644 --- a/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_basic.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3Stmt::paramCount basic test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE foobar (id INTEGER, name STRING, city STRING)')); diff --git a/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt b/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt index 2aac6c2..64016db 100644 --- a/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_paramCount_error.phpt @@ -1,11 +1,11 @@ --TEST-- SQLite3Stmt::paramCount error test --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php -require_once(dirname(__FILE__) . '/new_db.inc'); +require_once(__DIR__ . '/new_db.inc'); echo "Creating Table\n"; var_dump($db->exec('CREATE TABLE foobar (id INTEGER, name STRING, city STRING)')); diff --git a/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt b/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt index b0dfc20..f2fa74a 100644 --- a/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt +++ b/ext/sqlite3/tests/sqlite3stmt_reset_params.phpt @@ -4,7 +4,7 @@ SQLite3Stmt::reset with parameter test Jelle Lampaert #Belgian Testfest 2009 --SKIPIF-- -<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?> +<?php require_once(__DIR__ . '/skipif.inc'); ?> --FILE-- <?php $db = new SQLite3(':memory:');