From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 2 Sep 2016 22:55:12 +0000 (+0200)
Subject: Replace `dirname(__FILE__)` with `__DIR__` in tests
X-Git-Tag: php-7.2.0alpha1~1363
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c91684394e009fa6e036d8be062bfb3ae36179d;p=php

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

diff --git a/ext/sqlite3/tests/bug45798.phpt b/ext/sqlite3/tests/bug45798.phpt
index 1beacc4910..9637c1fc9b 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 f8ffa289f5..7d91e1a14e 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 dcfc13d5ba..3d907811c1 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 ad9b147d9d..e77ba38a4b 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 11c482722b..f5cc452f0f 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 5a1aa719d3..913df09ad2 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 b9b49530b3..87f4b91625 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 7a9fedabcf..1a0690a000 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 4a84fdd3f8..3ce7d9cf8b 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 b35e7c1378..9ce50c4789 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 403adbbf41..710813e8f5 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 7a3d950f55..d9a2408123 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 d6a326cfbd..061b8a02e0 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 ccc6a8b07f..994503dd03 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 35852ba117..712ad2e539 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 8e2d428419..44fb533974 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 2bfd0af9e7..eac5a59a8a 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 573d87fe76..daeacc0832 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 8cfe089f27..0c8aefb14f 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 de9fdefdbf..0f2330e596 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 4550057e94..117358ecc1 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 6802db3e0a..4de4a85e9d 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 4451bdf716..7f243b78d5 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 d98644ab2a..a9324c3999 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 a667a1234c..5221807cd5 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 091dcd4a59..52a533d542 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 4091ff8ae0..6552c222a7 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 83d0a292f8..52752e52e7 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 6626ed687f..1eef6662c5 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 eda1bd5f22..ffd05d3329 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 ea7e8bfba0..646cb473f3 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 77a69b3114..a17e1fb3f1 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 9448b30ade..6ea000adcd 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 ed51153784..1daa4b1ffb 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 1667b3484a..589a498f30 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 b30266b7ee..47a08f25fa 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 0aad451270..52666fd889 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 8a05c57531..3c30bdb664 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 c696ef9dfc..049a774c82 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 7a1bb2831a..fe7c8fb75a 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 b7b418c47c..716ec9dc36 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 5f513fb681..531874ceb6 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 1d2721bd37..20ad370bc3 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 0c542a1632..23392e5a51 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 c4d88c69f7..90fbd9d37b 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 321f883a8e..d04e596b50 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 108956b87b..c35af945db 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 d242352872..dad8cb9937 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 98e0483ea1..6e44dbf1a7 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 ebb59eb2b0..767f9d0065 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 c94b521dce..c3af18865c 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 243392b318..281adb49c0 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 c2fa35d954..1d4c6d3783 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 9811f86e6a..d3f90642c9 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 940056bf0a..c1832694a7 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 439e397787..03242d935b 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 f9e5fadce7..baf0c83025 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 5cdf322a96..2793e5f746 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 dea7d91226..391bc54dd3 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 b7eb564e19..3010e32447 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 d04fb66e56..779d254671 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 ab7f700d92..f5d64fd837 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 85889c755a..9d19dbea7d 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 19d6ec5a33..2b8e77b05f 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 cb49b75539..657d19f961 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 5f8306cb2d..52ab6efca8 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 b397ac6730..2c263baaa5 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 a4b29e3434..97ef1f7aba 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 2aac6c2108..64016db6da 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 b0dfc20456..f2fa74ada1 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:');