diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 15:28:50 +0200 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-04-27 15:28:50 +0200 |
commit | eb0e9e56467db90d0a8e828edbef0261c186cf37 (patch) | |
tree | 81a4a2fe446ffe4759eafe0ae1598a8e8c22ddcc | |
parent | 3b54161164229b5f48ced22d7db73d90406bcc32 (diff) | |
parent | db6395ae2050fdea3f0d5f5c38a02aeb76a48230 (diff) | |
download | nextcloud-server-eb0e9e56467db90d0a8e828edbef0261c186cf37.tar.gz nextcloud-server-eb0e9e56467db90d0a8e828edbef0261c186cf37.zip |
Merge pull request #15890 from owncloud/fix-helper-docs
Fix several type(hint) errors in private/helper.php
-rw-r--r-- | lib/private/helper.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 35c5147e2fa..144ccbfe228 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -129,9 +129,7 @@ class OC_Helper { /** * Creates an url using a defined route * @param string $route - * @param array $parameters - * @return - * @internal param array $args with param=>value, will be appended to the returned url + * @param array $parameters with param=>value, will be appended to the returned url * @return string the url * @deprecated Use \OC::$server->getURLGenerator()->linkToRoute($route, $parameters) * @@ -694,6 +692,7 @@ class OC_Helper { $match_length = strlen($matches[0][$last_match][0]); } else { $counter = 2; + $match_length = 0; $offset = false; } do { @@ -876,7 +875,7 @@ class OC_Helper { /** * Calculate PHP upload limit * - * @return PHP upload file size limit + * @return int PHP upload file size limit */ public static function uploadLimit() { $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); @@ -954,6 +953,7 @@ class OC_Helper { * @param string $path * @param \OCP\Files\FileInfo $rootInfo (optional) * @return array + * @throws \OCP\Files\NotFoundException */ public static function getStorageInfo($path, $rootInfo = null) { // return storage info without adding mount points @@ -984,6 +984,7 @@ class OC_Helper { // TODO: need a better way to get total space from storage if ($storage->instanceOfStorage('\OC\Files\Storage\Wrapper\Quota')) { + /** @var \OC\Files\Storage\Wrapper\Quota $storage */ $quota = $storage->getQuota(); } $free = $storage->free_space(''); |