@@ -454,7 +454,7 @@ |
||
| 454 | 454 | * |
| 455 | 455 | * @param string $id page id |
| 456 | 456 | * @param array $orig the original metadata |
| 457 | - * @return array|null array('current'=> array,'persistent'=> array); |
|
| 457 | + * @return string array('current'=> array,'persistent'=> array); |
|
| 458 | 458 | */ |
| 459 | 459 | function p_render_metadata($id, $orig){ |
| 460 | 460 | // make sure the correct ID is in global ID |
@@ -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)) { |
@@ -306,7 +306,7 @@ |
||
| 306 | 306 | /** |
| 307 | 307 | * Transform file to xml |
| 308 | 308 | * |
| 309 | - * @param mixed $data |
|
| 309 | + * @param string|boolean $data |
|
| 310 | 310 | * @return mixed |
| 311 | 311 | */ |
| 312 | 312 | public function toFile($data) { |
@@ -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) { |
@@ -713,6 +713,8 @@ |
||
| 713 | 713 | * |
| 714 | 714 | * @author Frank Schubert <[email protected]> |
| 715 | 715 | * @author Andreas Gohr <[email protected]> |
| 716 | + * @param boolean $ispage |
|
| 717 | + * @param string $name |
|
| 716 | 718 | */ |
| 717 | 719 | function _html_checkboxes($setperm,$ispage,$name){ |
| 718 | 720 | global $lang; |
@@ -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')); |
@@ -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); |
@@ -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){ |