From f9c9d2746c7133b1b45a6d9327fcab5e6fdb76ad Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Thu, 20 Jun 2024 09:31:25 +0200 Subject: [PATCH] wait #6968 @1 --- src/Files/Files.php | 15 ++++++--------- src/Files/VirtualDirectory.php | 5 ----- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/src/Files/Files.php b/src/Files/Files.php index a7a0ae4..619d7ff 100644 --- a/src/Files/Files.php +++ b/src/Files/Files.php @@ -83,22 +83,19 @@ class Files return new \RecursiveIteratorIterator(new RecursiveDirectoryIterator($path, $exclude), $mode); } - public static function listFilesOfDirectory($path, &$res = []) + public static function listFilesOfDirectory($path, &$res) { $files = scandir($path); - foreach ($files as $key => $value) { - $path = realpath($path . DIRECTORY_SEPARATOR . $value); - if (!is_dir($path)) { - $res[] = $path; + foreach ($files as $value) { + $p = realpath($path . DIRECTORY_SEPARATOR . $value); + if (!is_dir($p)) { + $res[] = $p; } else if ($value != "." && $value != "..") { - static::listFilesOfDirectory($path, $res); - $res[] = $path; + static::listFilesOfDirectory($p, $res); } } - return $res; - } /** diff --git a/src/Files/VirtualDirectory.php b/src/Files/VirtualDirectory.php index 9b81573..e5b971e 100644 --- a/src/Files/VirtualDirectory.php +++ b/src/Files/VirtualDirectory.php @@ -185,11 +185,6 @@ class VirtualDirectory $from = realpath($from); Files::listFilesOfDirectory($from, $files); - - if (!count($files)) { - dddd(`ls -l $from`); - } - $relativeTo = $this->relativePath($to); $total = 0; -- 2.39.5