[Pkg-owncloud-commits] [owncloud] 109/172: Fix Scrutinizer errors

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit bac8962bbc8cbeb4382df6bf5c8b9244c0f6340e
Author: Robin McCorkell <rmccorkell at karoshi.org.uk>
Date:   Mon May 12 23:27:36 2014 +0100

    Fix Scrutinizer errors
---
 lib/private/config.php       | 6 +++---
 lib/private/files/view.php   | 5 +++++
 lib/private/hook.php         | 2 +-
 lib/private/user/session.php | 6 +++---
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/private/config.php b/lib/private/config.php
index 2320db9..4242682 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -77,8 +77,8 @@ class Config {
 	/**
 	 * @brief Gets a value from config.php
 	 * @param string $key key
-	 * @param array|bool|string|null $default = null default value
-	 * @return string the value or $default
+	 * @param mixed $default = null default value
+	 * @return mixed the value or $default
 	 *
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
@@ -94,7 +94,7 @@ class Config {
 	/**
 	 * @brief Sets a value
 	 * @param string $key key
-	 * @param string $value value
+	 * @param mixed $value value
 	 *
 	 * This function sets the value and writes the config.php.
 	 *
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index a53c2fb..1f42475 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -552,6 +552,11 @@ class View {
 		}
 	}
 
+	/**
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
 	public function fopen($path, $mode) {
 		$hooks = array();
 		switch ($mode) {
diff --git a/lib/private/hook.php b/lib/private/hook.php
index 7ae6496..b715db2 100644
--- a/lib/private/hook.php
+++ b/lib/private/hook.php
@@ -45,7 +45,7 @@ class OC_Hook{
 	 * @brief emits a signal
 	 * @param string $signalclass class name of emitter
 	 * @param string $signalname name of signal
-	 * @param array $params default: array() array with additional data
+	 * @param mixed $params default: array() array with additional data
 	 * @return bool, true if slots exists or false if not
 	 *
 	 * Emits a signal. To get data from the slot use references!
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 1740bad..3d10b13 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -82,7 +82,7 @@ class Session implements Emitter, \OCP\IUserSession {
 	/**
 	 * set the currently active user
 	 *
-	 * @param \OC\User\User $user
+	 * @param \OC\User\User|null $user
 	 */
 	public function setUser($user) {
 		if (is_null($user)) {
@@ -115,7 +115,7 @@ class Session implements Emitter, \OCP\IUserSession {
 	/**
 	 * set the login name
 	 *
-	 * @param string $loginName for the logged in user
+	 * @param string|null $loginName for the logged in user
 	 */
 	public function setLoginName($loginName) {
 		if (is_null($loginName)) {
@@ -191,7 +191,7 @@ class Session implements Emitter, \OCP\IUserSession {
 		$expires = time() + \OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
 		setcookie("oc_username", $username, $expires, \OC::$WEBROOT, '', $secure_cookie);
 		setcookie("oc_token", $token, $expires, \OC::$WEBROOT, '', $secure_cookie, true);
-		setcookie("oc_remember_login", true, $expires, \OC::$WEBROOT, '', $secure_cookie);
+		setcookie("oc_remember_login", "1", $expires, \OC::$WEBROOT, '', $secure_cookie);
 	}
 
 	/**

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