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

Making Folder::delete() code more PHP5ish

Browse source
This commit is contained in:
ADmad 2011-12-15 01:59:30 +05:30
parent a8d0447e61
commit 16d29a8d0e
2 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -723,10 +723,16 @@ class FolderTest extends CakeTestCase {
*/ */
public function testDelete() { public function testDelete() {
$path = TMP . 'folder_delete_test'; $path = TMP . 'folder_delete_test';
$Folder = new Folder($path, true); mkdir($path);
touch(TMP . 'folder_delete_test' . DS . 'file1'); touch($path . DS . 'file_1');
touch(TMP . 'folder_delete_test' . DS . 'file2'); mkdir($path . DS . 'level_1_1');
touch($path . DS . 'level_1_1' . DS . 'file_1_1');
mkdir($path . DS . 'level_1_1' . DS . 'level_2_1');
touch($path . DS . 'level_1_1' . DS . 'level_2_1' . DS . 'file_2_1');
touch($path . DS . 'level_1_1' . DS . 'level_2_1' . DS . 'file_2_2');
mkdir($path . DS . 'level_1_1' . DS . 'level_2_2');
$Folder = new Folder($path, true);
$return = $Folder->delete(); $return = $Folder->delete();
$this->assertTrue($return); $this->assertTrue($return);
@ -735,9 +741,13 @@ class FolderTest extends CakeTestCase {
$this->assertEquals($errors, array()); $this->assertEquals($errors, array());
$expected = array( $expected = array(
$path . ' created', $path . DS . 'file_1 removed',
$path . DS . 'file1 removed', $path . DS . 'level_1_1' . DS . 'file_1_1 removed',
$path . DS . 'file2 removed', $path . DS . 'level_1_1' . DS . 'level_2_1' . DS . 'file_2_1 removed',
$path . DS . 'level_1_1' . DS . 'level_2_1' . DS . 'file_2_2 removed',
$path . DS . 'level_1_1' . DS . 'level_2_1 removed',
$path . DS . 'level_1_1' . DS . 'level_2_2 removed',
$path . DS . 'level_1_1 removed',
$path . ' removed' $path . ' removed'
); );
$this->assertEquals($expected, $messages); $this->assertEquals($expected, $messages);

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

@ -554,36 +554,32 @@ class Folder {
return null; return null;
} }
$path = Folder::slashTerm($path); $path = Folder::slashTerm($path);
if (is_dir($path) === true) { if (is_dir($path)) {
$normalFiles = glob($path . '*'); $iterator = new RecursiveDirectoryIterator($path, RecursiveDirectoryIterator::SKIP_DOTS);
$hiddenFiles = glob($path . '\.?*'); foreach (new RecursiveIteratorIterator($iterator, RecursiveIteratorIterator::CHILD_FIRST) as $file) {
$filePath = $file->getPathname();
$normalFiles = $normalFiles ? $normalFiles : array(); if ($file->isFile() || $file->isLink()) {
$hiddenFiles = $hiddenFiles ? $hiddenFiles : array(); if (@unlink($filePath)) {
$this->_messages[] = __d('cake_dev', '%s removed', $filePath);
$files = array_merge($normalFiles, $hiddenFiles); } else {
if (is_array($files)) { $this->_errors[] = __d('cake_dev', '%s NOT removed', $filePath);
foreach ($files as $file) {
if (preg_match('/(\.|\.\.)$/', $file)) {
continue;
} }
if (is_file($file) === true) { } elseif ($file->isDir()) {
if (@unlink($file)) { if (@rmdir($filePath)) {
$this->_messages[] = __d('cake_dev', '%s removed', $file); $this->_messages[] = __d('cake_dev', '%s removed', $filePath);
} else { } else {
$this->_errors[] = __d('cake_dev', '%s NOT removed', $file); $this->_errors[] = __d('cake_dev', '%s NOT removed', $filePath);
}
} elseif (is_dir($file) === true && $this->delete($file) === false) {
return false; return false;
} }
} }
} }
$path = substr($path, 0, strlen($path) - 1);
if (rmdir($path) === false) { $path = rtrim($path, DS);
if (@rmdir($path)) {
$this->_messages[] = __d('cake_dev', '%s removed', $path);
} else {
$this->_errors[] = __d('cake_dev', '%s NOT removed', $path); $this->_errors[] = __d('cake_dev', '%s NOT removed', $path);
return false; return false;
} else {
$this->_messages[] = __d('cake_dev', '%s removed', $path);
} }
} }
return true; return true;