diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-05 16:26:09 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-06-05 16:26:09 +0200 |
| commit | 4902b1c554029aa69dfe6eb0ee293aaa94c7700e (patch) | |
| tree | 0517cde32f98277904e3f7e264fa66e4e4e17739 | |
| parent | 46d2a981dd791e1328b79013fc8945414d6a1bc0 (diff) | |
| download | php-git-4902b1c554029aa69dfe6eb0ee293aaa94c7700e.tar.gz | |
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...
| -rw-r--r-- | ext/phar/tests/fgc_edgecases.phpt | 1 | ||||
| -rw-r--r-- | ext/phar/tests/fopen_edgecases2.phpt | 1 | ||||
| -rw-r--r-- | ext/phar/tests/opendir_edgecases.phpt | 6 | ||||
| -rw-r--r-- | ext/phar/tests/readfile_edgecases.phpt | 1 |
4 files changed, 3 insertions, 6 deletions
diff --git a/ext/phar/tests/fgc_edgecases.phpt b/ext/phar/tests/fgc_edgecases.phpt index 11916603e3..ed69313866 100644 --- a/ext/phar/tests/fgc_edgecases.phpt +++ b/ext/phar/tests/fgc_edgecases.phpt @@ -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 diff --git a/ext/phar/tests/fopen_edgecases2.phpt b/ext/phar/tests/fopen_edgecases2.phpt index b32755bf9e..6ae9293bac 100644 --- a/ext/phar/tests/fopen_edgecases2.phpt +++ b/ext/phar/tests/fopen_edgecases2.phpt @@ -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 diff --git a/ext/phar/tests/opendir_edgecases.phpt b/ext/phar/tests/opendir_edgecases.phpt index c3303705cb..50a3126a54 100644 --- a/ext/phar/tests/opendir_edgecases.phpt +++ b/ext/phar/tests/opendir_edgecases.phpt @@ -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 . diff --git a/ext/phar/tests/readfile_edgecases.phpt b/ext/phar/tests/readfile_edgecases.phpt index 0213f182c6..65f7beb471 100644 --- a/ext/phar/tests/readfile_edgecases.phpt +++ b/ext/phar/tests/readfile_edgecases.phpt @@ -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 |