fix type hints

Signed-off-by: Robin Appelman <robin@icewind.nl>

diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
index 99f3602fe51b76d4e6380705058d3736da804eb9..5454e9eb56f2ec361256b253aba60b25e2ac1e05 100644 (file)
--- a/lib/private/Files/Cache/Cache.php
+++ b/lib/private/Files/Cache/Cache.php
@@ -882,8 +882,7 @@ class Cache implements ICache {
         * calculate the size of a folder and set it in the cache
         *
         * @param string $path
-        * @param array $entry (optional) meta data of the folder
-        * @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
+        * @param array|null|ICacheEntry $entry (optional) meta data of the folder
         * @return int|float
         */
        public function calculateFolderSize($path, $entry = null) {
@@ -895,11 +894,11 @@ class Cache implements ICache {
         * inner function because we can't add new params to the public function without breaking any child classes
         *
         * @param string $path
-        * @param array $entry (optional) meta data of the folder
+        * @param array|null|ICacheEntry $entry (optional) meta data of the folder
         * @param bool $ignoreUnknown don't mark the folder size as unknown if any of it's children are unknown
         * @return int
         */
-       protected function calculateFolderSizeInner(string $path, array $entry = null, bool $ignoreUnknown = false) {
+       protected function calculateFolderSizeInner(string $path, $entry = null, bool $ignoreUnknown = false) {
                $totalSize = 0;
                if (is_null($entry) || !isset($entry['fileid'])) {
                        $entry = $this->get($path);
@@ -959,7 +958,6 @@ class Cache implements ICache {
                        $shouldWriteUnEncryptedSize = $unencryptedMax > 0 || $totalSize === 0 || $entry['unencrypted_size'] > 0;
                        if ($entry['size'] !== $totalSize || ($entry['unencrypted_size'] !== $unencryptedTotal && $shouldWriteUnEncryptedSize)) {
                                if ($shouldWriteUnEncryptedSize) {
-
                                        // if all children have an unencrypted size of 0, just set the folder unencrypted size to 0 instead of summing the sizes
                                        if ($unencryptedMax === 0) {
                                                $unencryptedTotal = 0;

diff --git a/lib/private/Files/Cache/HomeCache.php b/lib/private/Files/Cache/HomeCache.php
index ebf81c91385a05784dfd5648aad525e8a6e2f651..3b0eaae4c5d37dc9b47c7e2a7b9af7ff8e3f65fa 100644 (file)
--- a/lib/private/Files/Cache/HomeCache.php
+++ b/lib/private/Files/Cache/HomeCache.php
@@ -35,7 +35,7 @@ class HomeCache extends Cache {
         * get the size of a folder and set it in the cache
         *
         * @param string $path
-        * @param array $entry (optional) meta data of the folder
+        * @param array|null|ICacheEntry $entry (optional) meta data of the folder
         * @return int|float
         */
        public function calculateFolderSize($path, $entry = null) {

diff --git a/lib/private/Files/Cache/Wrapper/CacheJail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
index 9649ae3541bd8d5b461679813b7b88e48a8d1809..c444647383329b204a4002af8738282d3665d645 100644 (file)
--- a/lib/private/Files/Cache/Wrapper/CacheJail.php
+++ b/lib/private/Files/Cache/Wrapper/CacheJail.php
@@ -239,7 +239,7 @@ class CacheJail extends CacheWrapper {
         * get the size of a folder and set it in the cache
         *
         * @param string $path
-        * @param array $entry (optional) meta data of the folder
+        * @param array|null|ICacheEntry $entry (optional) meta data of the folder
         * @return int|float
         */
        public function calculateFolderSize($path, $entry = null) {

diff --git a/lib/private/Files/Cache/Wrapper/CacheWrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
index f6bb949f96819283afd338a70d84410285fbf820..6479ea793b000eb33c74e2ba485beccc82db3a79 100644 (file)
--- a/lib/private/Files/Cache/Wrapper/CacheWrapper.php
+++ b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
@@ -249,7 +249,7 @@ class CacheWrapper extends Cache {
         * get the size of a folder and set it in the cache
         *
         * @param string $path
-        * @param array $entry (optional) meta data of the folder
+        * @param array|null|ICacheEntry $entry (optional) meta data of the folder
         * @return int|float
         */
        public function calculateFolderSize($path, $entry = null) {