@@ -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')); |
@@ -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(); |
@@ -348,6 +348,9 @@ discard block |
||
348 | 348 | } |
349 | 349 | } |
350 | 350 | |
351 | + /** |
|
352 | + * @param string $line |
|
353 | + */ |
|
351 | 354 | protected function _splitUserData($line){ |
352 | 355 | // due to a bug in PCRE 6.6, preg_split will fail with the regex we use here |
353 | 356 | // refer github issues 877 & 885 |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * |
175 | 175 | * @param DokuWiki_Plugin $plugin object of config plugin |
176 | 176 | * @param bool $echo true: show inputted value, when error occurred, otherwise the stored setting |
177 | - * @return array with content array(string $label_html, string $input_html) |
|
177 | + * @return string[] with content array(string $label_html, string $input_html) |
|
178 | 178 | */ |
179 | 179 | function html(&$plugin, $echo=false) { |
180 | 180 | global $lang; |
@@ -283,7 +283,7 @@ discard block |
||
283 | 283 | * |
284 | 284 | * @param DokuWiki_Plugin $plugin object of config plugin |
285 | 285 | * @param bool $echo true: show inputted value, when error occurred, otherwise the stored setting |
286 | - * @return array with content array(string $label_html, string $input_html) |
|
286 | + * @return string[] with content array(string $label_html, string $input_html) |
|
287 | 287 | */ |
288 | 288 | function html(&$plugin, $echo=false) { |
289 | 289 |
@@ -51,7 +51,7 @@ |
||
51 | 51 | * @param int $state The lexer state for the match |
52 | 52 | * @param int $pos The character position of the matched text |
53 | 53 | * @param Doku_Handler $handler The Doku_Handler object |
54 | - * @return array Return an array with all data you want to use in render |
|
54 | + * @return string[] Return an array with all data you want to use in render |
|
55 | 55 | */ |
56 | 56 | function handle($match, $state, $pos, Doku_Handler $handler){ |
57 | 57 | $match = substr($match,7,-2); //strip ~~INFO: from start and ~~ from end |
@@ -98,7 +98,7 @@ |
||
98 | 98 | * @param string $format output format being rendered |
99 | 99 | * @param Doku_Renderer $renderer the current renderer object |
100 | 100 | * @param array $data data created by handler() |
101 | - * @return boolean rendered correctly? (however, returned value is not used at the moment) |
|
101 | + * @return boolean|null rendered correctly? (however, returned value is not used at the moment) |
|
102 | 102 | */ |
103 | 103 | function render($format, Doku_Renderer $renderer, $data) { |
104 | 104 | trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING); |
@@ -43,6 +43,10 @@ |
||
43 | 43 | parent::tearDown(); |
44 | 44 | } |
45 | 45 | |
46 | + /** |
|
47 | + * @param string $importCsv |
|
48 | + * @param boolean $expectedResult |
|
49 | + */ |
|
46 | 50 | function doImportTest($importCsv, $expectedResult, $expectedNewUsers, $expectedFailures) { |
47 | 51 | global $auth; |
48 | 52 | $before_users = $auth->retrieveUsers(); |
@@ -29,6 +29,7 @@ discard block |
||
29 | 29 | /** |
30 | 30 | * @deprecated remove when dokuwiki requires php 5.3+ |
31 | 31 | * also associated unit test & usermanager methods |
32 | + * @param string $line |
|
32 | 33 | */ |
33 | 34 | public function access_str_getcsv($line){ |
34 | 35 | return $this->str_getcsv($line); |
@@ -51,6 +52,10 @@ discard block |
||
51 | 52 | |
52 | 53 | class auth_mock_authplain extends auth_plugin_authplain { |
53 | 54 | |
55 | + /** |
|
56 | + * @param string $op |
|
57 | + * @param boolean $canDo |
|
58 | + */ |
|
54 | 59 | public function setCanDo($op, $canDo) { |
55 | 60 | $this->cando[$op] = $canDo; |
56 | 61 | } |
@@ -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){ |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | * @param string $clear |
205 | 205 | * @param string $name |
206 | 206 | * @param string $mail |
207 | - * @param null|array $grps |
|
207 | + * @param string[] $grps |
|
208 | 208 | * @return bool|null |
209 | 209 | */ |
210 | 210 | public function createUser($user, $clear, $name, $mail, $grps = null) { |
@@ -406,7 +406,7 @@ discard block |
||
406 | 406 | * Return a count of the number of user which meet $filter criteria |
407 | 407 | * |
408 | 408 | * @param array $filter array of field/pattern pairs, empty array for no filter |
409 | - * @return int |
|
409 | + * @return boolean |
|
410 | 410 | */ |
411 | 411 | public function getUserCount($filter = array()) { |
412 | 412 | if(is_null($filter)) $filter = array(); |