Skip to content

Commit 8d2c7ef

Browse files
committed
Merge branch 'PHP-7.4'
* PHP-7.4: Remove unnecessary "poo" rmdirs
2 parents a838cb5 + 4902b1c commit 8d2c7ef

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
@@ -46,7 +46,6 @@ include $pname . '/foo/hi';
4646
?>
4747
--CLEAN--
4848
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
49-
<?php rmdir(__DIR__ . '/poo'); ?>
5049
<?php unlink(__DIR__ . '/fgc_edgecases.txt'); ?>
5150
--EXPECTF--
5251
file_get_contents(): Argument #1 ($filename) must be a valid path, array given

ext/phar/tests/fopen_edgecases2.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ include $pname . '/foo/hi';
3535
?>
3636
--CLEAN--
3737
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
38-
<?php rmdir(__DIR__ . '/poo'); ?>
3938
<?php unlink(__DIR__ . '/fopen_edgecases2.txt'); ?>
4039
--EXPECTF--
4140
fopen(): Argument #1 ($filename) must be a valid path, array given

ext/phar/tests/opendir_edgecases.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ try {
1818
echo $e->getMessage(), "\n";
1919
}
2020

21-
mkdir(__DIR__ . '/poo');
21+
mkdir(__DIR__ . '/opendir_edgecases');
2222
chdir(__DIR__);
2323

24-
$a = opendir('poo');
24+
$a = opendir('opendir_edgecases');
2525

2626
$arr = array();
2727
while (false !== ($b = readdir($a))) {
@@ -53,7 +53,7 @@ include $pname . '/foo';
5353
?>
5454
--CLEAN--
5555
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
56-
<?php rmdir(__DIR__ . '/poo');
56+
<?php rmdir(__DIR__ . '/opendir_edgecases');
5757
--EXPECTF--
5858
opendir(): Argument #1 ($path) must be a valid path, array given
5959
.

ext/phar/tests/readfile_edgecases.phpt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ include $pname . '/foo/hi';
3030
?>
3131
--CLEAN--
3232
<?php unlink(__DIR__ . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
33-
<?php rmdir(__DIR__ . '/poo'); ?>
3433
<?php unlink(__DIR__ . '/readfile_edgecases.txt'); ?>
3534
--EXPECTF--
3635
blah

0 commit comments

Comments
 (0)