From 0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729 Mon Sep 17 00:00:00 2001
From: Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com>
Date: Wed, 17 Feb 2016 13:21:07 +0000
Subject: Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
---
 lib/private/api.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib/private/api.php')

diff --git a/lib/private/api.php b/lib/private/api.php
index 6c6be233c9d..734bb30d334 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -188,7 +188,7 @@ class OC_API {
 	/**
 	 * merge the returned result objects into one response
 	 * @param array $responses
-	 * @return array|\OC_OCS_Result
+	 * @return OC_OCS_Result
 	 */
 	public static function mergeResponses($responses) {
 		// Sort into shipped and third-party
@@ -329,7 +329,7 @@ class OC_API {
 
 	/**
 	 * http basic auth
-	 * @return string|false (username, or false on failure)
+	 * @return string (username, or false on failure)
 	 */
 	private static function loginUser() {
 		if(self::$isLoggedIn === true) {
@@ -442,6 +442,7 @@ class OC_API {
 
 	/**
 	 * Based on the requested format the response content type is set
+	 * @param string $format
 	 */
 	public static function setContentType($format = null) {
 		$format = is_null($format) ? self::requestedFormat() : $format;
-- 
cgit v1.2.3