| @@ -1,12 +1,12 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | 3 | * @package FirePlugins Framework |
| 4 | - * @version 1.0.15 | |
| 4 | + * @version 1.2.6 | |
| 5 | 5 | * |
| 6 | 6 | * @author FirePlugins <[email protected]> |
| 7 | 7 | * @link https://www.fireplugins.com |
| 8 | - * @copyright Copyright © 2021 FirePlugins All Rights Reserved | |
| 8 | + * @copyright Copyright © 2026 FirePlugins All Rights Reserved | |
| 9 | 9 | * @license GNU GPLv3 <http://www.gnu.org/licenses/gpl.html> or later |
| 10 | 10 | */ |
| 11 | 11 | |
| 12 | 12 | namespace FPFramework\Helpers; |
| @@ -15,20 +15,20 @@ | ||
| 15 | 15 | { |
| 16 | 16 | exit; // Exit if accessed directly. |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | -class FileHelper { | |
| 19 | +class FileHelper | |
| 20 | +{ | |
| 20 | 21 | /** |
| 21 | 22 | * Reads and parses all files and returns only PHP files with path and their name only |
| 22 | 23 | * |
| 23 | - * @param String $path | |
| 24 | 24 | * @param String $folder |
| 25 | 25 | * |
| 26 | 26 | * @return array |
| 27 | 27 | */ |
| 28 | - public static function getFileNamesFromFolder($path, $folder) | |
| 28 | + public static function getFileNamesFromFolder($folder) | |
| 29 | 29 | { |
| 30 | - if (!is_string($path) || !is_string($folder) || empty($path) || empty($folder)) | |
| 30 | + if (!is_string($folder) || empty($folder)) | |
| 31 | 31 | { |
| 32 | 32 | return []; |
| 33 | 33 | } |
| 34 | 34 | |
| @@ -33,8 +33,13 @@ | ||
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | $files = \scandir($folder); |
| 36 | 36 | |
| 37 | + if ($files === false) | |
| 38 | + { | |
| 39 | + return []; | |
| 40 | + } | |
| 41 | + | |
| 37 | 42 | $parsedFiles = []; |
| 38 | 43 | |
| 39 | 44 | foreach ($files as $file) |
| 40 | 45 | { |
| @@ -41,20 +46,19 @@ | ||
| 41 | 46 | if (!(strpos($file, '.php') !== false)) |
| 42 | 47 | { |
| 43 | 48 | continue; |
| 44 | 49 | } |
| 45 | - | |
| 46 | - if (!in_array($file, ['index.php', '.', '..'])) | |
| 50 | + | |
| 51 | + if (in_array($file, ['index.php', '.', '..'])) | |
| 47 | 52 | { |
| 48 | - // remove .php from file name | |
| 49 | - $file = explode('.php', $file); | |
| 50 | - | |
| 51 | - $parsedFiles[] = $file[0]; | |
| 53 | + continue; | |
| 52 | 54 | } |
| 55 | + | |
| 56 | + // remove .php from file name | |
| 57 | + $file = explode('.php', $file); | |
| 58 | + | |
| 59 | + $parsedFiles[] = $file[0]; | |
| 53 | 60 | } |
| 54 | 61 | |
| 55 | - return [ | |
| 56 | - 'path' => $path, | |
| 57 | - 'names' => $parsedFiles | |
| 58 | - ]; | |
| 62 | + return $parsedFiles; | |
| 59 | 63 | } |
| 60 | 64 | } |