Return all keys in getAllVersions() instead

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index f9dbe449e0da69a938402e9cdb0c2d18bbd75c3e..147edeb6726d623218eb3c5da942cdf9de15a3eb 100644 (file)
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -496,7 +496,7 @@ class Storage {
                $expiration = self::getExpiration();
                $threshold = $expiration->getMaxAgeAsTimestamp();
                $versions = self::getAllVersions($uid);
-               if (!$threshold || !array_key_exists('all', $versions)) {
+               if (!$threshold || empty($versions['all'])) {
                        return;
                }
 
@@ -578,7 +578,10 @@ class Storage {
                // newest version first
                krsort($versions);
 
-               $result = [];
+               $result = [
+                       'all' => [],
+                       'by_file' => [],
+               ];
 
                foreach ($versions as $key => $value) {
                        $size = $view->filesize(self::VERSIONS_ROOT.'/'.$value['path'].'.v'.$value['timestamp']);
@@ -775,8 +778,8 @@ class Storage {
 
                        // if still not enough free space we rearrange the versions from all files
                        if ($availableSpace <= 0) {
-                               $result = Storage::getAllVersions($uid);
-                               $allVersions = $result['all'] ?? [];
+                               $result = self::getAllVersions($uid);
+                               $allVersions = $result['all'];
 
                                foreach ($result['by_file'] as $versions) {
                                        list($toDeleteNew, $size) = self::getExpireList($time, $versions, $availableSpace <= 0);