adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Folder::tree() when excluding dot files or folders.

Browse source 
When 'exclude' param is array('.') files/folders are not skipped. Added test.
This commit is contained in:
Majna 2012-02-17 20:46:52 +01:00
parent 1dbafe1d4f
commit c40d132f81
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -476,6 +476,9 @@ class FolderTest extends CakeTestCase {
$result = $Folder->tree(null, true); $result = $Folder->tree(null, true);
$this->assertEquals($expected, $result); $this->assertEquals($expected, $result);
$result = $Folder->tree(null, array('.'));
$this->assertEquals($expected, $result);
$expected = array( $expected = array(
array( array(
$Folder->path, $Folder->path,

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

@ -413,10 +413,6 @@ class Folder {
if (is_array($exceptions)) { if (is_array($exceptions)) {
$exceptions = array_flip($exceptions); $exceptions = array_flip($exceptions);
if (isset($exceptions['.'])) {
$skipHidden = true;
unset($exceptions['.']);
}
} }
$skipHidden = false; $skipHidden = false;
if ($exceptions === true) { if ($exceptions === true) {
@ -435,7 +431,7 @@ class Folder {
} }
return array(); return array();
} }
$pathLength = strlen($path);
foreach ($iterator as $itemPath => $fsIterator) { foreach ($iterator as $itemPath => $fsIterator) {
if ($skipHidden) { if ($skipHidden) {
$subPathName = $fsIterator->getSubPathname(); $subPathName = $fsIterator->getSubPathname();