Skip to content

Commit 4902b1c

Browse files
committed
Remove unnecessary "poo" rmdirs
"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...
1 parent 46d2a98 commit 4902b1c

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

ext/phar/tests/fgc_edgecases.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ include $pname . '/foo/hi';
4343
===DONE===
4444
--CLEAN--
4545
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
46-
<?php rmdir(__DIR__ . '/poo'); ?>
4746
<?php unlink(__DIR__ . '/fgc_edgecases.txt'); ?>
4847
--EXPECTF--
4948
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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ include $pname . '/foo/hi';
3232
===DONE===
3333
--CLEAN--
3434
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
35-
<?php rmdir(__DIR__ . '/poo'); ?>
3635
<?php unlink(__DIR__ . '/fopen_edgecases2.txt'); ?>
3736
--EXPECTF--
3837
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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ $pname = 'phar://' . $fname;
1414

1515
opendir(array());
1616

17-
mkdir(__DIR__ . '/poo');
17+
mkdir(__DIR__ . '/opendir_edgecases');
1818
chdir(__DIR__);
1919

20-
$a = opendir('poo');
20+
$a = opendir('opendir_edgecases');
2121

2222
$arr = array();
2323
while (false !== ($b = readdir($a))) {
@@ -50,7 +50,7 @@ include $pname . '/foo';
5050
===DONE===
5151
--CLEAN--
5252
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
53-
<?php rmdir(__DIR__ . '/poo');
53+
<?php rmdir(__DIR__ . '/opendir_edgecases');
5454
--EXPECTF--
5555
Warning: opendir() expects parameter 1 to be a valid path, array given in %sopendir_edgecases.php on line %d
5656
.

ext/phar/tests/readfile_edgecases.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ include $pname . '/foo/hi';
3232
===DONE===
3333
--CLEAN--
3434
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
35-
<?php rmdir(__DIR__ . '/poo'); ?>
3635
<?php unlink(__DIR__ . '/readfile_edgecases.txt'); ?>
3736
--EXPECTF--
3837
Warning: readfile() expects parameter 1 to be a valid path, array given in %sreadfile_edgecases.php on line %d

0 commit comments

Comments
 (0)