mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 10:01:55 +02:00
Code Issues Releases Wiki Activity

[ticket/10941] Refactored tearDown to stop iterating over the directory.

Browse Source 
PHPBB3-10941
This commit is contained in:
Fyorl
2012-07-03 02:28:49 +01:00
parent ff7e5d73f7
commit 682757c1cb
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/uploads/filespec_test.php
View File

@@ -79,32 +79,27 @@ class phpbb_filespec_test extends phpbb_test_case
protected function tearDown()
{
global $user;
$files = array(
'gif_copy' => 1,
'jpg_copy' => 1,
'png_copy' => 1,
'txt_copy' => 1,
'txt_copy_2' => 1,
'tif_copy' => 1,
'gif_moved' => 1,
'jpg_moved' => 1,
'png_moved' => 1,
'txt_as_img' => 1,
'txt_moved' => 1,
);
$iterator = new DirectoryIterator($this->path);
foreach ($iterator as $fileinfo)
{
if (isset($files[$fileinfo->getFilename()]))
{
unlink($fileinfo->getPathname());
}
}
$this->config = array();
$user = null;
$files = array(
'gif_copy',
'jpg_copy',
'png_copy',
'txt_copy',
'txt_copy_2',
'tif_copy',
'gif_moved',
'jpg_moved',
'png_moved',
'txt_as_img',
'txt_moved',
);
foreach ($files as $file)
{
@unlink($this->path . $file);
}
}
public function additional_checks_variables()