@@ -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 | */ |
@@ -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 | */ |
@@ -8,7 +8,7 @@ |
||
| 8 | 8 | * |
| 9 | 9 | * @param integer $start |
| 10 | 10 | * |
| 11 | - * @return mixed |
|
| 11 | + * @return double |
|
| 12 | 12 | */ |
| 13 | 13 | function delta_time($start=0) { |
| 14 | 14 | return microtime(true)-((float)$start); |
@@ -2546,7 +2546,7 @@ discard block |
||
| 2546 | 2546 | * @param string $header |
| 2547 | 2547 | * @param mixed $value |
| 2548 | 2548 | * |
| 2549 | - * @return int|mixed |
|
| 2549 | + * @return integer |
|
| 2550 | 2550 | */ |
| 2551 | 2551 | function _write8BIM(&$data, $pos, $type, $header, &$value) { |
| 2552 | 2552 | $signature = "8BIM"; |
@@ -2616,7 +2616,7 @@ discard block |
||
| 2616 | 2616 | * @param string $type |
| 2617 | 2617 | * @param mixed $value |
| 2618 | 2618 | * |
| 2619 | - * @return int|mixed |
|
| 2619 | + * @return integer |
|
| 2620 | 2620 | */ |
| 2621 | 2621 | function _writeIPTCEntry(&$data, $pos, $type, &$value) { |
| 2622 | 2622 | $pos = $this->_putShort($data, $pos, 0x1C02); |
@@ -2778,6 +2778,10 @@ discard block |
||
| 2778 | 2778 | } |
| 2779 | 2779 | |
| 2780 | 2780 | /*************************************************************/ |
| 2781 | + |
|
| 2782 | + /** |
|
| 2783 | + * @param string $mode |
|
| 2784 | + */ |
|
| 2781 | 2785 | function _exifTagTypes($mode) { |
| 2782 | 2786 | $tags = array(); |
| 2783 | 2787 | |
@@ -2928,6 +2932,10 @@ discard block |
||
| 2928 | 2932 | } |
| 2929 | 2933 | |
| 2930 | 2934 | /*************************************************************/ |
| 2935 | + |
|
| 2936 | + /** |
|
| 2937 | + * @param string $mode |
|
| 2938 | + */ |
|
| 2931 | 2939 | function _exifNameTags($mode) { |
| 2932 | 2940 | $tags = $this->_exifTagNames($mode); |
| 2933 | 2941 | return $this->_names2Tags($tags); |
@@ -3008,6 +3016,10 @@ discard block |
||
| 3008 | 3016 | } |
| 3009 | 3017 | |
| 3010 | 3018 | /*************************************************************/ |
| 3019 | + |
|
| 3020 | + /** |
|
| 3021 | + * @param integer $pos |
|
| 3022 | + */ |
|
| 3011 | 3023 | function _getShort(&$data, $pos, $bigEndian = true) { |
| 3012 | 3024 | if ($bigEndian) { |
| 3013 | 3025 | return (ord($data{$pos}) << 8) |
@@ -638,7 +638,7 @@ discard block |
||
| 638 | 638 | * @param string $file path to file |
| 639 | 639 | * @param string $mime mime type |
| 640 | 640 | * @param bool|int $old_rev revision timestamp or false |
| 641 | - * @return bool |
|
| 641 | + * @return false|null |
|
| 642 | 642 | */ |
| 643 | 643 | function media_notify($id,$file,$mime,$old_rev=false){ |
| 644 | 644 | global $conf; |
@@ -908,7 +908,7 @@ discard block |
||
| 908 | 908 | * @param string $image media id |
| 909 | 909 | * @param string $ns |
| 910 | 910 | * @param null|int $auth permission level |
| 911 | - * @param string|int $rev revision timestamp or empty string |
|
| 911 | + * @param boolean $rev revision timestamp or empty string |
|
| 912 | 912 | */ |
| 913 | 913 | function media_tab_view($image, $ns, $auth=null, $rev='') { |
| 914 | 914 | global $lang; |
@@ -977,7 +977,7 @@ discard block |
||
| 977 | 977 | * @param string $image media id |
| 978 | 978 | * @param int $auth permission level |
| 979 | 979 | * @param int|string $rev revision timestamp or empty string |
| 980 | - * @param JpegMeta|bool $meta |
|
| 980 | + * @param JpegMeta $meta |
|
| 981 | 981 | * |
| 982 | 982 | * @author Kate Arzamastseva <[email protected]> |
| 983 | 983 | */ |
@@ -1143,7 +1143,7 @@ discard block |
||
| 1143 | 1143 | * @param string $image image id |
| 1144 | 1144 | * @param int $auth permission level |
| 1145 | 1145 | * @param string|int $rev revision timestamp, or empty string |
| 1146 | - * @param bool|JpegMeta $meta image object, or create one if false |
|
| 1146 | + * @param JpegMeta $meta image object, or create one if false |
|
| 1147 | 1147 | */ |
| 1148 | 1148 | function media_details($image, $auth, $rev='', $meta=false) { |
| 1149 | 1149 | global $lang; |
@@ -1746,7 +1746,7 @@ discard block |
||
| 1746 | 1746 | * @param string $amp separator |
| 1747 | 1747 | * @param bool $abs absolute url? |
| 1748 | 1748 | * @param bool $params_array return the parmeters array? |
| 1749 | - * @return string|array - link or link parameters |
|
| 1749 | + * @return string[] - link or link parameters |
|
| 1750 | 1750 | */ |
| 1751 | 1751 | function media_managerURL($params=false, $amp='&', $abs=false, $params_array=false) { |
| 1752 | 1752 | global $ID; |
@@ -6,7 +6,8 @@ |
||
| 6 | 6 | * @author Andreas Gohr <[email protected]> |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | -use dokuwiki\ChangeLog\MediaChangeLog;use dokuwiki\Extension\Event; |
|
| 9 | +use dokuwiki\ChangeLog\MediaChangeLog; |
|
| 10 | +use dokuwiki\Extension\Event; |
|
| 10 | 11 | |
| 11 | 12 | /** |
| 12 | 13 | * Lists pages which currently use a media file selected for deletion |
@@ -382,7 +382,7 @@ |
||
| 382 | 382 | * @param string $path |
| 383 | 383 | * @param bool $keeptxt |
| 384 | 384 | * |
| 385 | - * @return mixed|string |
|
| 385 | + * @return string |
|
| 386 | 386 | */ |
| 387 | 387 | function pathID($path,$keeptxt=false){ |
| 388 | 388 | $id = utf8_decodeFN($path); |
@@ -424,7 +424,7 @@ |
||
| 424 | 424 | * @param string $id page id |
| 425 | 425 | * @param string|null $name the name of the link |
| 426 | 426 | * @param bool $return |
| 427 | - * @return true|string |
|
| 427 | + * @return string|boolean |
|
| 428 | 428 | */ |
| 429 | 429 | function tpl_pagelink($id, $name = null, $return = false) { |
| 430 | 430 | $out = '<bdi>'.html_wikilink($id, $name).'</bdi>'; |
@@ -408,7 +408,7 @@ discard block |
||
| 408 | 408 | * keep track of internal links in $this->meta['relation']['references'] |
| 409 | 409 | * |
| 410 | 410 | * @param string $id page ID to link to. eg. 'wiki:syntax' |
| 411 | - * @param string|array|null $name name for the link, array for media file |
|
| 411 | + * @param string $name name for the link, array for media file |
|
| 412 | 412 | */ |
| 413 | 413 | public function internallink($id, $name = null) { |
| 414 | 414 | global $ID; |
@@ -579,7 +579,7 @@ discard block |
||
| 579 | 579 | * |
| 580 | 580 | * @param string $name |
| 581 | 581 | * |
| 582 | - * @return mixed|string |
|
| 582 | + * @return string |
|
| 583 | 583 | */ |
| 584 | 584 | public function _simpleTitle($name) { |
| 585 | 585 | global $conf; |