Fixing TMP cleanup code in FolderTest

This commit is contained in:
ADmad 2011-11-16 14:03:18 +05:30
parent 2bb4ed01be
commit 8450b8bbc4

View file

@ -58,9 +58,17 @@ class FolderTest extends CakeTestCase {
*/ */
public function tearDown() { public function tearDown() {
$exclude = array_merge(self::$_tmp, array('.', '..')); $exclude = array_merge(self::$_tmp, array('.', '..'));
foreach (scandir(TMP) as $file) { foreach (scandir(TMP) as $dir) {
if (is_dir(TMP . $file) && !in_array($file, $exclude)) { if (is_dir(TMP . $dir) && !in_array($dir, $exclude)) {
unlink(TMP . $file); $iterator = new RecursiveDirectoryIterator(TMP . $dir);
foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST) as $file) {
if ($file->isFile() || $file->isLink()) {
unlink($file->getPathname());
} elseif ($file->isDir() && !in_array($file->getFilename(), array('.', '..'))) {
rmdir($file->getPathname());
}
}
rmdir(TMP . $dir);
} }
} }
} }