Completed
Pull Request — stable7 (#24167)
by Lukas
07:55
created
lib/private/template/base.php 1 patch
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -18,6 +18,7 @@
 block discarded – undo
18 18
 	 * @param string $template
19 19
 	 * @param \OC_L10N $l10n
20 20
 	 * @param \OC_Defaults $theme
21
+	 * @param string $requesttoken
21 22
 	 */
22 23
 	public function __construct( $template, $requesttoken, $l10n, $theme ) {
23 24
 		$this->vars = array();
Please login to merge, or discard this patch.
lib/private/template/functions.php 1 patch
Doc Comments   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 
9 9
 /**
10 10
  * Prints a sanitized string
11
- * @param string|array $string the string which will be escaped and printed
11
+ * @param string $string the string which will be escaped and printed
12 12
  */
13 13
 function p($string) {
14 14
 	print(OC_Util::sanitizeHTML($string));
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 /**
18 18
  * Prints an unsanitized string - usage of this function may result into XSS.
19 19
  * Consider using p() instead.
20
- * @param string|array $string the string which will be printed as it is
20
+ * @param string $string the string which will be printed as it is
21 21
  */
22 22
 function print_unescaped($string) {
23 23
 	print($string);
@@ -121,7 +121,7 @@  discard block
 block discarded – undo
121 121
  * make preview_icon available as a simple function
122 122
  * Returns the path to the preview of the image.
123 123
  * @param string $path path of file
124
- * @return link to the preview
124
+ * @return string to the preview
125 125
  *
126 126
  * For further information have a look at OC_Helper::previewIcon
127 127
  */
Please login to merge, or discard this patch.
lib/private/user.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -314,7 +314,7 @@  discard block
 block discarded – undo
314 314
 	/**
315 315
 	 * Sets user display name for session
316 316
 	 * @param string $uid
317
-	 * @param null $displayName
317
+	 * @param string $displayName
318 318
 	 * @return bool Whether the display name could get set
319 319
 	 */
320 320
 	public static function setDisplayName($uid, $displayName = null) {
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
 
341 341
 	/**
342 342
 	 * Check if the user is logged in, considers also the HTTP basic credentials
343
-	 * @return bool
343
+	 * @return boolean|null
344 344
 	 */
345 345
 	public static function isLoggedIn() {
346 346
 		if (\OC::$session->get('user_id') !== null && self::$incognitoMode === false) {
Please login to merge, or discard this patch.
lib/public/template.php 1 patch
Doc Comments   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -76,7 +76,6 @@  discard block
 block discarded – undo
76 76
 /**
77 77
  * Make OC_Helper::humanFileSize available as a simple function
78 78
  * Example: 2048 to 2 kB.
79
- * @param int $size in bytes
80 79
  * @return string size as string
81 80
  */
82 81
 function human_file_size( $bytes ) {
@@ -87,7 +86,7 @@  discard block
 block discarded – undo
87 86
 /**
88 87
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
89 88
  * @param int $timestamp unix timestamp
90
- * @param boolean $dateOnly
89
+ * @param integer $dateOnly
91 90
  * @return OC_L10N_String human readable interpretation of the timestamp
92 91
  */
93 92
 function relative_modified_date( $timestamp, $dateOnly = false ) {
Please login to merge, or discard this patch.
lib/public/user.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -76,7 +76,7 @@
 block discarded – undo
76 76
 
77 77
 	/**
78 78
 	 * Check if the user is logged in
79
-	 * @return boolean
79
+	 * @return boolean|null
80 80
 	 */
81 81
 	public static function isLoggedIn() {
82 82
 		return \OC_User::isLoggedIn();
Please login to merge, or discard this patch.
lib/public/util.php 1 patch
Doc Comments   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -330,7 +330,7 @@  discard block
 block discarded – undo
330 330
 	/**
331 331
 	 * Make a computer file size (2 kB to 2048)
332 332
 	 * @param string $str file size in a fancy format
333
-	 * @return int a file size in bytes
333
+	 * @return double a file size in bytes
334 334
 	 *
335 335
 	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
336 336
 	 */
@@ -389,8 +389,8 @@  discard block
 block discarded – undo
389 389
 	 * This function is used to sanitize HTML and should be applied on any
390 390
 	 * string or array of strings before displaying it on a web page.
391 391
 	 *
392
-	 * @param string|array $value
393
-	 * @return string|array an array of sanitized strings or a single sinitized string, depends on the input parameter.
392
+	 * @param string $value
393
+	 * @return string an array of sanitized strings or a single sinitized string, depends on the input parameter.
394 394
 	 */
395 395
 	public static function sanitizeHTML( $value ) {
396 396
 		return(\OC_Util::sanitizeHTML($value));
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 	 * @param array $input The array to work on
417 417
 	 * @param int $case Either MB_CASE_UPPER or MB_CASE_LOWER (default)
418 418
 	 * @param string $encoding The encoding parameter is the character encoding. Defaults to UTF-8
419
-	 * @return array
419
+	 * @return string
420 420
 	 */
421 421
 	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8') {
422 422
 		return(\OC_Helper::mb_array_change_key_case($input, $case, $encoding));
Please login to merge, or discard this patch.
lib/repair/innodb.php 1 patch
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -67,7 +67,7 @@
 block discarded – undo
67 67
 	}
68 68
 
69 69
 	/**
70
-	 * @param \Doctrine\DBAL\Connection $connection
70
+	 * @param \OC\DB\Connection $connection
71 71
 	 * @return string[]
72 72
 	 */
73 73
 	protected function getAllNonUTF8BinTables($connection) {
Please login to merge, or discard this patch.
lib/repair/repairconfig.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -10,7 +10,6 @@
 block discarded – undo
10 10
 
11 11
 use OC\Hooks\BasicEmitter;
12 12
 use OC\RepairStep;
13
-use Sabre\DAV\Exception;
14 13
 
15 14
 /**
16 15
  * Class RepairConfig
Please login to merge, or discard this patch.
tests/lib/helper.php 1 patch
Doc Comments   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -486,8 +486,8 @@
 block discarded – undo
486 486
 	/**
487 487
 	 * Allows us to test private methods/properties
488 488
 	 *
489
-	 * @param $object
490
-	 * @param $methodName
489
+	 * @param OC_TemplateLayout $object
490
+	 * @param string $methodName
491 491
 	 * @param array $parameters
492 492
 	 * @return mixed
493 493
 	 */
Please login to merge, or discard this patch.