@@ -113,6 +113,7 @@ |
||
113 | 113 | * @param string|null &$salt The salt, pass null if you want one generated |
114 | 114 | * @param int $len The length of the salt |
115 | 115 | * @param bool $cut Apply length restriction to existing salt? |
116 | + * @param string|null $salt |
|
116 | 117 | */ |
117 | 118 | public function init_salt(&$salt, $len = 32, $cut = true) { |
118 | 119 | if(is_null($salt)) { |
@@ -614,7 +614,7 @@ |
||
614 | 614 | /** |
615 | 615 | * Decodes numeric HTML entities to their correct UTF-8 characters |
616 | 616 | * |
617 | - * @param $ent string A numeric entity |
|
617 | + * @param string $ent string A numeric entity |
|
618 | 618 | * @return string|false |
619 | 619 | */ |
620 | 620 | function utf8_decode_numeric($ent) { |
@@ -765,7 +765,7 @@ |
||
765 | 765 | * @author Matthias Grimm <[email protected]> |
766 | 766 | * |
767 | 767 | * @param string $user user's nick to get data for |
768 | - * @return false|array false on error, user info on success |
|
768 | + * @return string false on error, user info on success |
|
769 | 769 | */ |
770 | 770 | protected function _retrieveUserInfo($user) { |
771 | 771 | $sql = str_replace('%{user}', $this->_escape($user), $this->getConf('getUserInfo')); |
@@ -1035,6 +1035,7 @@ |
||
1035 | 1035 | * |
1036 | 1036 | * @param array $user data of user |
1037 | 1037 | * @param string &$error reference catched error message |
1038 | + * @param string $error |
|
1038 | 1039 | * @return bool whether successful |
1039 | 1040 | */ |
1040 | 1041 | protected function _addImportUser($user, & $error){ |
@@ -286,7 +286,7 @@ |
||
286 | 286 | * Adds a label referencing another input element, allows HTML for content |
287 | 287 | * |
288 | 288 | * @param string $content |
289 | - * @param string|Element $for |
|
289 | + * @param string $for |
|
290 | 290 | * @param int $pos |
291 | 291 | * @return Element |
292 | 292 | */ |
@@ -183,7 +183,7 @@ |
||
183 | 183 | * @param string $user Username |
184 | 184 | * @param string $pass Cleartext Password |
185 | 185 | * @param bool $sticky Cookie should not expire |
186 | - * @return bool true on successful auth |
|
186 | + * @return boolean|null true on successful auth |
|
187 | 187 | */ |
188 | 188 | public function trustExternal($user, $pass, $sticky = false) { |
189 | 189 | /* some example: |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | * @author Andreas Gohr <[email protected]> |
83 | 83 | * @param string $user |
84 | 84 | * @param bool $requireGroups (optional) ignored by this plugin, grps info always supplied |
85 | - * @return array|false |
|
85 | + * @return string |
|
86 | 86 | */ |
87 | 87 | public function getUserData($user, $requireGroups=true) { |
88 | 88 | if($this->users === null) $this->_loadUserData(); |
@@ -380,6 +380,9 @@ discard block |
||
380 | 380 | return $users; |
381 | 381 | } |
382 | 382 | |
383 | + /** |
|
384 | + * @param string $line |
|
385 | + */ |
|
383 | 386 | protected function _splitUserData($line){ |
384 | 387 | // due to a bug in PCRE 6.6, preg_split will fail with the regex we use here |
385 | 388 | // refer github issues 877 & 885 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | * |
24 | 24 | * @param string $file file name |
25 | 25 | * @param bool $knownonly |
26 | - * @return array with extension, mimetype and if it should be downloaded |
|
26 | + * @return string with extension, mimetype and if it should be downloaded |
|
27 | 27 | */ |
28 | 28 | function mimetype($file, $knownonly=true){ |
29 | 29 | $mtypes = getMimeTypes(); // known mimetypes |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * @param string $file |
245 | 245 | * @param bool $lower |
246 | 246 | * |
247 | - * @return array |
|
247 | + * @return string |
|
248 | 248 | */ |
249 | 249 | function confToHash($file,$lower=false) { |
250 | 250 | $conf = array(); |
@@ -942,6 +942,9 @@ discard block |
||
942 | 942 | $this->_tag = ''; |
943 | 943 | } |
944 | 944 | |
945 | + /** |
|
946 | + * @param string $new_tag |
|
947 | + */ |
|
945 | 948 | function _flushGroup($new_tag) { |
946 | 949 | if ($this->_group !== '') { |
947 | 950 | if ($this->_tag == 'mark') |
@@ -1364,8 +1367,8 @@ discard block |
||
1364 | 1367 | /** |
1365 | 1368 | * @access private |
1366 | 1369 | * |
1367 | - * @param array $edits1 |
|
1368 | - * @param array $edits2 |
|
1370 | + * @param _DiffOp[] $edits1 |
|
1371 | + * @param _DiffOp[] $edits2 |
|
1369 | 1372 | * |
1370 | 1373 | * @return array |
1371 | 1374 | */ |