[Pkg-owncloud-commits] [owncloud] 443/457: Fix return value for OCP PHPDoc

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 6856316122a9aad1fe5a3068f20eb40a3ed80c10
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Wed Jun 17 15:47:45 2015 +0200

    Fix return value for OCP PHPDoc
---
 lib/private/server.php          | 2 +-
 lib/public/iservercontainer.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index b524b3d..497f432 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 51bd00c..2770280 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);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git