diff --git a/framework/yii/helpers/base/FileHelper.php b/framework/yii/helpers/base/FileHelper.php index fc1f91a..62dfc0a 100644 --- a/framework/yii/helpers/base/FileHelper.php +++ b/framework/yii/helpers/base/FileHelper.php @@ -137,7 +137,6 @@ class FileHelper * - filter: callback, a PHP callback that is called for each sub-directory or file. * If the callback returns false, the the sub-directory or file will not be copied. * The signature of the callback should be: `function ($path)`, where `$path` refers the full path to be copied. - * - fileTypes: array, list of file name suffix (without dot). Only files with these suffixes will be copied. * - only: array, list of patterns that the files or directories should match if they want to be copied. * A path matches a pattern if it contains the pattern string at its end. For example, * '/a/b' will match all files and directories ending with '/a/b'; and the '.svn' will match all files and @@ -212,7 +211,6 @@ class FileHelper * - filter: callback, a PHP callback that is called for each sub-directory or file. * If the callback returns false, the the sub-directory or file will be excluded from the returning result. * The signature of the callback should be: `function ($path)`, where `$path` refers the full path to be filtered. - * - fileTypes: array, list of file name suffix (without dot). Only files with these suffixes will be returned. * - only: array, list of patterns that the files or directories should match if they want to be returned. * A path matches a pattern if it contains the pattern string at its end. For example, * '/a/b' will match all files and directories ending with '/a/b'; and the '.svn' will match all files and @@ -272,11 +270,7 @@ class FileHelper } } } - if (!empty($options['fileTypes']) && is_file($path)) { - return in_array(pathinfo($path, PATHINFO_EXTENSION), $options['fileTypes']); - } else { - return true; - } + return true; } /** diff --git a/tests/unit/framework/helpers/FileHelperTest.php b/tests/unit/framework/helpers/FileHelperTest.php index 8c812b1..130ea40 100644 --- a/tests/unit/framework/helpers/FileHelperTest.php +++ b/tests/unit/framework/helpers/FileHelperTest.php @@ -268,31 +268,6 @@ class FileHelperTest extends TestCase $this->assertEquals(array($dirName . DIRECTORY_SEPARATOR . $fileName), $foundFiles); } - /** - * @depends testFindFiles - */ - public function testFindFilesFileType() - { - $dirName = 'test_dir'; - $fileType = 'dat'; - $fileName = 'test_file.' . $fileType; - $excludeFileName = 'exclude_file.txt'; - $this->createFileStructure(array( - $dirName => array( - $fileName => 'file content', - $excludeFileName => 'exclude file content', - ), - )); - $basePath = $this->testFilePath; - $dirName = $basePath . DIRECTORY_SEPARATOR . $dirName; - - $options = array( - 'fileTypes' => array($fileType), - ); - $foundFiles = FileHelper::findFiles($dirName, $options); - $this->assertEquals(array($dirName . DIRECTORY_SEPARATOR . $fileName), $foundFiles); - } - public function testMkdir() { $basePath = $this->testFilePath; $dirName = $basePath . DIRECTORY_SEPARATOR . 'test_dir_level_1' . DIRECTORY_SEPARATOR . 'test_dir_level_2';