mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22271 from nextcloud/phpdoc/22063/add-interface-method-and-phpdoc 

Properly add new methods to interface and document in PHPDoc for getR…
This commit is contained in:
Roeland Jago Douma 2020-08-17 19:34:56 +02:00 committed by GitHub
parent d98bd179b0 e47cfc9a54
commit 6675528804
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/private/Files/Config/MountProviderCollection.php
View File

@ -207,6 +207,12 @@ class MountProviderCollection implements IMountProviderCollection, Emitter {
$this->rootProviders[] = $provider; $this->rootProviders[] = $provider;
} }
/**
* Get all root mountpoints
*
* @return \OCP\Files\Mount\IMountPoint[]
* @since 20.0.0
*/
public function getRootMounts(): array { public function getRootMounts(): array {
$loader = $this->loader; $loader = $this->loader;
$mounts = array_map(function (IRootMountProvider $provider) use ($loader) { $mounts = array_map(function (IRootMountProvider $provider) use ($loader) {

1
lib/private/legacy/OC_Util.php
View File

@ -299,7 +299,6 @@ class OC_Util {
/** @var \OCP\Files\Config\IMountProviderCollection $mountProviderCollection */ /** @var \OCP\Files\Config\IMountProviderCollection $mountProviderCollection */
$mountProviderCollection = \OC::$server->query(\OCP\Files\Config\IMountProviderCollection::class); $mountProviderCollection = \OC::$server->query(\OCP\Files\Config\IMountProviderCollection::class);
/** @var \OCP\Files\Mount\IMountPoint[] $rootMountProviders */
$rootMountProviders = $mountProviderCollection->getRootMounts(); $rootMountProviders = $mountProviderCollection->getRootMounts();
/** @var \OC\Files\Mount\Manager $mountManager */ /** @var \OC\Files\Mount\Manager $mountManager */

8
lib/public/Files/Config/IMountProviderCollection.php
View File

@ -79,4 +79,12 @@ interface IMountProviderCollection {
* @since 9.0.0 * @since 9.0.0
*/ */
public function getMountCache(); public function getMountCache();
/**
* Get all root mountpoints
*
* @return \OCP\Files\Mount\IMountPoint[]
* @since 20.0.0
*/
public function getRootMounts(): array;
} }

2
lib/public/Files/Config/IRootMountProvider.php
View File

@ -32,7 +32,7 @@ use OCP\Files\Storage\IStorageFactory;
*/ */
interface IRootMountProvider { interface IRootMountProvider {
/** /**
* Get all root mountpoints * Get all root mountpoints of this provider
* *
* @return \OCP\Files\Mount\IMountPoint[] * @return \OCP\Files\Mount\IMountPoint[]
* @since 20.0.0 * @since 20.0.0