summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikita Popov <nikita.ppv@gmail.com>2019-07-10 12:55:40 +0200
committerNikita Popov <nikita.ppv@gmail.com>2019-07-10 12:55:40 +0200
commit07bbc54658757ae6457837c90a991e2ff02697fb (patch)
treed5ec46a87a8e5f6e915f791f851a25430b951a58
parent852e35317da2af5e324058398ff76d89d97a0753 (diff)
downloadphp-git-07bbc54658757ae6457837c90a991e2ff02697fb.tar.gz
Fix file collisions in phar tests
-rw-r--r--ext/phar/tests/fgc_edgecases.phpt20
-rw-r--r--ext/phar/tests/fopen_edgecases2.phpt6
-rw-r--r--ext/phar/tests/readfile_edgecases.phpt16
3 files changed, 21 insertions, 21 deletions
diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt
index 457093cc2a..11916603e3 100644
--- a/ext/phar/tests/fgc_edgecases.phpt
+++ b/ext/phar/tests/fgc_edgecases.phpt
@@ -17,7 +17,7 @@ $pname = 'phar://' . $fname;
file_get_contents(array());
chdir(__DIR__);
file_put_contents($fname, "blah\n");
-file_put_contents("foob", "test\n");
+file_put_contents("fgc_edgecases.txt", "test\n");
echo file_get_contents($fname);
unlink($fname);
mkdir($pname . '/oops');
@@ -26,9 +26,9 @@ file_put_contents($pname . '/foo/hi', '<?php
echo file_get_contents("foo/" . basename(__FILE__));
$context = stream_context_create();
file_get_contents("./hi", 0, $context, 0, -1);
-echo file_get_contents("foob");
+echo file_get_contents("fgc_edgecases.txt");
set_include_path("' . addslashes(__DIR__) . '");
-echo file_get_contents("foob", true);
+echo file_get_contents("fgc_edgecases.txt", true);
echo file_get_contents("./hi", 0, $context);
echo file_get_contents("../oops");
echo file_get_contents("./hi", 0, $context, 50000);
@@ -44,7 +44,7 @@ include $pname . '/foo/hi';
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
-<?php unlink(__DIR__ . '/foob'); ?>
+<?php unlink(__DIR__ . '/fgc_edgecases.txt'); ?>
--EXPECTF--
Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %sfgc_edgecases.php on line %d
blah
@@ -52,9 +52,9 @@ blah
echo file_get_contents("foo/" . basename(__FILE__));
$context = stream_context_create();
file_get_contents("./hi", 0, $context, 0, -1);
-echo file_get_contents("foob");
+echo file_get_contents("fgc_edgecases.txt");
set_include_path("%stests");
-echo file_get_contents("foob", true);
+echo file_get_contents("fgc_edgecases.txt", true);
echo file_get_contents("./hi", 0, $context);
echo file_get_contents("../oops");
echo file_get_contents("./hi", 0, $context, 50000);
@@ -69,9 +69,9 @@ test
echo file_get_contents("foo/" . basename(__FILE__));
$context = stream_context_create();
file_get_contents("./hi", 0, $context, 0, -1);
-echo file_get_contents("foob");
+echo file_get_contents("fgc_edgecases.txt");
set_include_path("%stests");
-echo file_get_contents("foob", true);
+echo file_get_contents("fgc_edgecases.txt", true);
echo file_get_contents("./hi", 0, $context);
echo file_get_contents("../oops");
echo file_get_contents("./hi", 0, $context, 50000);
@@ -86,9 +86,9 @@ Warning: file_get_contents(): Failed to seek to position 50000 in the stream in
echo file_get_contents("foo/" . basename(__FILE__));
$context = stream_context_create();
file_get_contents("./hi", 0, $context, 0, -1);
-echo file_get_contents("foob");
+echo file_get_contents("fgc_edgecases.txt");
set_include_path("%stests");
-echo file_get_contents("foob", true);
+echo file_get_contents("fgc_edgecases.txt", true);
echo file_get_contents("./hi", 0, $context);
echo file_get_contents("../oops");
echo file_get_contents("./hi", 0, $context, 50000);
diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt
index c37cb9c6ed..b32755bf9e 100644
--- a/ext/phar/tests/fopen_edgecases2.phpt
+++ b/ext/phar/tests/fopen_edgecases2.phpt
@@ -13,7 +13,7 @@ $pname = 'phar://' . $fname;
fopen(array(), 'r');
chdir(__DIR__);
file_put_contents($fname, "blah\n");
-file_put_contents("foob", "test\n");
+file_put_contents("fopen_edgecases2.txt", "test\n");
$a = fopen($fname, 'rb');
echo fread($a, 1000);
fclose($a);
@@ -21,7 +21,7 @@ unlink($fname);
mkdir($pname . '/oops');
file_put_contents($pname . '/foo/hi', '<?php
$context = stream_context_create();
-$a = fopen("foob", "rb", false, $context);
+$a = fopen("fopen_edgecases2.txt", "rb", false, $context);
echo fread($a, 1000);
fclose($a);
fopen("../oops", "r");
@@ -33,7 +33,7 @@ include $pname . '/foo/hi';
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
-<?php unlink(__DIR__ . '/foob'); ?>
+<?php unlink(__DIR__ . '/fopen_edgecases2.txt'); ?>
--EXPECTF--
Warning: fopen() expects parameter 1 to be a valid path, array given in %sfopen_edgecases2.php on line %d
blah
diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt
index b99ae4333f..0213f182c6 100644
--- a/ext/phar/tests/readfile_edgecases.phpt
+++ b/ext/phar/tests/readfile_edgecases.phpt
@@ -13,16 +13,16 @@ $pname = 'phar://' . $fname;
readfile(array());
chdir(__DIR__);
file_put_contents($fname, "blah\n");
-file_put_contents("foob", "test\n");
+file_put_contents("readfile_edgecases.txt", "test\n");
readfile($fname);
unlink($fname);
mkdir($pname . '/oops');
file_put_contents($pname . '/foo/hi', '<?php
readfile("foo/" . basename(__FILE__));
$context = stream_context_create();
-readfile("foob");
+readfile("readfile_edgecases.txt");
set_include_path("' . addslashes(__DIR__) . '");
-readfile("foob", true);
+readfile("readfile_edgecases.txt", true);
readfile("./hi", 0, $context);
readfile("../oops");
?>
@@ -33,16 +33,16 @@ include $pname . '/foo/hi';
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
-<?php unlink(__DIR__ . '/foob'); ?>
+<?php unlink(__DIR__ . '/readfile_edgecases.txt'); ?>
--EXPECTF--
Warning: readfile() expects parameter 1 to be a valid path, array given in %sreadfile_edgecases.php on line %d
blah
<?php
readfile("foo/" . basename(__FILE__));
$context = stream_context_create();
-readfile("foob");
+readfile("readfile_edgecases.txt");
set_include_path("%stests");
-readfile("foob", true);
+readfile("readfile_edgecases.txt", true);
readfile("./hi", 0, $context);
readfile("../oops");
?>
@@ -51,9 +51,9 @@ test
<?php
readfile("foo/" . basename(__FILE__));
$context = stream_context_create();
-readfile("foob");
+readfile("readfile_edgecases.txt");
set_include_path("%stests");
-readfile("foob", true);
+readfile("readfile_edgecases.txt", true);
readfile("./hi", 0, $context);
readfile("../oops");
?>