summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2020-08-17 17:13:41 +0200
committerMorris Jobke <hey@morrisjobke.de>2020-08-17 17:13:46 +0200
commite47cfc9a546ff73f258b6350a4105986c2386be4 (patch)
treec3ea10b78483023ce55ecb75a36f4c8207c51b14 /lib
parentf6daf17fa773bd4b9c9aae070e39dfbefe8de935 (diff)
downloadnextcloud-server-e47cfc9a546ff73f258b6350a4105986c2386be4.tar.gz
nextcloud-server-e47cfc9a546ff73f258b6350a4105986c2386be4.zip
Properly add new methods to interface and document in PHPDoc for getRootMounts()
Introduced in #22063 and was just forgotten. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Files/Config/MountProviderCollection.php6
-rw-r--r--lib/private/legacy/OC_Util.php1
-rw-r--r--lib/public/Files/Config/IMountProviderCollection.php8
-rw-r--r--lib/public/Files/Config/IRootMountProvider.php2
4 files changed, 15 insertions, 2 deletions
diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php
index 2b57ffe6e4c..3900e9870bd 100644
--- a/lib/private/Files/Config/MountProviderCollection.php
+++ b/lib/private/Files/Config/MountProviderCollection.php
@@ -207,6 +207,12 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
$this->rootProviders[] = $provider;
}
+ /**
+ * Get all root mountpoints
+ *
+ * @return \OCP\Files\Mount\IMountPoint[]
+ * @since 20.0.0
+ */
public function getRootMounts(): array {
$loader = $this->loader;
$mounts = array_map(function (IRootMountProvider $provider) use ($loader) {
diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php
index fd55962447e..2dc5b61e7af 100644
--- a/lib/private/legacy/OC_Util.php
+++ b/lib/private/legacy/OC_Util.php
@@ -299,7 +299,6 @@ class OC_Util {
/** @var \OCP\Files\Config\IMountProviderCollection $mountProviderCollection */
$mountProviderCollection = \OC::$server->query(\OCP\Files\Config\IMountProviderCollection::class);
- /** @var \OCP\Files\Mount\IMountPoint[] $rootMountProviders */
$rootMountProviders = $mountProviderCollection->getRootMounts();
/** @var \OC\Files\Mount\Manager $mountManager */
diff --git a/lib/public/Files/Config/IMountProviderCollection.php b/lib/public/Files/Config/IMountProviderCollection.php
index 89b333b3e85..a4131514662 100644
--- a/lib/public/Files/Config/IMountProviderCollection.php
+++ b/lib/public/Files/Config/IMountProviderCollection.php
@@ -79,4 +79,12 @@ interface IMountProviderCollection {
* @since 9.0.0
*/
public function getMountCache();
+
+ /**
+ * Get all root mountpoints
+ *
+ * @return \OCP\Files\Mount\IMountPoint[]
+ * @since 20.0.0
+ */
+ public function getRootMounts(): array;
}
diff --git a/lib/public/Files/Config/IRootMountProvider.php b/lib/public/Files/Config/IRootMountProvider.php
index 0f7b0eca3d4..745fa530bed 100644
--- a/lib/public/Files/Config/IRootMountProvider.php
+++ b/lib/public/Files/Config/IRootMountProvider.php
@@ -32,7 +32,7 @@ use OCP\Files\Storage\IStorageFactory;
*/
interface IRootMountProvider {
/**
- * Get all root mountpoints
+ * Get all root mountpoints of this provider
*
* @return \OCP\Files\Mount\IMountPoint[]
* @since 20.0.0