Replace `dirname(__FILE__)` with `__DIR__` in tests

diff --git a/ext/sqlite3/tests/bug45798.phpt b/ext/sqlite3/tests/bug45798.phpt
index 1beacc491029bdff159110cc5483010285820f36..9637c1fc9baa89196874431dc9089600c5983dc0 100644 (file)
--- 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 f8ffa289f59149a509105981975be74d746ff012..7d91e1a14e366ea5c4cf7e02187116d82a4f9f32 100644 (file)
--- 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 dcfc13d5ba1b4e4f32042a16ca46ae560c8ccbd0..3d907811c19202d15289099507963fccd2b6a011 100644 (file)
--- 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 ad9b147d9dfd22a3314e45ce82880342f3d43c1c..e77ba38a4bfb037d99b85481b8698ddad1a9311f 100644 (file)
--- 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 11c482722bc1b4964e5ab0fcf416433ae7ed38cf..f5cc452f0f302721a086aa0cec87ce11b58d9c7c 100644 (file)
--- 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 5a1aa719d35c0e62ac46575d18fb8a0c8025eb08..913df09ad21962a3c53b76911b222ee358855ffa 100644 (file)
--- 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 b9b49530b3f8613645970623341f592c37bf5b10..87f4b91625914ed675e4324adb59d413ce97e95f 100644 (file)
--- 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 7a9fedabcfdab5d37cc8de2f3724231a718fcb31..1a0690a000c798e513acba87bd3b7a4d9d6d1ba3 100644 (file)
--- 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 4a84fdd3f848c932788502f5f8f781eab8e97a8e..3ce7d9cf8b3b3e003fbdc187123f8beac7c2b804 100644 (file)
--- 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 b35e7c13788c4bcc2bdd70dc98ab604c2e976c7d..9ce50c4789e48ce7e70f0ceee48004447836426c 100644 (file)
--- 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 403adbbf41d3a7bcac29c723a30749a6036da379..710813e8f5ee4d4a43fdd313d97797a06465bbe2 100644 (file)
--- 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 7a3d950f55eb190b5bfd12b0dbceb884cb93c6ab..d9a2408123acf3ae2ae31dc07b9cdbc283181034 100644 (file)
--- 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 d6a326cfbdc53c8f8caf7e3f8a50debf831876fb..061b8a02e0030d9ad0401bc65f5118ea0d0ef8dc 100644 (file)
--- 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 ccc6a8b07fd775618693849cd1711aa05cda3a32..994503dd03ad2ba536e90cbe4024752ec14a7071 100644 (file)
--- 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 35852ba1173900fb2b5f29e68a1394e20e746869..712ad2e5393059fbdc893e1e7f08fdf74cb2a475 100644 (file)
--- 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 8e2d428419f2515fa390b185018ea440725dbd88..44fb533974c67e4ddbf42cc19de150cb17c5e47e 100644 (file)
--- 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 2bfd0af9e7275c6ea2cb29804742cbfc63ff3364..eac5a59a8a0f25e215d16b7a4eaa2c8da388b53f 100644 (file)
--- 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 573d87fe7654f8c7aeaf5cec9428b497545c3ef9..daeacc083206de1985c240dcb0e0b45f4a0eeb4d 100644 (file)
--- 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 8cfe089f27b793d9a087b6a202a73a14a9a719f1..0c8aefb14f9f57a7fd3e76871a91c7571a384c5c 100644 (file)
--- 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 de9fdefdbfb297504de2a0a74d78f28b46b4b3d9..0f2330e5968fab1eaea02cb0c9bd727d4c6a8652 100644 (file)
--- 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 4550057e940b0cf83ca1974f5e729bc4db2e1e3b..117358ecc1a9e73b1452dfb9666d3fceb3fae34a 100644 (file)
--- 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 6802db3e0a7a281b9dde0426cc6ddd965e1c496a..4de4a85e9ddd3fb4e504103b95f618a73a142808 100644 (file)
--- 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 4451bdf71619ff58f9e0fd0468bf50ac6d0a37a7..7f243b78d531da2e8539854eb7bf4eed3b0413a9 100644 (file)
--- 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 d98644ab2a9d6d8f5f57a5dab56170d263ba2ad8..a9324c3999165d73145b48c2bf998e76dc8d5d0c 100644 (file)
--- 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 a667a1234c58294bd8784572f59770df826a083e..5221807cd588bf5e75bdb4a1205c3856a94c5413 100644 (file)
--- 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 091dcd4a59661a3c00e59560130dff857102ce0a..52a533d542aa37867b0095dd897d4de197d6139b 100644 (file)
--- 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 4091ff8ae0b5c364cd77ba46f4818ae03c7577b5..6552c222a73e89868808996e77f80d42d73fc431 100644 (file)
--- 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 83d0a292f80f5039c2d49bc104076ecdfdadac97..52752e52e701bf43c83540b8758f61f2260675e0 100644 (file)
--- 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 6626ed687f2d2b949a5f20f584dc79ca96461e09..1eef6662c5f86c6ee35f4e5e9eaddd196fc67f4a 100644 (file)
--- 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 eda1bd5f22656fab19921bfbc17e901207d4df66..ffd05d3329ce96b72809abc9e794550ddac3cb01 100644 (file)
--- 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 ea7e8bfba03976affdcb109b78e7b2b117630170..646cb473f3217a217b0026aacefdaedf75b0429a 100644 (file)
--- 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 77a69b3114095a611c43835f98fada1a76fc9823..a17e1fb3f18bba2c9d52b213bbd5380b0bb0cf95 100644 (file)
--- 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 9448b30ade8b79179facb59ed2b350b99b96e2bb..6ea000adcd2cabb2c6dbf4c84617e94cd1c61cb1 100644 (file)
--- 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 ed5115378478ccceef054202728cb3a4ff87b05f..1daa4b1ffb4240ad42989bd223ec58f07d8e2a19 100644 (file)
--- 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 1667b3484a6afb2b25357b787d8a0a46ff2a96f1..589a498f304969c1a9a141b8a6a02c500ced4b7a 100644 (file)
--- 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 b30266b7eeeae786c57f2429740a967c3ee01770..47a08f25faa4fe0c4f7eb57a2324e12b1b9206c9 100644 (file)
--- 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 0aad451270b59e9b31312a7194da83b26770b866..52666fd889180601b0d1e3ddc9c03438495987d8 100644 (file)
--- 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 8a05c5753182a504da2c755c6661ad8530a15eed..3c30bdb664836a3515b260810028985761d03dad 100644 (file)
--- 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 c696ef9dfcdf892dc7b5ab3dbe404a51d7afbcde..049a774c82bff9429995d4aa3d1d9eb0f8d3cecc 100644 (file)
--- 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 7a1bb2831a02c1896ee7314fab7ec212bd583019..fe7c8fb75a05ce15d51f0fec8919e30a20670024 100644 (file)
--- 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 b7b418c47c81741f8470ff2895d7b2ab7c6b5a4f..716ec9dc367f4cd148d409bff7f29cb010e25c12 100644 (file)
--- 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 5f513fb6812b0f57a0c2be51ab67b87f8389fb3e..531874ceb6024491e33a66f123cb2e9d36a80afe 100644 (file)
--- 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 1d2721bd37e2510c58fce200e7155ebabd63846b..20ad370bc3b64baf53d617b3171591f6a3b92627 100644 (file)
--- 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 0c542a16328e3601fd1c3afe6df2d31917157754..23392e5a5127ebf065f2338abb861a500339bb4e 100644 (file)
--- 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 c4d88c69f7bf6043b2069e4f4bc814080bd4c53f..90fbd9d37b0e99f8f21f8e89a9570a4e8b4e770f 100644 (file)
--- 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 321f883a8ec613f6faa3106a2e54a5490fb0e5d9..d04e596b507a2f5de2100c03459777f33dd64c79 100644 (file)
--- 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 108956b87bb13613b0b9d41c11994ef0d842cf3d..c35af945dbb92dcf4380bd9c98cada9c229e9c08 100644 (file)
--- 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 d24235287280f053d5bba01c60684a7556d952dd..dad8cb99371c674ee5ea8370895564a9bd681216 100644 (file)
--- 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 98e0483ea1617f5802908433fa9a6634f4a66800..6e44dbf1a733ec764c472ac053e3eedb685fafa0 100644 (file)
--- 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 ebb59eb2b051df9ca69bacccbe30acc6a15a161a..767f9d00650d4375e54759dced9ad3b05a213ea3 100644 (file)
--- 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 c94b521dce63bb0a2c041f1927a48bba746bea66..c3af18865cc57fe1d01f6fc53e84b2efb1cf5298 100644 (file)
--- 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 243392b318287c48afcf78f274da1bffd47cdcd0..281adb49c0adef10fb1e2fe37cf8f81114e60a82 100644 (file)
--- 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 c2fa35d954c0307a0c5da58a6cd97b69d7e3aff0..1d4c6d378371ad1ce01d44595b5ec268392639ae 100644 (file)
--- 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 9811f86e6aa57bdce87938945a557ed542760cbd..d3f90642c93bb0237700460058d79f98267fede9 100644 (file)
--- 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 940056bf0aee3e530b2d1208317ce5f8e65091ca..c1832694a71f83fa00b292c744b33910acbf87dc 100644 (file)
--- 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 439e397787c5f4c3c0cb60fdb575e9c6ef823070..03242d935bc6855ffe2bdcd2ba12f32a2878cacc 100644 (file)
--- 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 f9e5fadce7ddd254d1e4dfbdc4b2dcaf141d490a..baf0c83025fdd0a76497330c60ff6a6c4b0a8d06 100644 (file)
--- 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 5cdf322a96a846ce2161d3d48340625a32e53bb1..2793e5f746a84d48358bd9edc7bc563bceaf7fdc 100644 (file)
--- 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 dea7d91226bef7344b2cb2a3b8fc01b34fa88131..391bc54dd3b6436afdf09beddf19f38e88208b4b 100644 (file)
--- 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 b7eb564e19e4d3988d741c0cd21a28e2d4b9f1ec..3010e324471663841d0ea64f21ed4d906df3c0f9 100644 (file)
--- 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 d04fb66e569664f29c691fbfb3a69caf530813bf..779d25467194b04f50fdf231e1f5ae82f18f33d2 100644 (file)
--- 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 ab7f700d92421a406eba355498bb0db546bd8905..f5d64fd83760eb81726a3c76155c79a604329305 100644 (file)
--- 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 85889c755aee66a3deb7852bbefb0ac8fa489c5c..9d19dbea7d3e340c8bb4197a227e283302925c70 100644 (file)
--- 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 19d6ec5a33a2328d4083195ed36b153461aea760..2b8e77b05fd06134ec7570a2d9492e0114247d09 100644 (file)
--- 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 cb49b75539a50052627da2ef563d4936ca3974e1..657d19f96181d5a8dbd2efa4d7c4af223de1fce5 100644 (file)
--- 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 5f8306cb2de4822fa1c4b25b2cf473c16226e43b..52ab6efca85128af6e1cdd90425ba94e3815f4ab 100644 (file)
--- 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 b397ac6730c52d3e536b5984a150b6d1072bed93..2c263baaa5cd00f3b7da6d4c0095d6a2c76bee3e 100644 (file)
--- 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 a4b29e34341a0b0a2abfccfa8523b4dff715cc31..97ef1f7aba60fa1b31cb452f6c0b21965785bf84 100644 (file)
--- 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 2aac6c210882823fcce4a5e4a4fe4bf85553940a..64016db6dad8ff93b61033f1ef24c3bae0ee54cf 100644 (file)
--- 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 b0dfc20456929ba2c392ef1efd51c78f8fbe9969..f2fa74ada12ded66b8c024c910047222efbe2326 100644 (file)
--- 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:');