summaryrefslogtreecommitdiff
path: root/ext/standard/tests/strings
diff options
context:
space:
mode:
Diffstat (limited to 'ext/standard/tests/strings')
-rw-r--r--ext/standard/tests/strings/fprintf_variation_001.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_002.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_003.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_003_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_004.phptbin594 -> 584 bytes
-rw-r--r--ext/standard/tests/strings/fprintf_variation_005.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_006.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_006_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_007.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_007_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_008.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_008_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/fprintf_variation_009.phpt2
-rw-r--r--ext/standard/tests/strings/get_meta_tags.phpt2
-rw-r--r--ext/standard/tests/strings/highlight_file.phpt2
-rw-r--r--ext/standard/tests/strings/implode1.phptbin5594 -> 5584 bytes
-rw-r--r--ext/standard/tests/strings/php_strip_whitespace.phpt2
-rw-r--r--ext/standard/tests/strings/sha1.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation17.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation23.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation30.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation36.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation42.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation48.phpt2
-rw-r--r--ext/standard/tests/strings/sprintf_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/trim.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic1.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic2.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic3.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic4.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic5.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic6.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic7.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic7_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic8.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_basic9.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation10.phptbin2974 -> 2964 bytes
-rw-r--r--ext/standard/tests/strings/vfprintf_variation11.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation11_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation12.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation12_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation13.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation13_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation14.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation14_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation15.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation15_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation16.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation16_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation17.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation18.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation19.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation19_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation20.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation21.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation3.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation4.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation4_64bit.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation5.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation6.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation7.phptbin2406 -> 2396 bytes
-rw-r--r--ext/standard/tests/strings/vfprintf_variation8.phpt2
-rw-r--r--ext/standard/tests/strings/vfprintf_variation9.phptbin1868 -> 1858 bytes
-rw-r--r--ext/standard/tests/strings/wordwrap.phpt2
65 files changed, 60 insertions, 60 deletions
diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt
index df81c249b6..c010aef3d4 100644
--- a/ext/standard/tests/strings/fprintf_variation_001.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_001.phpt
@@ -7,7 +7,7 @@ $float_variation = array( "%f","%-f", "%+f", "%7.2f", "%-7.2f", "%07.2f", "%-07.
$float_numbers = array( 0, 1, -1, 0.32, -0.32, 3.4. -3.4, 2.54, -2.54 );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_001.txt';
+$data_file = __DIR__ . '/fprintf_variation_001.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt
index 1cc1a4ddd7..f0f21b4630 100644
--- a/ext/standard/tests/strings/fprintf_variation_002.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_002.phpt
@@ -7,7 +7,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_002.txt';
+$data_file = __DIR__ . '/fprintf_variation_002.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt
index 1e8eb4706f..9e9779371e 100644
--- a/ext/standard/tests/strings/fprintf_variation_003.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_003.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_003.txt';
+$data_file = __DIR__ . '/fprintf_variation_003.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
index 26db7ab18b..bdb59d5021 100644
--- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_003_64bit.txt';
+$data_file = __DIR__ . '/fprintf_variation_003_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_004.phpt b/ext/standard/tests/strings/fprintf_variation_004.phpt
index aa47a298d8..103ca579f4 100644
--- a/ext/standard/tests/strings/fprintf_variation_004.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_004.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt
index 0be2cb6847..ddc4f70938 100644
--- a/ext/standard/tests/strings/fprintf_variation_005.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_005.phpt
@@ -6,7 +6,7 @@ Test fprintf() function (variation - 5)
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_005.txt';
+$data_file = __DIR__ . '/fprintf_variation_005.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt
index b48720c2d5..75846c2731 100644
--- a/ext/standard/tests/strings/fprintf_variation_006.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_006.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_006.txt';
+$data_file = __DIR__ . '/fprintf_variation_006.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
index 92ab010d03..a4c20f16f5 100644
--- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_006_64bit.txt';
+$data_file = __DIR__ . '/fprintf_variation_006_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt
index f2653a1ee1..e2102a53ab 100644
--- a/ext/standard/tests/strings/fprintf_variation_007.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_007.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_007.txt';
+$data_file = __DIR__ . '/fprintf_variation_007.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
index 9e30f91639..b4c80f95c5 100644
--- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt
@@ -10,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only");
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_007_64bit.txt';
+$data_file = __DIR__ . '/fprintf_variation_007_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt
index e8c0a9e412..dba49b47ba 100644
--- a/ext/standard/tests/strings/fprintf_variation_008.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_008.phpt
@@ -11,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_008.txt';
+$data_file = __DIR__ . '/fprintf_variation_008.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
index 661f2711f3..fae1ce3c2a 100644
--- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt
@@ -11,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2
$int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_008_64bit.txt';
+$data_file = __DIR__ . '/fprintf_variation_008_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt
index c16623ba8f..eb1780f0ce 100644
--- a/ext/standard/tests/strings/fprintf_variation_009.phpt
+++ b/ext/standard/tests/strings/fprintf_variation_009.phpt
@@ -7,7 +7,7 @@ $string_variation = array( "%5s", "%-5s", "%05s", "%'#5s" );
$strings = array( NULL, "abc", 'aaa' );
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/fprintf_variation_009.txt';
+$data_file = __DIR__ . '/fprintf_variation_009.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/get_meta_tags.phpt b/ext/standard/tests/strings/get_meta_tags.phpt
index cc29995046..406ceb2590 100644
--- a/ext/standard/tests/strings/get_meta_tags.phpt
+++ b/ext/standard/tests/strings/get_meta_tags.phpt
@@ -3,7 +3,7 @@ get_meta_tags() tests
--FILE--
<?php
-$filename = dirname(__FILE__)."/get_meta_tags.html";
+$filename = __DIR__."/get_meta_tags.html";
$data = <<<DATA
<meta name="author" content="name">
diff --git a/ext/standard/tests/strings/highlight_file.phpt b/ext/standard/tests/strings/highlight_file.phpt
index 10ea752291..02195e148f 100644
--- a/ext/standard/tests/strings/highlight_file.phpt
+++ b/ext/standard/tests/strings/highlight_file.phpt
@@ -11,7 +11,7 @@ allow_url_fopen=1
--FILE--
<?php
-$filename = dirname(__FILE__)."/highlight_file.dat";
+$filename = __DIR__."/highlight_file.dat";
var_dump(highlight_file($filename));
diff --git a/ext/standard/tests/strings/implode1.phpt b/ext/standard/tests/strings/implode1.phpt
index 9d9afc6f3c..3dc022d351 100644
--- a/ext/standard/tests/strings/implode1.phpt
+++ b/ext/standard/tests/strings/implode1.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/php_strip_whitespace.phpt b/ext/standard/tests/strings/php_strip_whitespace.phpt
index caab3bc1d2..5fb314c168 100644
--- a/ext/standard/tests/strings/php_strip_whitespace.phpt
+++ b/ext/standard/tests/strings/php_strip_whitespace.phpt
@@ -3,7 +3,7 @@ php_strip_whitespace() tests
--FILE--
<?php
-$filename = dirname(__FILE__)."/php_strip_whitespace.dat";
+$filename = __DIR__."/php_strip_whitespace.dat";
var_dump(php_strip_whitespace($filename));
diff --git a/ext/standard/tests/strings/sha1.phpt b/ext/standard/tests/strings/sha1.phpt
index 68a8a080ca..1dc73881ef 100644
--- a/ext/standard/tests/strings/sha1.phpt
+++ b/ext/standard/tests/strings/sha1.phpt
@@ -3,7 +3,7 @@ sha1() with ASCII output
--FILE--
<?php
-$filename = dirname(__FILE__)."/sha1.dat";
+$filename = __DIR__."/sha1.dat";
$a = array(
"abc",
"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",
diff --git a/ext/standard/tests/strings/sprintf_variation11.phpt b/ext/standard/tests/strings/sprintf_variation11.phpt
index cb2a3a9cac..d3de553580 100644
--- a/ext/standard/tests/strings/sprintf_variation11.phpt
+++ b/ext/standard/tests/strings/sprintf_variation11.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : float formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation17.phpt b/ext/standard/tests/strings/sprintf_variation17.phpt
index dc9bc8bcad..ac040faeaf 100644
--- a/ext/standard/tests/strings/sprintf_variation17.phpt
+++ b/ext/standard/tests/strings/sprintf_variation17.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : string formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource values
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation23.phpt b/ext/standard/tests/strings/sprintf_variation23.phpt
index fc3148c0be..8a7a45e57a 100644
--- a/ext/standard/tests/strings/sprintf_variation23.phpt
+++ b/ext/standard/tests/strings/sprintf_variation23.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : char formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation30.phpt b/ext/standard/tests/strings/sprintf_variation30.phpt
index d0beeb9501..885dc26718 100644
--- a/ext/standard/tests/strings/sprintf_variation30.phpt
+++ b/ext/standard/tests/strings/sprintf_variation30.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : octal formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation36.phpt b/ext/standard/tests/strings/sprintf_variation36.phpt
index bf05a99db4..b465e0cf9e 100644
--- a/ext/standard/tests/strings/sprintf_variation36.phpt
+++ b/ext/standard/tests/strings/sprintf_variation36.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : hexa formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation42.phpt b/ext/standard/tests/strings/sprintf_variation42.phpt
index 760c173a00..8dcec355ac 100644
--- a/ext/standard/tests/strings/sprintf_variation42.phpt
+++ b/ext/standard/tests/strings/sprintf_variation42.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : unsigned formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation48.phpt b/ext/standard/tests/strings/sprintf_variation48.phpt
index ac551a4453..1f5504af4b 100644
--- a/ext/standard/tests/strings/sprintf_variation48.phpt
+++ b/ext/standard/tests/strings/sprintf_variation48.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : scientific formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
// array of resource types
$resource_values = array (
diff --git a/ext/standard/tests/strings/sprintf_variation5.phpt b/ext/standard/tests/strings/sprintf_variation5.phpt
index 4fc37435ef..a5cb86bdda 100644
--- a/ext/standard/tests/strings/sprintf_variation5.phpt
+++ b/ext/standard/tests/strings/sprintf_variation5.phpt
@@ -11,7 +11,7 @@ echo "*** Testing sprintf() : integer formats with resource values ***\n";
// resource type variable
$fp = fopen (__FILE__, "r");
-$dfp = opendir ( dirname(__FILE__) );
+$dfp = opendir ( __DIR__ );
$fp_copy = $fp;
$dfp_copy = $dfp;
diff --git a/ext/standard/tests/strings/trim.phpt b/ext/standard/tests/strings/trim.phpt
index 44276284e1..660bb202eb 100644
--- a/ext/standard/tests/strings/trim.phpt
+++ b/ext/standard/tests/strings/trim.phpt
@@ -21,6 +21,6 @@ $tests = <<<TESTS
"ABC" === trim("ABC\\x50\\xC1\\x60\\x90","\\x50..\\xC1")
TESTS;
-include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
+include(__DIR__ . '/../../../../tests/quicktester.inc');
--EXPECT--
OK
diff --git a/ext/standard/tests/strings/vfprintf_basic1.phpt b/ext/standard/tests/strings/vfprintf_basic1.phpt
index 84d8ad101d..aa8d2eb850 100644
--- a/ext/standard/tests/strings/vfprintf_basic1.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic1.phpt
@@ -20,7 +20,7 @@ $arg3 = array("one","two","three");
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic1.txt';
+$data_file = __DIR__ . '/vfprintf_basic1.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic2.phpt b/ext/standard/tests/strings/vfprintf_basic2.phpt
index 970640f071..4593dbb1b6 100644
--- a/ext/standard/tests/strings/vfprintf_basic2.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic2.phpt
@@ -23,7 +23,7 @@ $arg2 = array(111,222);
$arg3 = array(111,222,333);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic2.txt';
+$data_file = __DIR__ . '/vfprintf_basic2.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic3.phpt b/ext/standard/tests/strings/vfprintf_basic3.phpt
index a940ccffe8..b303f196f8 100644
--- a/ext/standard/tests/strings/vfprintf_basic3.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic3.phpt
@@ -24,7 +24,7 @@ $arg2 = array(11.11,22.22);
$arg3 = array(11.11,22.22,33.33);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic3.txt';
+$data_file = __DIR__ . '/vfprintf_basic3.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic4.phpt b/ext/standard/tests/strings/vfprintf_basic4.phpt
index c8a170c670..a0780c160b 100644
--- a/ext/standard/tests/strings/vfprintf_basic4.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic4.phpt
@@ -19,7 +19,7 @@ $arg2 = array(TRUE,FALSE);
$arg3 = array(TRUE,FALSE,TRUE);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic4.txt';
+$data_file = __DIR__ . '/vfprintf_basic4.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic5.phpt b/ext/standard/tests/strings/vfprintf_basic5.phpt
index f89ab53f5c..56dd2c67fc 100644
--- a/ext/standard/tests/strings/vfprintf_basic5.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic5.phpt
@@ -19,7 +19,7 @@ $arg2 = array(65,66);
$arg3 = array(65,66,67);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic5.txt';
+$data_file = __DIR__ . '/vfprintf_basic5.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic6.phpt b/ext/standard/tests/strings/vfprintf_basic6.phpt
index 9e888939d2..0590810e31 100644
--- a/ext/standard/tests/strings/vfprintf_basic6.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic6.phpt
@@ -20,7 +20,7 @@ $arg2 = array(1000,2000);
$arg3 = array(1000,2000,3000);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic6.txt';
+$data_file = __DIR__ . '/vfprintf_basic6.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic7.phpt b/ext/standard/tests/strings/vfprintf_basic7.phpt
index a9f286f5a8..f7cc0ed0b3 100644
--- a/ext/standard/tests/strings/vfprintf_basic7.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7.phpt
@@ -23,7 +23,7 @@ $arg2 = array(-1111,-1234567);
$arg3 = array(-1111,-1234567,-2345432);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic7.txt';
+$data_file = __DIR__ . '/vfprintf_basic7.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
index b5526a652f..3587792d81 100644
--- a/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic7_64bit.phpt
@@ -23,7 +23,7 @@ $arg2 = array(-1111,-1234567);
$arg3 = array(-1111,-1234567,-2345432);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic7_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_basic7_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic8.phpt b/ext/standard/tests/strings/vfprintf_basic8.phpt
index ed9d23c2ad..ced87284f8 100644
--- a/ext/standard/tests/strings/vfprintf_basic8.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic8.phpt
@@ -19,7 +19,7 @@ $arg2 = array(021,0347);
$arg3 = array(021,0347,0567);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic8.txt';
+$data_file = __DIR__ . '/vfprintf_basic8.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_basic9.phpt b/ext/standard/tests/strings/vfprintf_basic9.phpt
index 080e52bb64..db98c442e8 100644
--- a/ext/standard/tests/strings/vfprintf_basic9.phpt
+++ b/ext/standard/tests/strings/vfprintf_basic9.phpt
@@ -24,7 +24,7 @@ $arg2 = array(11,132);
$arg3 = array(11,132,177);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_basic9.txt';
+$data_file = __DIR__ . '/vfprintf_basic9.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation10.phpt b/ext/standard/tests/strings/vfprintf_variation10.phpt
index fac24dc7a9..dda2105dcd 100644
--- a/ext/standard/tests/strings/vfprintf_variation10.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation10.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/vfprintf_variation11.phpt b/ext/standard/tests/strings/vfprintf_variation11.phpt
index e94e7e0c56..6c93875c75 100644
--- a/ext/standard/tests/strings/vfprintf_variation11.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11.phpt
@@ -45,7 +45,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation11.txt';
+$data_file = __DIR__ . '/vfprintf_variation11.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
index ab3e1ce83f..5217442ff9 100644
--- a/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation11_64bit.phpt
@@ -45,7 +45,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation11_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation11_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation12.phpt b/ext/standard/tests/strings/vfprintf_variation12.phpt
index 51ab97e8bf..a655da5367 100644
--- a/ext/standard/tests/strings/vfprintf_variation12.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12.phpt
@@ -68,7 +68,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation12.txt';
+$data_file = __DIR__ . '/vfprintf_variation12.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
index ffd232355c..651ff7b70d 100644
--- a/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation12_64bit.phpt
@@ -68,7 +68,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation12_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation12_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation13.phpt b/ext/standard/tests/strings/vfprintf_variation13.phpt
index ebb45acb6b..dca1d4c169 100644
--- a/ext/standard/tests/strings/vfprintf_variation13.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13.phpt
@@ -45,7 +45,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation13.txt';
+$data_file = __DIR__ . '/vfprintf_variation13.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
index 34089e2b78..7288abc485 100644
--- a/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation13_64bit.phpt
@@ -45,7 +45,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation13_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation13_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation14.phpt b/ext/standard/tests/strings/vfprintf_variation14.phpt
index ea2957a18c..7e0ab0193f 100644
--- a/ext/standard/tests/strings/vfprintf_variation14.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14.phpt
@@ -68,7 +68,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation14.txt';
+$data_file = __DIR__ . '/vfprintf_variation14.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
index 9916967b3f..83576b1d34 100644
--- a/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation14_64bit.phpt
@@ -68,7 +68,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation14_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation14_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation15.phpt b/ext/standard/tests/strings/vfprintf_variation15.phpt
index b513227836..b0d7091c09 100644
--- a/ext/standard/tests/strings/vfprintf_variation15.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15.phpt
@@ -38,7 +38,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation15.txt';
+$data_file = __DIR__ . '/vfprintf_variation15.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
index b31ffd3eb4..53dd105123 100644
--- a/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation15_64bit.phpt
@@ -38,7 +38,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation15_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation15_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation16.phpt b/ext/standard/tests/strings/vfprintf_variation16.phpt
index 010028c387..1d2858cbab 100644
--- a/ext/standard/tests/strings/vfprintf_variation16.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16.phpt
@@ -61,7 +61,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation16.txt';
+$data_file = __DIR__ . '/vfprintf_variation16.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
index 0819cc0e5f..f65998aeef 100644
--- a/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation16_64bit.phpt
@@ -61,7 +61,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation16_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation16_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation17.phpt b/ext/standard/tests/strings/vfprintf_variation17.phpt
index 545ae6d43d..3c9d82025f 100644
--- a/ext/standard/tests/strings/vfprintf_variation17.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation17.phpt
@@ -34,7 +34,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation17.txt';
+$data_file = __DIR__ . '/vfprintf_variation17.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation18.phpt b/ext/standard/tests/strings/vfprintf_variation18.phpt
index 3d0d810442..71277ca3d8 100644
--- a/ext/standard/tests/strings/vfprintf_variation18.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation18.phpt
@@ -57,7 +57,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation18.txt';
+$data_file = __DIR__ . '/vfprintf_variation18.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation19.phpt b/ext/standard/tests/strings/vfprintf_variation19.phpt
index 19aac7738b..b3d5eed82b 100644
--- a/ext/standard/tests/strings/vfprintf_variation19.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19.phpt
@@ -46,7 +46,7 @@ $args_array = array(
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation19.txt';
+$data_file = __DIR__ . '/vfprintf_variation19.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
index 8ad2df0947..0ae053ac98 100644
--- a/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation19_64bit.phpt
@@ -46,7 +46,7 @@ $args_array = array(
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation19_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation19_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation20.phpt b/ext/standard/tests/strings/vfprintf_variation20.phpt
index 3bc9bf6b29..1f8dfefca4 100644
--- a/ext/standard/tests/strings/vfprintf_variation20.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation20.phpt
@@ -84,7 +84,7 @@ $values = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation20.txt';
+$data_file = __DIR__ . '/vfprintf_variation20.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation21.phpt b/ext/standard/tests/strings/vfprintf_variation21.phpt
index 874b279763..11f29e87ac 100644
--- a/ext/standard/tests/strings/vfprintf_variation21.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation21.phpt
@@ -81,7 +81,7 @@ $values = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation21.txt';
+$data_file = __DIR__ . '/vfprintf_variation21.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation3.phpt b/ext/standard/tests/strings/vfprintf_variation3.phpt
index e3e7b9636a..7cb8e83d0d 100644
--- a/ext/standard/tests/strings/vfprintf_variation3.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation3.phpt
@@ -45,7 +45,7 @@ $args_array = array(
// and with int values from the above $args_array array
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation3.txt';
+$data_file = __DIR__ . '/vfprintf_variation3.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation4.phpt b/ext/standard/tests/strings/vfprintf_variation4.phpt
index 9dad0eff58..312ec6f18a 100644
--- a/ext/standard/tests/strings/vfprintf_variation4.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4.phpt
@@ -62,7 +62,7 @@ $args_array = array(
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation4.txt';
+$data_file = __DIR__ . '/vfprintf_variation4.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
index 1bf0861c0f..690e2633f2 100644
--- a/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation4_64bit.phpt
@@ -62,7 +62,7 @@ $args_array = array(
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation4_64bit.txt';
+$data_file = __DIR__ . '/vfprintf_variation4_64bit.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation5.phpt b/ext/standard/tests/strings/vfprintf_variation5.phpt
index ffe6c347bc..a9139ce6af 100644
--- a/ext/standard/tests/strings/vfprintf_variation5.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation5.phpt
@@ -42,7 +42,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation5.txt';
+$data_file = __DIR__ . '/vfprintf_variation5.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation6.phpt b/ext/standard/tests/strings/vfprintf_variation6.phpt
index 9194d84866..e586a074f2 100644
--- a/ext/standard/tests/strings/vfprintf_variation6.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation6.phpt
@@ -57,7 +57,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation6.txt';
+$data_file = __DIR__ . '/vfprintf_variation6.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation7.phpt b/ext/standard/tests/strings/vfprintf_variation7.phpt
index ee836edc77..54b4ef4505 100644
--- a/ext/standard/tests/strings/vfprintf_variation7.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation7.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/vfprintf_variation8.phpt b/ext/standard/tests/strings/vfprintf_variation8.phpt
index 036c52b04a..ff806154f4 100644
--- a/ext/standard/tests/strings/vfprintf_variation8.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation8.phpt
@@ -60,7 +60,7 @@ $args_array = array(
);
/* creating dumping file */
-$data_file = dirname(__FILE__) . '/vfprintf_variation8.txt';
+$data_file = __DIR__ . '/vfprintf_variation8.txt';
if (!($fp = fopen($data_file, 'wt')))
return;
diff --git a/ext/standard/tests/strings/vfprintf_variation9.phpt b/ext/standard/tests/strings/vfprintf_variation9.phpt
index 677840a584..30509d9119 100644
--- a/ext/standard/tests/strings/vfprintf_variation9.phpt
+++ b/ext/standard/tests/strings/vfprintf_variation9.phpt
Binary files differ
diff --git a/ext/standard/tests/strings/wordwrap.phpt b/ext/standard/tests/strings/wordwrap.phpt
index 50531b5e93..543c41fdd9 100644
--- a/ext/standard/tests/strings/wordwrap.phpt
+++ b/ext/standard/tests/strings/wordwrap.phpt
@@ -31,6 +31,6 @@ FALSE === @wordwrap(chr(0), 0, "")
TESTS;
-include(dirname(__FILE__) . '/../../../../tests/quicktester.inc');
+include(__DIR__ . '/../../../../tests/quicktester.inc');
--EXPECT--
OK