@@ -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(); |
@@ -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(); |
@@ -90,7 +90,7 @@ |
||
90 | 90 | /** |
91 | 91 | * imports a database dump |
92 | 92 | * |
93 | - * @param $file |
|
93 | + * @param string $file |
|
94 | 94 | */ |
95 | 95 | protected function importDatabase($file) { |
96 | 96 | // connect to database and import dump |
@@ -226,6 +226,7 @@ discard block |
||
226 | 226 | * of the two files do not match, and likewise that the last lines do not |
227 | 227 | * match. The caller must trim matching lines from the beginning and end |
228 | 228 | * of the portions it is going to specify. |
229 | + * @param double $nchunks |
|
229 | 230 | */ |
230 | 231 | function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) { |
231 | 232 | $flip = false; |
@@ -336,6 +337,10 @@ discard block |
||
336 | 337 | * |
337 | 338 | * Note that XLIM, YLIM are exclusive bounds. |
338 | 339 | * All line numbers are origin-0 and discarded lines are not counted. |
340 | + * @param integer $xoff |
|
341 | + * @param integer $xlim |
|
342 | + * @param integer $yoff |
|
343 | + * @param integer $ylim |
|
339 | 344 | */ |
340 | 345 | function _compareseq($xoff, $xlim, $yoff, $ylim) { |
341 | 346 | // Slide down the bottom initial diagonal. |
@@ -918,6 +923,9 @@ discard block |
||
918 | 923 | $this->_tag = ''; |
919 | 924 | } |
920 | 925 | |
926 | + /** |
|
927 | + * @param string $new_tag |
|
928 | + */ |
|
921 | 929 | function _flushGroup($new_tag) { |
922 | 930 | if ($this->_group !== '') { |
923 | 931 | if ($this->_tag == 'mark') |
@@ -1339,6 +1347,8 @@ discard block |
||
1339 | 1347 | |
1340 | 1348 | /** |
1341 | 1349 | * @access private |
1350 | + * @param _DiffOp[] $edits1 |
|
1351 | + * @param _DiffOp[] $edits2 |
|
1342 | 1352 | */ |
1343 | 1353 | function _diff3($edits1, $edits2) { |
1344 | 1354 | $edits = array(); |
@@ -30,7 +30,7 @@ |
||
30 | 30 | * Options can be given as associative array (value => label) or as an |
31 | 31 | * indexd array (label = value). |
32 | 32 | * |
33 | - * @param null|array $options |
|
33 | + * @param string $options |
|
34 | 34 | * @return $this|array |
35 | 35 | */ |
36 | 36 | public function options($options = null) { |
@@ -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 | */ |
@@ -118,7 +118,7 @@ |
||
118 | 118 | } |
119 | 119 | |
120 | 120 | /** |
121 | - * @return bool|mixed |
|
121 | + * @return boolean |
|
122 | 122 | */ |
123 | 123 | public function getPregsplit_safe(){ |
124 | 124 | return $this->_pregsplit_safe; |