diff options
| author | Julius Härtl <jus@bitgrid.net> | 2021-10-22 20:14:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-22 20:14:22 +0200 |
| commit | 6b099ecfe59402291b5915c928bfb16f4f9d6675 (patch) | |
| tree | 43cd067b2be4bc9493ef298301132fc6fc1276f8 /lib | |
| parent | 3b06b47607e20574838773f549e57c14ae7653ae (diff) | |
| parent | e673ec0b879e4d32bb468825c549738e342df0f2 (diff) | |
| download | nextcloud-server-6b099ecfe59402291b5915c928bfb16f4f9d6675.tar.gz nextcloud-server-6b099ecfe59402291b5915c928bfb16f4f9d6675.zip | |
Merge pull request #25392 from nextcloud/imountpoint-ocp-storage
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Storage/Storage.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Jail.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Wrapper.php | 2 | ||||
| -rw-r--r-- | lib/public/Files/Mount/IMountPoint.php | 2 | ||||
| -rw-r--r-- | lib/public/Files/Storage/IStorage.php | 4 |
5 files changed, 7 insertions, 5 deletions
diff --git a/lib/private/Files/Storage/Storage.php b/lib/private/Files/Storage/Storage.php index 75f8295caa0..cc317de2669 100644 --- a/lib/private/Files/Storage/Storage.php +++ b/lib/private/Files/Storage/Storage.php @@ -37,7 +37,7 @@ interface Storage extends \OCP\Files\Storage { * get a cache instance for the storage * * @param string $path - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache + * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache * @return \OC\Files\Cache\Cache */ public function getCache($path = '', $storage = null); diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index 4d254b34d46..65ee6f1181a 100644 --- a/lib/private/Files/Storage/Wrapper/Jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php @@ -395,7 +395,7 @@ class Jail extends Wrapper { * get a cache instance for the storage * * @param string $path - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache + * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache * @return \OC\Files\Cache\Cache */ public function getCache($path = '', $storage = null) { diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php index ec1da92f317..5faffece67e 100644 --- a/lib/private/Files/Storage/Wrapper/Wrapper.php +++ b/lib/private/Files/Storage/Wrapper/Wrapper.php @@ -385,7 +385,7 @@ class Wrapper implements \OC\Files\Storage\Storage, ILockingStorage, IWriteStrea * get a cache instance for the storage * * @param string $path - * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache + * @param \OC\Files\Storage\Storage|null (optional) the storage to pass to the cache * @return \OC\Files\Cache\Cache */ public function getCache($path = '', $storage = null) { diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php index 8419cc781fc..601f293fc16 100644 --- a/lib/public/Files/Mount/IMountPoint.php +++ b/lib/public/Files/Mount/IMountPoint.php @@ -48,7 +48,7 @@ interface IMountPoint { /** * Get the storage that is mounted * - * @return \OC\Files\Storage\Storage|null + * @return \OCP\Files\Storage\IStorage|null * @since 8.0.0 */ public function getStorage(); diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php index 9f350f92b86..21272f216c7 100644 --- a/lib/public/Files/Storage/IStorage.php +++ b/lib/public/Files/Storage/IStorage.php @@ -427,10 +427,12 @@ interface IStorage { public function getOwner($path); /** + * @param string $path + * @param IStorage|null $storage * @return ICache * @since 9.0.0 */ - public function getCache(); + public function getCache($path = '', $storage = null); /** * @return IPropagator |