summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-06-17 16:53:32 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-06-17 16:53:32 +0200
commitbfa716acaad142ea844f276ab87e6dd5b9e85b17 (patch)
tree5438a5bf5563c64ea0420809c4bd28a1bc05cf4e
parentea9c21f94ed1c3d1efb8bf0539dd866786b1f26c (diff)
parent6856316122a9aad1fe5a3068f20eb40a3ed80c10 (diff)
downloadnextcloud-server-bfa716acaad142ea844f276ab87e6dd5b9e85b17.tar.gz
nextcloud-server-bfa716acaad142ea844f276ab87e6dd5b9e85b17.zip
Merge pull request #16995 from owncloud/fix-ocp-phpdoc
Fix return value for OCP PHPDoc
-rw-r--r--lib/private/server.php2
-rw-r--r--lib/public/iservercontainer.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/server.php b/lib/private/server.php
index b524b3df1b1..497f43206ff 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -786,7 +786,7 @@ class Server extends SimpleContainer implements IServerContainer {
* Get the certificate manager for the user
*
* @param string $uid (optional) if not specified the current loggedin user is used
- * @return \OCP\ICertificateManager
+ * @return \OCP\ICertificateManager | null if $uid is null and no user is logged in
*/
public function getCertificateManager($uid = null) {
if (is_null($uid)) {
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 51bd00c6b6f..27702803207 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -316,7 +316,7 @@ interface IServerContainer {
* Get the certificate manager for the user
*
* @param string $userId (optional) if not specified the current loggedin user is used
- * @return \OCP\ICertificateManager
+ * @return \OCP\ICertificateManager | null if $userId is null and no user is logged in
* @since 8.0.0
*/
public function getCertificateManager($userId = null);