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>

diff --git a/lib/private/Files/Config/MountProviderCollection.php b/lib/private/Files/Config/MountProviderCollection.php
index 2b57ffe6e4c0d70e58892017946b56c8ecf03dad..3900e9870bdf520a090a8bcd37874186e890f2fe 100644 (file)
--- 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 fd55962447e23f1681a3a9ad5ef745c00166554e..2dc5b61e7afd6074639fdb6455afde55b1829976 100644 (file)
--- 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 89b333b3e85323c12b0eff48f328624ad018c22e..a4131514662e90d7c45448f01d1264d0b62259bf 100644 (file)
--- 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 0f7b0eca3d4b148e3a934a84016a3b1e177ff6dd..745fa530bedd7bb1c94571161e8d88463a0153ca 100644 (file)
--- 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