diff options
| author | Scrutinizer Auto-Fixer <auto-fixer@scrutinizer-ci.com> | 2016-02-17 13:21:07 +0000 |
|---|---|---|
| committer | Roeland Jago Douma <rullzer@owncloud.com> | 2016-02-19 09:43:11 +0100 |
| commit | 0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729 (patch) | |
| tree | 1e5c1ea5113b1d1dfb2d51b86ecfe3fd244b8e9f /lib/private/api.php | |
| parent | ae2304f23f04f1d6c84f2a049a4b0fdc0c9023c6 (diff) | |
| download | nextcloud-server-0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729.tar.gz nextcloud-server-0d0151a3e1fff5d98f2c764a90e7ebf4f98ae729.zip | |
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Diffstat (limited to 'lib/private/api.php')
| -rw-r--r-- | lib/private/api.php | 5 |
1 files changed, 3 insertions, 2 deletions
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; |