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

nextcloud · Oct 22, 2021 · 6b099ec · 6b099ec
2 parents 3b06b47 + e673ec0
commit 6b099ec
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
@@ -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;

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

diff --git a/lib/private/Files/Storage/Wrapper/Wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
@@ -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) {

diff --git a/lib/public/Files/Mount/IMountPoint.php b/lib/public/Files/Mount/IMountPoint.php
@@ -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();

diff --git a/lib/public/Files/Storage/IStorage.php b/lib/public/Files/Storage/IStorage.php
@@ -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