Skip to content

dont return private storage interface from public mount interface #25392

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Oct 22, 2021
Merged

dont return private storage interface from public mount interface #25392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7995c6e
dont return private storage interface from public mount interface
icewind1991 Jan 29, 2021
e673ec0
Merge branch 'master' into imountpoint-ocp-storage
skjnldsv Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions apps/files_sharing/lib/SharedStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,11 +371,6 @@ public function getItemType(): string {
return $this->superShare->getNodeType();
}

/**
* @param string $path
* @param null $storage
* @return Cache
*/
public function getCache($path = '', $storage = null) {
if ($this->cache) {
return $this->cache;
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Storage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Wrapper/Jail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ public function hasUpdated($path, $time) {
* 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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/private/Files/Storage/Wrapper/Wrapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ public function hasUpdated($path, $time) {
* 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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/public/Files/Mount/IMountPoint.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public function setMountPoint($mountPoint);
/**
* 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();
Expand Down
4 changes: 3 additions & 1 deletion lib/public/Files/Storage/IStorage.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,12 @@ public function setAvailability($isAvailable);
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
Expand Down