@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | * fake password in which case leave it as it is. |
579 | 579 | * |
580 | 580 | * @param string $name |
581 | - * @param mixed $value |
|
581 | + * @param string $value |
|
582 | 582 | */ |
583 | 583 | public function setPassword( $name, $value ) { |
584 | 584 | if ( !preg_match( '/^\*+$/', $value ) ) { |
@@ -1266,7 +1266,7 @@ discard block |
||
1266 | 1266 | * |
1267 | 1267 | * If $versionInfo is not false, only executables with a version |
1268 | 1268 | * matching $versionInfo[1] will be returned. |
1269 | - * @return bool|string |
|
1269 | + * @return string|false |
|
1270 | 1270 | */ |
1271 | 1271 | public static function locateExecutable( $path, $names, $versionInfo = false ) { |
1272 | 1272 | if ( !is_array( $names ) ) { |
@@ -1298,14 +1298,14 @@ discard block |
||
1298 | 1298 | /** |
1299 | 1299 | * Same as locateExecutable(), but checks in getPossibleBinPaths() by default |
1300 | 1300 | * @see locateExecutable() |
1301 | - * @param array $names Array of possible names. |
|
1302 | - * @param array|bool $versionInfo Default: false or array with two members: |
|
1301 | + * @param string[] $names Array of possible names. |
|
1302 | + * @param string[] $versionInfo Default: false or array with two members: |
|
1303 | 1303 | * 0 => Command to run for version check, with $1 for the full executable name |
1304 | 1304 | * 1 => String to compare the output with |
1305 | 1305 | * |
1306 | 1306 | * If $versionInfo is not false, only executables with a version |
1307 | 1307 | * matching $versionInfo[1] will be returned. |
1308 | - * @return bool|string |
|
1308 | + * @return string|false |
|
1309 | 1309 | */ |
1310 | 1310 | public static function locateExecutableInDefaultPaths( $names, $versionInfo = false ) { |
1311 | 1311 | foreach ( self::getPossibleBinPaths() as $path ) { |
@@ -1324,7 +1324,7 @@ discard block |
||
1324 | 1324 | * Used only by environment checks. |
1325 | 1325 | * @param string $dir |
1326 | 1326 | * @param string $url |
1327 | - * @return bool|int|string |
|
1327 | + * @return string|false |
|
1328 | 1328 | */ |
1329 | 1329 | public function dirIsExecutable( $dir, $url ) { |
1330 | 1330 | $scriptTypes = array( |
@@ -1006,7 +1006,7 @@ discard block |
||
1006 | 1006 | } |
1007 | 1007 | |
1008 | 1008 | /** |
1009 | - * @param User|int $id |
|
1009 | + * @param User $id |
|
1010 | 1010 | * @return bool |
1011 | 1011 | */ |
1012 | 1012 | function showEmailUser( $id ) { |
@@ -1469,7 +1469,7 @@ discard block |
||
1469 | 1469 | * Get a cached notice |
1470 | 1470 | * |
1471 | 1471 | * @param string $name Message name, or 'default' for $wgSiteNotice |
1472 | - * @return string|bool HTML fragment, or false to indicate that the caller |
|
1472 | + * @return false|string HTML fragment, or false to indicate that the caller |
|
1473 | 1473 | * should fall back to the next notice in its sequence |
1474 | 1474 | */ |
1475 | 1475 | private function getCachedNotice( $name ) { |
@@ -1206,7 +1206,7 @@ discard block |
||
1206 | 1206 | * @since 1.27 |
1207 | 1207 | * |
1208 | 1208 | * @param string $referenceString Space delimited list of ids |
1209 | - * @param string|array $options String or array of strings (default is array()): |
|
1209 | + * @param string $options String or array of strings (default is array()): |
|
1210 | 1210 | * 'noninitial': This is a non-initial fragment of an id, not a full id, |
1211 | 1211 | * so don't pay attention if the first character isn't valid at the |
1212 | 1212 | * beginning of an id. Only matters if $wgExperimentalHtmlIds is |
@@ -1334,7 +1334,7 @@ discard block |
||
1334 | 1334 | * Pick the appropriate attribute value from a match set from the |
1335 | 1335 | * attribs regex matches. |
1336 | 1336 | * |
1337 | - * @param array $set |
|
1337 | + * @param string[] $set |
|
1338 | 1338 | * @throws MWException When tag conditions are not met. |
1339 | 1339 | * @return string |
1340 | 1340 | */ |
@@ -1850,7 +1850,7 @@ discard block |
||
1850 | 1850 | |
1851 | 1851 | /** |
1852 | 1852 | * @param string $url |
1853 | - * @return mixed|string |
|
1853 | + * @return string |
|
1854 | 1854 | */ |
1855 | 1855 | static function cleanUrl( $url ) { |
1856 | 1856 | # Normalize any HTML entities in input. They will be |
@@ -1936,7 +1936,7 @@ discard block |
||
1936 | 1936 | * @since 1.18 |
1937 | 1937 | * |
1938 | 1938 | * @param string $addr E-mail address |
1939 | - * @return bool |
|
1939 | + * @return null|boolean |
|
1940 | 1940 | */ |
1941 | 1941 | public static function validateEmail( $addr ) { |
1942 | 1942 | $result = null; |
@@ -751,7 +751,7 @@ discard block |
||
751 | 751 | |
752 | 752 | /** |
753 | 753 | * Determine if the stack has $tag in button scope. |
754 | - * @param BalanceElement|array|string $tag |
|
754 | + * @param string $tag |
|
755 | 755 | * @return bool |
756 | 756 | * @see https://html.spec.whatwg.org/multipage/syntax.html#has-an-element-in-button-scope |
757 | 757 | */ |
@@ -831,6 +831,7 @@ discard block |
||
831 | 831 | |
832 | 832 | /** |
833 | 833 | * Return the adjusted current node. |
834 | + * @param BalanceElement|null $fragmentContext |
|
834 | 835 | */ |
835 | 836 | public function adjustedCurrentNode( $fragmentContext ) { |
836 | 837 | return ( $fragmentContext && $this->length() === 1 ) ? |
@@ -840,7 +841,7 @@ discard block |
||
840 | 841 | /** |
841 | 842 | * Return an iterator over this stack which visits the current node |
842 | 843 | * first, and the root node last. |
843 | - * @return Iterator |
|
844 | + * @return ReverseArrayIterator |
|
844 | 845 | */ |
845 | 846 | public function getIterator() { |
846 | 847 | return new ReverseArrayIterator( $this->elements ); |
@@ -1063,7 +1064,7 @@ discard block |
||
1063 | 1064 | * @param string $tag The subject tag name. |
1064 | 1065 | * @param BalanceActiveFormattingElements $afe The current |
1065 | 1066 | * active formatting elements list. |
1066 | - * @return true if the adoption agency algorithm "did something", false |
|
1067 | + * @return boolean if the adoption agency algorithm "did something", false |
|
1067 | 1068 | * if more processing is required by the caller. |
1068 | 1069 | * @see https://html.spec.whatwg.org/multipage/syntax.html#adoption-agency-algorithm |
1069 | 1070 | */ |
@@ -1441,6 +1442,7 @@ discard block |
||
1441 | 1442 | * Find and return the last element with the specified tag between the |
1442 | 1443 | * end of the list and the last marker on the list. |
1443 | 1444 | * Used when parsing <a> "in body mode". |
1445 | + * @param string $tag |
|
1444 | 1446 | */ |
1445 | 1447 | public function findElementByTag( $tag ) { |
1446 | 1448 | $elt = $this->tail; |
@@ -1588,6 +1590,10 @@ discard block |
||
1588 | 1590 | * @see https://html.spec.whatwg.org/multipage/syntax.html#reconstruct-the-active-formatting-elements |
1589 | 1591 | */ |
1590 | 1592 | // @codingStandardsIgnoreEnd |
1593 | + |
|
1594 | + /** |
|
1595 | + * @param BalanceStack|null $stack |
|
1596 | + */ |
|
1591 | 1597 | public function reconstruct( $stack ) { |
1592 | 1598 | $entry = $this->tail; |
1593 | 1599 | // If there are no entries in the list of active formatting elements, |
@@ -2051,6 +2057,10 @@ discard block |
||
2051 | 2057 | return $oldMode; |
2052 | 2058 | } |
2053 | 2059 | |
2060 | + /** |
|
2061 | + * @param string $mode |
|
2062 | + * @param boolean $selfclose |
|
2063 | + */ |
|
2054 | 2064 | private function switchModeAndReprocess( $mode, $token, $value, $attribs, $selfclose ) { |
2055 | 2065 | $this->switchMode( $mode ); |
2056 | 2066 | return $this->insertToken( $token, $value, $attribs, $selfclose ); |
@@ -3080,6 +3090,11 @@ discard block |
||
3080 | 3090 | return false; |
3081 | 3091 | } |
3082 | 3092 | } |
3093 | + |
|
3094 | + /** |
|
3095 | + * @param string $token |
|
3096 | + * @param string $value |
|
3097 | + */ |
|
3083 | 3098 | private function inCellMode( $token, $value, $attribs = null, $selfclose = false ) { |
3084 | 3099 | if ( $token === 'tag' ) { |
3085 | 3100 | switch ( $value ) { |
@@ -205,42 +205,42 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
208 | - * @return mixed DB key name, or false on failure |
|
208 | + * @return boolean DB key name, or false on failure |
|
209 | 209 | */ |
210 | 210 | public function getName() { |
211 | 211 | return $this->getX( 'mName' ); |
212 | 212 | } |
213 | 213 | |
214 | 214 | /** |
215 | - * @return mixed Category ID, or false on failure |
|
215 | + * @return boolean Category ID, or false on failure |
|
216 | 216 | */ |
217 | 217 | public function getID() { |
218 | 218 | return $this->getX( 'mID' ); |
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
222 | - * @return mixed Total number of member pages, or false on failure |
|
222 | + * @return boolean Total number of member pages, or false on failure |
|
223 | 223 | */ |
224 | 224 | public function getPageCount() { |
225 | 225 | return $this->getX( 'mPages' ); |
226 | 226 | } |
227 | 227 | |
228 | 228 | /** |
229 | - * @return mixed Number of subcategories, or false on failure |
|
229 | + * @return boolean Number of subcategories, or false on failure |
|
230 | 230 | */ |
231 | 231 | public function getSubcatCount() { |
232 | 232 | return $this->getX( 'mSubcats' ); |
233 | 233 | } |
234 | 234 | |
235 | 235 | /** |
236 | - * @return mixed Number of member files, or false on failure |
|
236 | + * @return boolean Number of member files, or false on failure |
|
237 | 237 | */ |
238 | 238 | public function getFileCount() { |
239 | 239 | return $this->getX( 'mFiles' ); |
240 | 240 | } |
241 | 241 | |
242 | 242 | /** |
243 | - * @return Title|bool Title for this category, or false on failure. |
|
243 | + * @return Title Title for this category, or false on failure. |
|
244 | 244 | */ |
245 | 245 | public function getTitle() { |
246 | 246 | if ( $this->mTitle ) { |
@@ -260,7 +260,7 @@ discard block |
||
260 | 260 | * category sort key $offset. |
261 | 261 | * @param int $limit |
262 | 262 | * @param string $offset |
263 | - * @return TitleArray TitleArray object for category members. |
|
263 | + * @return TitleArrayFromResult|null TitleArray object for category members. |
|
264 | 264 | */ |
265 | 265 | public function getMembers( $limit = false, $offset = '' ) { |
266 | 266 |
@@ -651,7 +651,7 @@ discard block |
||
651 | 651 | } |
652 | 652 | |
653 | 653 | /** |
654 | - * @return bool|string |
|
654 | + * @return string|false |
|
655 | 655 | */ |
656 | 656 | protected function restoreErrorHandler() { |
657 | 657 | restore_error_handler(); |
@@ -1103,7 +1103,7 @@ discard block |
||
1103 | 1103 | * |
1104 | 1104 | * @param array $options Associative array of options to be turned into |
1105 | 1105 | * an SQL query, valid keys are listed in the function. |
1106 | - * @return array |
|
1106 | + * @return string[] |
|
1107 | 1107 | * @see DatabaseBase::select() |
1108 | 1108 | */ |
1109 | 1109 | public function makeSelectOptions( $options ) { |
@@ -2959,8 +2959,8 @@ discard block |
||
2959 | 2959 | * on object's error ignore settings). |
2960 | 2960 | * |
2961 | 2961 | * @param string $filename File name to open |
2962 | - * @param bool|callable $lineCallback Optional function called before reading each line |
|
2963 | - * @param bool|callable $resultCallback Optional function called for each MySQL result |
|
2962 | + * @param boolean $lineCallback Optional function called before reading each line |
|
2963 | + * @param boolean $resultCallback Optional function called for each MySQL result |
|
2964 | 2964 | * @param bool|string $fname Calling function name or false if name should be |
2965 | 2965 | * generated dynamically using $filename |
2966 | 2966 | * @param bool|callable $inputCallback Optional function called for each |
@@ -3291,7 +3291,7 @@ discard block |
||
3291 | 3291 | } |
3292 | 3292 | |
3293 | 3293 | /** |
3294 | - * @return string|bool Reason this DB is read-only or false if it is not |
|
3294 | + * @return string|false Reason this DB is read-only or false if it is not |
|
3295 | 3295 | */ |
3296 | 3296 | protected function getReadOnlyReason() { |
3297 | 3297 | $reason = $this->getLBInfo( 'readOnlyReason' ); |
@@ -376,7 +376,7 @@ discard block |
||
376 | 376 | /** |
377 | 377 | * Get the name of the specified field in a result |
378 | 378 | * |
379 | - * @param ResultWrapper|resource $res |
|
379 | + * @param resource $res |
|
380 | 380 | * @param int $n |
381 | 381 | * @return string |
382 | 382 | */ |
@@ -399,7 +399,7 @@ discard block |
||
399 | 399 | /** |
400 | 400 | * Get the type of the specified field in a result |
401 | 401 | * |
402 | - * @param ResultWrapper|resource $res |
|
402 | + * @param resource $res |
|
403 | 403 | * @param int $n |
404 | 404 | * @return string |
405 | 405 | */ |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | /** |
422 | 422 | * Move internal result pointer |
423 | 423 | * |
424 | - * @param ResultWrapper|resource $res |
|
424 | + * @param resource $res |
|
425 | 425 | * @param int $row |
426 | 426 | * @return bool |
427 | 427 | */ |
@@ -835,7 +835,7 @@ discard block |
||
835 | 835 | /** |
836 | 836 | * Get the position of the master from SHOW SLAVE STATUS |
837 | 837 | * |
838 | - * @return MySQLMasterPos|bool |
|
838 | + * @return DBMasterPos |
|
839 | 839 | */ |
840 | 840 | function getSlavePos() { |
841 | 841 | $res = $this->query( 'SHOW SLAVE STATUS', __METHOD__ ); |
@@ -1016,6 +1016,9 @@ discard block |
||
1016 | 1016 | return false; |
1017 | 1017 | } |
1018 | 1018 | |
1019 | + /** |
|
1020 | + * @param string $lockName |
|
1021 | + */ |
|
1019 | 1022 | private function makeLockName( $lockName ) { |
1020 | 1023 | // http://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_get-lock |
1021 | 1024 | // Newer version enforce a 64 char length limit. |
@@ -1371,6 +1374,9 @@ discard block |
||
1371 | 1374 | $is_pk, $is_unique, $is_multiple, $is_key, $type, $binary, |
1372 | 1375 | $is_numeric, $is_blob, $is_unsigned, $is_zerofill; |
1373 | 1376 | |
1377 | + /** |
|
1378 | + * @param stdClass $info |
|
1379 | + */ |
|
1374 | 1380 | function __construct( $info ) { |
1375 | 1381 | $this->name = $info->name; |
1376 | 1382 | $this->tablename = $info->table; |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * Constructor |
105 | 105 | * @param IContextSource $context Context to use, anything else will be ignored |
106 | 106 | * @param int $old Old ID we want to show and diff with. |
107 | - * @param string|int $new Either revision ID or 'prev' or 'next'. Default: 0. |
|
107 | + * @param integer $new Either revision ID or 'prev' or 'next'. Default: 0. |
|
108 | 108 | * @param int $rcid Deprecated, no longer used! |
109 | 109 | * @param bool $refreshCache If set, refreshes the diff cache |
110 | 110 | * @param bool $unhide If set, allow viewing deleted revs |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * |
175 | 175 | * @param int $id Revision ID |
176 | 176 | * |
177 | - * @return mixed URL or false |
|
177 | + * @return string|false URL or false |
|
178 | 178 | */ |
179 | 179 | public function deletedLink( $id ) { |
180 | 180 | if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) { |
@@ -676,7 +676,7 @@ discard block |
||
676 | 676 | * @param string|bool $ntitle Header for new text or false |
677 | 677 | * @param string $notice HTML between diff header and body |
678 | 678 | * |
679 | - * @return mixed |
|
679 | + * @return false|string |
|
680 | 680 | */ |
681 | 681 | public function getDiff( $otitle, $ntitle, $notice = '' ) { |
682 | 682 | $body = $this->getDiffBody(); |
@@ -698,7 +698,7 @@ discard block |
||
698 | 698 | /** |
699 | 699 | * Get the diff table body, without header |
700 | 700 | * |
701 | - * @return mixed (string/false) |
|
701 | + * @return false|string (string/false) |
|
702 | 702 | */ |
703 | 703 | public function getDiffBody() { |
704 | 704 | $this->mCacheHit = true; |
@@ -973,7 +973,7 @@ discard block |
||
973 | 973 | * |
974 | 974 | * @param string $text |
975 | 975 | * |
976 | - * @return mixed |
|
976 | + * @return string |
|
977 | 977 | */ |
978 | 978 | public function localiseLineNumbers( $text ) { |
979 | 979 | return preg_replace_callback( |
@@ -192,7 +192,7 @@ |
||
192 | 192 | /** |
193 | 193 | * Get an explanatory message if this backend is read-only |
194 | 194 | * |
195 | - * @return string|bool Returns false if the backend is not read-only |
|
195 | + * @return string|false Returns false if the backend is not read-only |
|
196 | 196 | */ |
197 | 197 | final public function getReadOnlyReason() { |
198 | 198 | return ( $this->readOnly != '' ) ? $this->readOnly : false; |