From e47cfc9a546ff73f258b6350a4105986c2386be4 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Mon, 17 Aug 2020 17:13:41 +0200 Subject: [PATCH] Properly add new methods to interface and document in PHPDoc for getRootMounts() Introduced in #22063 and was just forgotten. Signed-off-by: Morris Jobke --- lib/private/Files/Config/MountProviderCollection.php | 6 ++++++ lib/private/legacy/OC_Util.php | 1 - lib/public/Files/Config/IMountProviderCollection.php | 8 ++++++++ lib/public/Files/Config/IRootMountProvider.php | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php index 2b57ffe6e4c0d..3900e9870bdf5 100644 --- a/lib/private/Files/Config/MountProviderCollection.php +++ b/lib/private/Files/Config/MountProviderCollection.php @@ -207,6 +207,12 @@ public function registerRootProvider(IRootMountProvider $provider) { $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 fd55962447e23..2dc5b61e7afd6 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -299,7 +299,6 @@ public static function setupFS($user = '') { /** @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 89b333b3e8532..a4131514662e9 100644 --- a/lib/public/Files/Config/IMountProviderCollection.php +++ b/lib/public/Files/Config/IMountProviderCollection.php @@ -79,4 +79,12 @@ public function registerHomeProvider(IHomeMountProvider $provider); * @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 0f7b0eca3d4b1..745fa530bedd7 100644 --- a/lib/public/Files/Config/IRootMountProvider.php +++ b/lib/public/Files/Config/IRootMountProvider.php @@ -32,7 +32,7 @@ */ interface IRootMountProvider { /** - * Get all root mountpoints + * Get all root mountpoints of this provider * * @return \OCP\Files\Mount\IMountPoint[] * @since 20.0.0