Skip to content

Commit e47cfc9

Browse files
committed
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>
1 parent f6daf17 commit e47cfc9

4 files changed

Lines changed: 15 additions & 2 deletions

File tree

lib/private/Files/Config/MountProviderCollection.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,12 @@ public function registerRootProvider(IRootMountProvider $provider) {
207207
$this->rootProviders[] = $provider;
208208
}
209209

210+
/**
211+
* Get all root mountpoints
212+
*
213+
* @return \OCP\Files\Mount\IMountPoint[]
214+
* @since 20.0.0
215+
*/
210216
public function getRootMounts(): array {
211217
$loader = $this->loader;
212218
$mounts = array_map(function (IRootMountProvider $provider) use ($loader) {

lib/private/legacy/OC_Util.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ public static function setupFS($user = '') {
299299

300300
/** @var \OCP\Files\Config\IMountProviderCollection $mountProviderCollection */
301301
$mountProviderCollection = \OC::$server->query(\OCP\Files\Config\IMountProviderCollection::class);
302-
/** @var \OCP\Files\Mount\IMountPoint[] $rootMountProviders */
303302
$rootMountProviders = $mountProviderCollection->getRootMounts();
304303

305304
/** @var \OC\Files\Mount\Manager $mountManager */

lib/public/Files/Config/IMountProviderCollection.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,12 @@ public function registerHomeProvider(IHomeMountProvider $provider);
7979
* @since 9.0.0
8080
*/
8181
public function getMountCache();
82+
83+
/**
84+
* Get all root mountpoints
85+
*
86+
* @return \OCP\Files\Mount\IMountPoint[]
87+
* @since 20.0.0
88+
*/
89+
public function getRootMounts(): array;
8290
}

lib/public/Files/Config/IRootMountProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
*/
3333
interface IRootMountProvider {
3434
/**
35-
* Get all root mountpoints
35+
* Get all root mountpoints of this provider
3636
*
3737
* @return \OCP\Files\Mount\IMountPoint[]
3838
* @since 20.0.0

0 commit comments

Comments
 (0)