php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary "poo" rmdirs

Browse Source 
"poo" was only used in the opendir_edgecases test, but rmdir'ed
in some other tests as well.

I've also taken the liberty of renaming this directory...
This commit is contained in:
Nikita Popov
2020-06-05 16:26:09 +02:00
parent 46d2a981dd
commit 4902b1c554
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/phar/tests/fgc_edgecases.phpt
-1
View File
@@ -43,7 +43,6 @@ include $pname . '/foo/hi';
===DONE===
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
<?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
ext/phar/tests/fopen_edgecases2.phpt
-1
View File
@@ -32,7 +32,6 @@ include $pname . '/foo/hi';
===DONE===
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
<?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
ext/phar/tests/opendir_edgecases.phpt
+3 -3
View File
@@ -14,10 +14,10 @@ $pname = 'phar://' . $fname;
opendir(array());
mkdir(__DIR__ . '/poo');
mkdir(__DIR__ . '/opendir_edgecases');
chdir(__DIR__);
$a = opendir('poo');
$a = opendir('opendir_edgecases');
$arr = array();
while (false !== ($b = readdir($a))) {
@@ -50,7 +50,7 @@ include $pname . '/foo';
===DONE===
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo');
<?php rmdir(__DIR__ . '/opendir_edgecases');
--EXPECTF--
Warning: opendir() expects parameter 1 to be a valid path, array given in %sopendir_edgecases.php on line %d
.
ext/phar/tests/readfile_edgecases.phpt
-1
View File
@@ -32,7 +32,6 @@ include $pname . '/foo/hi';
===DONE===
--CLEAN--
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
<?php rmdir(__DIR__ . '/poo'); ?>
<?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