diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-08-17 19:34:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-17 19:34:56 +0200 |
| commit | 667552880488cd829e071a19d68d1faa0e57a7d7 (patch) | |
| tree | 2cd2b8db4c44b181354bdcf5fcbfadb7ebbf313d /lib | |
| parent | d98bd179b0f98b73ffda67489f60b8d55707ac52 (diff) | |
| parent | e47cfc9a546ff73f258b6350a4105986c2386be4 (diff) | |
| download | nextcloud-server-667552880488cd829e071a19d68d1faa0e57a7d7.tar.gz nextcloud-server-667552880488cd829e071a19d68d1faa0e57a7d7.zip | |
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…
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Config/MountProviderCollection.php | 6 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 1 | ||||
| -rw-r--r-- | lib/public/Files/Config/IMountProviderCollection.php | 8 | ||||
| -rw-r--r-- | 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 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 0be615a8e1d..f2aa0545afd 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 |