Merge pull request #14704 from owncloud/storage-wrapper-mount

pass mountpoint to storage wrapper callback

2 files changed, 10 insertions, 2 deletions

diff --git a/lib/public/files/mount/imountpoint.php b/lib/public/files/mount/imountpoint.php
index af7819ae160..2ec0cca1dce 100644
--- a/lib/public/files/mount/imountpoint.php
+++ b/lib/public/files/mount/imountpoint.php
@@ -64,4 +64,11 @@ interface IMountPoint {
 	 * @return mixed
 	 */
 	public function getOption($name, $default);
+
+	/**
+	 * Get all options for the mount
+	 *
+	 * @return array
+	 */
+	public function getOptions();
 }
diff --git a/lib/public/files/storage/istoragefactory.php b/lib/public/files/storage/istoragefactory.php
index 50c844af2e6..7d4fa55e418 100644
--- a/lib/public/files/storage/istoragefactory.php
+++ b/lib/public/files/storage/istoragefactory.php
@@ -7,6 +7,7 @@
  */
 
 namespace OCP\Files\Storage;
+use OCP\Files\Mount\IMountPoint;
 
 /**
  * Creates storage instances and manages and applies storage wrappers
@@ -25,10 +26,10 @@ interface IStorageFactory {
 	public function addStorageWrapper($wrapperName, $callback);
 
 	/**
-	 * @param string|boolean $mountPoint
+	 * @param \OCP\Files\Mount\IMountPoint $mountPoint
 	 * @param string $class
 	 * @param array $arguments
 	 * @return \OCP\Files\Storage
 	 */
-	public function getInstance($mountPoint, $class, $arguments);
+	public function getInstance(IMountPoint $mountPoint, $class, $arguments);
 }