Replace dirname(__FILE__) by __DIR__ in tests

10 files changed, 18 insertions, 18 deletions

diff --git a/ext/curl/tests/bug48203.phpt b/ext/curl/tests/bug48203.phpt
index 5973d8a390..185b75ed3d 100644
--- a/ext/curl/tests/bug48203.phpt
+++ b/ext/curl/tests/bug48203.phpt
@@ -5,7 +5,7 @@ Bug #48203 (Crash when CURLOPT_STDERR is set to regular file)
 --FILE--
 <?php
 include 'server.inc';
-$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w');
+$fp = fopen(__DIR__ . '/bug48203.tmp', 'w');
 
 $ch = curl_init();
 
@@ -22,7 +22,7 @@ echo "Ok\n";
 
 ?>
 --CLEAN--
-<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?>
+<?php @unlink(__DIR__ . '/bug48203.tmp'); ?>
 --EXPECTF--
 Warning: curl_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d
 %A
diff --git a/ext/curl/tests/bug48203_multi.phpt b/ext/curl/tests/bug48203_multi.phpt
index 5f9e2ba6b2..21eb1fb14f 100644
--- a/ext/curl/tests/bug48203_multi.phpt
+++ b/ext/curl/tests/bug48203_multi.phpt
@@ -8,7 +8,7 @@ include 'skipif.inc';
 <?php
 include 'server.inc';
 function checkForClosedFilePointer($target_url, $curl_option, $description) {
-	$fp = fopen(dirname(__FILE__) . '/bug48203.tmp', 'w');
+	$fp = fopen(__DIR__ . '/bug48203.tmp', 'w');
 
 	$ch1 = curl_init();
 	$ch2 = curl_init();
@@ -65,7 +65,7 @@ foreach($options_to_check as $option) {
 
 ?>
 --CLEAN--
-<?php @unlink(dirname(__FILE__) . '/bug48203.tmp'); ?>
+<?php @unlink(__DIR__ . '/bug48203.tmp'); ?>
 --EXPECTF--
 Warning: curl_multi_exec(): CURLOPT_STDERR resource has gone away, resetting to stderr in %s on line %d
 
diff --git a/ext/curl/tests/bug54798-unix.phpt b/ext/curl/tests/bug54798-unix.phpt
index c6040a68e2..dc5aad7525 100644
--- a/ext/curl/tests/bug54798-unix.phpt
+++ b/ext/curl/tests/bug54798-unix.phpt
@@ -11,7 +11,7 @@ if(substr(PHP_OS, 0, 3) == 'WIN' ) {
 <?php
 
 function checkForClosedFilePointer($host, $curl_option, $description) {
-	$fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+');
+	$fp = fopen(__DIR__ . '/bug54798.tmp', 'w+');
 
 	$ch = curl_init();
 
@@ -54,7 +54,7 @@ foreach($options_to_check as $option) {
 ?>
 ===DONE===
 --CLEAN--
-<?php @unlink(dirname(__FILE__) . '/bug54798.tmp'); ?>
+<?php @unlink(__DIR__ . '/bug54798.tmp'); ?>
 --EXPECTF--
 %a
 %aOk for CURLOPT_STDERR
diff --git a/ext/curl/tests/bug54798.phpt b/ext/curl/tests/bug54798.phpt
index 35af8d0750..d76674318a 100644
--- a/ext/curl/tests/bug54798.phpt
+++ b/ext/curl/tests/bug54798.phpt
@@ -8,7 +8,7 @@ include 'skipif.inc';
 <?php
 
 function checkForClosedFilePointer($host, $curl_option, $description) {
-	$fp = fopen(dirname(__FILE__) . '/bug54798.tmp', 'w+');
+	$fp = fopen(__DIR__ . '/bug54798.tmp', 'w+');
 
 	$ch = curl_init();
 
@@ -51,7 +51,7 @@ foreach($options_to_check as $option) {
 ?>
 ===DONE===
 --CLEAN--
-<?php @unlink(dirname(__FILE__) . '/bug54798.tmp'); ?>
+<?php @unlink(__DIR__ . '/bug54798.tmp'); ?>
 --EXPECTF--
 %AOk for CURLOPT_STDERR
 
diff --git a/ext/curl/tests/bug61948.phpt b/ext/curl/tests/bug61948.phpt
index b8fda6d83c..316fa4d0e7 100644
--- a/ext/curl/tests/bug61948.phpt
+++ b/ext/curl/tests/bug61948.phpt
@@ -5,7 +5,7 @@ Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 ?>
 --FILE--
 <?php
-  $base_dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug61948";
+  $base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948";
   mkdir($base_dir . DIRECTORY_SEPARATOR . "foo", 0755, true);
 
   ini_set("open_basedir", $base_dir);
@@ -18,7 +18,7 @@ Bug #61948 (CURLOPT_COOKIEFILE '' raises open_basedir restriction)
 ?>
 --CLEAN--
 <?php
-	$base_dir = dirname(__FILE__) . DIRECTORY_SEPARATOR . "bug61948";
+	$base_dir = __DIR__ . DIRECTORY_SEPARATOR . "bug61948";
 	rmdir("$base_dir/foo");
 	rmdir($base_dir);
 ?>
diff --git a/ext/curl/tests/bug67643.phpt b/ext/curl/tests/bug67643.phpt
index ad59f2c12c..24cdb86a28 100644
--- a/ext/curl/tests/bug67643.phpt
+++ b/ext/curl/tests/bug67643.phpt
@@ -7,7 +7,7 @@ if (!extension_loaded('curl')) print 'skip';
 --FILE--
 <?php
  	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, 'file://'. dirname(__FILE__) . DIRECTORY_SEPARATOR .'curl_testdata1.txt');
+	curl_setopt($ch, CURLOPT_URL, 'file://'. __DIR__ . DIRECTORY_SEPARATOR .'curl_testdata1.txt');
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, false);
 
 	$mh = curl_multi_init();
diff --git a/ext/curl/tests/bug69316.phpt b/ext/curl/tests/bug69316.phpt
index 082b565d45..38ff8bb9b6 100644
--- a/ext/curl/tests/bug69316.phpt
+++ b/ext/curl/tests/bug69316.phpt
@@ -18,7 +18,7 @@ Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEA
 
   include 'server.inc';
   $host = curl_cli_server_start();
-  $temp_file = dirname(__FILE__) . '/body.tmp';
+  $temp_file = __DIR__ . '/body.tmp';
   $url = "{$host}/get.inc?test=getpost";
   $ch = curl_init();
   $f_file = fopen($temp_file, "w") or die("failed to open file\n");
@@ -32,7 +32,7 @@ Bug #69316: Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEA
 ===DONE===
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/body.tmp');
+unlink(__DIR__ . '/body.tmp');
 ?>
 --EXPECTF--
 Warning: curl_exec(): CURLOPT_FILE resource has gone away, resetting to default in %s on line %d
diff --git a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
index 5e806add08..92eba5e8c3 100644
--- a/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
+++ b/ext/curl/tests/curl_file_deleted_before_curl_close.phpt
@@ -11,7 +11,7 @@ include 'server.inc';
 $host = curl_cli_server_start();
 $ch = curl_init($host);
 
-$temp_file = dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp';
+$temp_file = __DIR__ . '/curl_file_deleted_before_curl_close.tmp';
 if (file_exists($temp_file)) {
 	unlink($temp_file); // file should not exist before test
 }
@@ -33,7 +33,7 @@ echo "Closed correctly\n";
 ?>
 --CLEAN--
 <?php
-unlink(dirname(__FILE__) . '/curl_file_deleted_before_curl_close.tmp');
+unlink(__DIR__ . '/curl_file_deleted_before_curl_close.tmp');
 ?>
 --EXPECT--
 Closed correctly
diff --git a/ext/curl/tests/curl_multi_getcontent_basic3.phpt b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
index 357f503a03..f67196d7e7 100644
--- a/ext/curl/tests/curl_multi_getcontent_basic3.phpt
+++ b/ext/curl/tests/curl_multi_getcontent_basic3.phpt
@@ -17,7 +17,7 @@ Rein Velt (rein@velt.org)
     include 'server.inc';
     $host = curl_cli_server_start();
 	curl_setopt($ch1, CURLOPT_URL, "{$host}/get.inc?test=getpost&get_param=Hello%20World");
-	curl_setopt($ch2, CURLOPT_URL, "file://".dirname(__FILE__). DIRECTORY_SEPARATOR . "curl_testdata2.txt");
+	curl_setopt($ch2, CURLOPT_URL, "file://".__DIR__. DIRECTORY_SEPARATOR . "curl_testdata2.txt");
 	curl_setopt($ch1, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch2, CURLOPT_RETURNTRANSFER, true);
 
diff --git a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
index 92c80d1732..32af88fb20 100644
--- a/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
+++ b/ext/curl/tests/curl_setopt_CURLOPT_READFUNCTION.phpt
@@ -19,7 +19,7 @@ function custom_readfunction($oCurl, $hReadHandle, $iMaxOut)
   return $sData;
 }
 
-$sFileBase  = dirname(__FILE__).DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION';
+$sFileBase  = __DIR__.DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION';
 $sReadFile  = $sFileBase.'_in.tmp';
 $sWriteFile = $sFileBase.'_out.tmp';
 $sWriteUrl  = 'file://'.$sWriteFile;
@@ -43,7 +43,7 @@ var_dump($sOutput);
 ===DONE===
 --CLEAN--
 <?php
-$sFileBase  = dirname(__FILE__).DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION';
+$sFileBase  = __DIR__.DIRECTORY_SEPARATOR.'curl_opt_CURLOPT_READFUNCTION';
 $sReadFile  = $sFileBase.'_in.tmp';
 $sWriteFile = $sFileBase.'_out.tmp';
 unlink($sReadFile);