18 files changed, 33 insertions, 33 deletions
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php
index 987de5cbff..533416f14b 100644
--- a/tests/dbal/select_test.php
+++ b/tests/dbal/select_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_select_test extends phpbb_database_test_case
 {
diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php
index a24b6efcc4..4709d45fa5 100644
--- a/tests/dbal/write_test.php
+++ b/tests/dbal/write_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_dbal_write_test extends phpbb_database_test_case
 {
diff --git a/tests/network/checkdnsrr_test.php b/tests/network/checkdnsrr_test.php
index 9410deaf64..5a756dcef8 100644
--- a/tests/network/checkdnsrr_test.php
+++ b/tests/network/checkdnsrr_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 /**
 * @group slow
diff --git a/tests/random/gen_rand_string_test.php b/tests/random/gen_rand_string_test.php
index fa519f134c..115c55e4e2 100644
--- a/tests/random/gen_rand_string_test.php
+++ b/tests/random/gen_rand_string_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_random_gen_rand_string_test extends phpbb_test_case
 {
diff --git a/tests/regex/censor_test.php b/tests/regex/censor_test.php
index 93c761c8d0..fa9104e71d 100644
--- a/tests/regex/censor_test.php
+++ b/tests/regex/censor_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_censor_test extends phpbb_test_case
 {
diff --git a/tests/regex/email_test.php b/tests/regex/email_test.php
index 5d6e207cbb..0695b801d5 100644
--- a/tests/regex/email_test.php
+++ b/tests/regex/email_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_email_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv4_test.php b/tests/regex/ipv4_test.php
index 735a2c4384..9829547508 100644
--- a/tests/regex/ipv4_test.php
+++ b/tests/regex/ipv4_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv4_test extends phpbb_test_case
 {
diff --git a/tests/regex/ipv6_test.php b/tests/regex/ipv6_test.php
index 187588f861..1b2018403c 100644
--- a/tests/regex/ipv6_test.php
+++ b/tests/regex/ipv6_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_ipv6_test extends phpbb_test_case
 {
diff --git a/tests/regex/url_test.php b/tests/regex/url_test.php
index 246cbf549c..c3a336063a 100644
--- a/tests/regex/url_test.php
+++ b/tests/regex/url_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
 
 class phpbb_regex_url_test extends phpbb_test_case
 {
diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php
index 0901b43920..fa17b1909f 100644
--- a/tests/request/request_var_test.php
+++ b/tests/request/request_var_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_request_request_var_test extends phpbb_test_case
 {
diff --git a/tests/security/extract_current_page_test.php b/tests/security/extract_current_page_test.php
index ff0ab4d1bb..71c7a3a397 100644
--- a/tests/security/extract_current_page_test.php
+++ b/tests/security/extract_current_page_test.php
@@ -7,10 +7,10 @@
 *
 */
 
-require_once __DIR__ . '/base.php';
+require_once dirname(__FILE__) . '/base.php';
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_extract_current_page_test extends phpbb_security_test_base
 {
diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php
index c53414e7df..70ba8527b1 100644
--- a/tests/security/redirect_test.php
+++ b/tests/security/redirect_test.php
@@ -7,10 +7,10 @@
 *
 */
 
-require_once __DIR__ . '/base.php';
+require_once dirname(__FILE__) . '/base.php';
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/session.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
 
 class phpbb_security_redirect_test extends phpbb_security_test_base
 {
diff --git a/tests/template/template_test.php b/tests/template/template_test.php
index 35df17e4c6..1b2f35f210 100644
--- a/tests/template/template_test.php
+++ b/tests/template/template_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/template.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/template.php';
 
 class phpbb_template_template_test extends phpbb_test_case
 {
diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php
index a325855da4..32d2696f1c 100644
--- a/tests/test_framework/phpbb_database_test_case.php
+++ b/tests/test_framework/phpbb_database_test_case.php
@@ -111,9 +111,9 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 				'dbpasswd'	=> isset($_SERVER['PHPBB_TEST_DBPASSWD']) ? $_SERVER['PHPBB_TEST_DBPASSWD'] : '',
 			);
 		}
-		else if (file_exists(__DIR__ . '/../test_config.php'))
+		else if (file_exists(dirname(__FILE__) . '/../test_config.php'))
 		{
-			include(__DIR__ . '/../test_config.php');
+			include(dirname(__FILE__) . '/../test_config.php');
 
 			return array(
 				'dbms'		=> $dbms,
@@ -129,7 +129,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			// Silently use sqlite
 			return array(
 				'dbms'		=> 'sqlite',
-				'dbhost'	=> __DIR__ . '/../phpbb_unit_tests.sqlite2', // filename
+				'dbhost'	=> dirname(__FILE__) . '/../phpbb_unit_tests.sqlite2', // filename
 				'dbport'	=> '',
 				'dbname'	=> '',
 				'dbuser'	=> '',
@@ -340,7 +340,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 			}
 		}
 
-		$sql = $this->split_sql_file(file_get_contents(__DIR__ . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
+		$sql = $this->split_sql_file(file_get_contents(dirname(__FILE__) . "/../../phpBB/install/schemas/{$dbms['SCHEMA']}_schema.sql"), $config['dbms']);
 
 		foreach ($sql as $query)
 		{
@@ -376,7 +376,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
 
 		$config = $this->get_database_config();
 
-		require_once __DIR__ . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
+		require_once dirname(__FILE__) . '/../../phpBB/includes/db/' . $config['dbms'] . '.php';
 		$dbal = 'dbal_' . $config['dbms'];
 		$db = new $dbal();
 		$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
diff --git a/tests/text_processing/make_clickable_test.php b/tests/text_processing/make_clickable_test.php
index 75a35daf82..29b982d709 100644
--- a/tests/text_processing/make_clickable_test.php
+++ b/tests/text_processing/make_clickable_test.php
@@ -7,8 +7,8 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/functions.php';
-require_once __DIR__ . '/../../phpBB/includes/functions_content.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
 
 class phpbb_text_processing_make_clickable_test extends phpbb_test_case
 {
diff --git a/tests/utf/normalizer_test.php b/tests/utf/normalizer_test.php
index 9a9011c0fe..38b4ec1b6b 100644
--- a/tests/utf/normalizer_test.php
+++ b/tests/utf/normalizer_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_normalizer.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_normalizer.php';
 
 /**
 * @group slow
@@ -16,8 +16,8 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 {
 	static public function setUpBeforeClass()
 	{
-		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', __DIR__.'/data');
-		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', __DIR__.'/data');
+		self::download('http://www.unicode.org/Public/UNIDATA/NormalizationTest.txt', dirname(__FILE__).'/data');
+		self::download('http://www.unicode.org/Public/UNIDATA/UnicodeData.txt', dirname(__FILE__).'/data');
 	}
 
 	public function test_normalizer()
@@ -62,7 +62,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 
 		$tested_chars = array();
 
-		$fp = fopen(__DIR__.'/data/NormalizationTest.txt', 'rb');
+		$fp = fopen(dirname(__FILE__).'/data/NormalizationTest.txt', 'rb');
 		while (!feof($fp))
 		{
 			$line = fgets($fp);
@@ -117,7 +117,7 @@ class phpbb_utf_normalizer_test extends phpbb_test_case
 	*/
 	public function test_invariants(array $tested_chars)
 	{
-		$fp = fopen(__DIR__.'/data/UnicodeData.txt', 'rb');
+		$fp = fopen(dirname(__FILE__).'/data/UnicodeData.txt', 'rb');
 
 		while (!feof($fp))
 		{
diff --git a/tests/utf/utf8_clean_string_test.php b/tests/utf/utf8_clean_string_test.php
index 148297ad4b..e5a771eafa 100644
--- a/tests/utf/utf8_clean_string_test.php
+++ b/tests/utf/utf8_clean_string_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
 {
diff --git a/tests/utf/utf8_wordwrap_test.php b/tests/utf/utf8_wordwrap_test.php
index fbc947b92a..03fa9dc38c 100644
--- a/tests/utf/utf8_wordwrap_test.php
+++ b/tests/utf/utf8_wordwrap_test.php
@@ -7,7 +7,7 @@
 *
 */
 
-require_once __DIR__ . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
 
 class phpbb_utf_utf8_wordwrap_test extends phpbb_test_case
 {