adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-19 11:06:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Redoing fix done in 155968349f

Browse source 
Adding more test cleanup to try and solve build issues.
This commit is contained in:
mark_story 2011-09-22 22:05:36 -04:00
parent eccc05d8b1
commit 36928d35f9
2 changed files with 41 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/Cake/Test/Case/Utility/FolderTest.php
View file

@ -26,6 +26,45 @@ App::uses('File', 'Utility');
*/ */
class FolderTest extends CakeTestCase { class FolderTest extends CakeTestCase {
protected static $_tmp = array();
/**
* Save the directory names in TMP
*
* @return void
*/
public static function setUpBeforeClass() {
foreach (scandir(TMP) as $file) {
if (is_dir(TMP . $file) && !in_array($file, array('.', '..'))) {
self::$_tmp[] = $file;
}
}
}
/**
* setUp clearstatcache() to flush file descriptors.
*
* @return void
*/
public function setUp() {
parent::setUp();
clearstatcache();
}
/**
* Restore the TMP directory to its original state.
*
* @return void
*/
public function tearDown() {
$exclude = array_merge(self::$_tmp, array('.', '..'));
foreach (scandir(TMP) as $file) {
if (is_dir(TMP . $file) && !in_array($file, $exclude)) {
unlink(TMP . $file);
}
}
}
/** /**
* testBasic method * testBasic method
* *
@ -261,7 +300,7 @@ class FolderTest extends CakeTestCase {
$expected = array('0', 'cache', 'logs', 'sessions', 'tests'); $expected = array('0', 'cache', 'logs', 'sessions', 'tests');
$this->assertEqual($expected, $result[0]); $this->assertEqual($expected, $result[0]);
$result = $Folder->read(true, array('.', '..', 'logs', '.svn')); $result = $Folder->read(true, array('logs'));
$expected = array('0', 'cache', 'sessions', 'tests'); $expected = array('0', 'cache', 'sessions', 'tests');
$this->assertEqual($expected, $result[0]); $this->assertEqual($expected, $result[0]);

2
lib/Cake/Utility/Folder.php
View file

@ -415,7 +415,7 @@ class Folder {
} }
if ($item->isFile()) { if ($item->isFile()) {
$files[] = $item->getPathName(); $files[] = $item->getPathName();
} else if ($item->isDir()) { } else if ($item->isDir() && !in_array($name, array('.', '..'))) {
$directories[] = $item->getPathName(); $directories[] = $item->getPathName();
} }
} }