upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-04 22:35:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #25392 from nextcloud/imountpoint-ocp-storage

Browse source
This commit is contained in:
Julius Härtl 2021-10-22 20:14:22 +02:00 committed by GitHub
commit 6b099ecfe5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/files_sharing/lib/SharedStorage.php
View file

@ -371,11 +371,6 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
return $this->superShare->getNodeType();
}
/**
* @param string $path
* @param null $storage
* @return Cache
*/
public function getCache($path = '', $storage = null) {
if ($this->cache) {
return $this->cache;

2
lib/private/Files/Storage/Storage.php
View file

@ -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);

2
lib/private/Files/Storage/Wrapper/Jail.php
View file

@ -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) {

2
lib/private/Files/Storage/Wrapper/Wrapper.php
View file

@ -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) {

2
lib/public/Files/Mount/IMountPoint.php
View file

@ -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();

4
lib/public/Files/Storage/IStorage.php
View file

@ -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