| Index: trunk/phase3/includes/EditPage.php |
| — | — | @@ -2182,7 +2182,7 @@ |
| 2183 | 2183 | * The $textoverride method can be used by subclasses overriding showContentForm |
| 2184 | 2184 | * to pass back to this method. |
| 2185 | 2185 | * |
| 2186 | | - * @param $customAttribs An array of html attributes to use in the textarea |
| | 2186 | + * @param $customAttribs array of html attributes to use in the textarea |
| 2187 | 2187 | * @param $textoverride String: optional text to override $this->textarea1 with |
| 2188 | 2188 | */ |
| 2189 | 2189 | protected function showTextbox1( $customAttribs = null, $textoverride = null ) { |
| — | — | @@ -2817,7 +2817,7 @@ |
| 2818 | 2818 | * Returns an array of html code of the following checkboxes: |
| 2819 | 2819 | * minor and watch |
| 2820 | 2820 | * |
| 2821 | | - * @param $tabindex Current tabindex |
| | 2821 | + * @param $tabindex int Current tabindex |
| 2822 | 2822 | * @param $checked Array of checkbox => bool, where bool indicates the checked |
| 2823 | 2823 | * status of the checkbox |
| 2824 | 2824 | * |
| — | — | @@ -2868,7 +2868,7 @@ |
| 2869 | 2869 | * Returns an array of html code of the following buttons: |
| 2870 | 2870 | * save, diff, preview and live |
| 2871 | 2871 | * |
| 2872 | | - * @param $tabindex Current tabindex |
| | 2872 | + * @param $tabindex int Current tabindex |
| 2873 | 2873 | * |
| 2874 | 2874 | * @return array |
| 2875 | 2875 | */ |
| — | — | @@ -2997,7 +2997,7 @@ |
| 2998 | 2998 | /** |
| 2999 | 2999 | * Produce the stock "your edit contains spam" page |
| 3000 | 3000 | * |
| 3001 | | - * @param $match Text which triggered one or more filters |
| | 3001 | + * @param $match string Text which triggered one or more filters |
| 3002 | 3002 | * @deprecated since 1.17 Use method spamPageWithContent() instead |
| 3003 | 3003 | */ |
| 3004 | 3004 | static function spamPage( $match = false ) { |
| — | — | @@ -3020,7 +3020,7 @@ |
| 3021 | 3021 | /** |
| 3022 | 3022 | * Show "your edit contains spam" page with your diff and text |
| 3023 | 3023 | * |
| 3024 | | - * @param $match Text which triggered one or more filters |
| | 3024 | + * @param $match string|bool Text which triggered one or more filters |
| 3025 | 3025 | */ |
| 3026 | 3026 | public function spamPageWithContent( $match = false ) { |
| 3027 | 3027 | global $wgOut; |
| Index: trunk/phase3/includes/api/ApiQueryRecentChanges.php |
| — | — | @@ -304,7 +304,7 @@ |
| 305 | 305 | * Extracts from a single sql row the data needed to describe one recent change. |
| 306 | 306 | * |
| 307 | 307 | * @param $row The row from which to extract the data. |
| 308 | | - * @return An array mapping strings (descriptors) to their respective string values. |
| | 308 | + * @return array An array mapping strings (descriptors) to their respective string values. |
| 309 | 309 | * @access public |
| 310 | 310 | */ |
| 311 | 311 | public function extractRowInfo( $row ) { |
| Index: trunk/phase3/includes/api/ApiDelete.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | * @param $oldimage |
| 147 | 147 | * @param $reason |
| 148 | 148 | * @param $suppress bool |
| 149 | | - * @return \type|array|Title |
| | 149 | + * @return array|Title |
| 150 | 150 | */ |
| 151 | 151 | public static function deleteFile( Page $page, User $user, $token, $oldimage, &$reason = null, $suppress = false ) { |
| 152 | 152 | $title = $page->getTitle(); |
| Index: trunk/phase3/includes/HTMLForm.php |
| — | — | @@ -664,7 +664,7 @@ |
| 665 | 665 | |
| 666 | 666 | /** |
| 667 | 667 | * Get the text for the submit button, either customised or a default. |
| 668 | | - * @return unknown_type |
| | 668 | + * @return |
| 669 | 669 | */ |
| 670 | 670 | function getSubmitText() { |
| 671 | 671 | return $this->mSubmitText |
| — | — | @@ -852,7 +852,7 @@ |
| 853 | 853 | * to the form as a whole, after it's submitted but before it's |
| 854 | 854 | * processed. |
| 855 | 855 | * @param $data |
| 856 | | - * @return unknown_type |
| | 856 | + * @return |
| 857 | 857 | */ |
| 858 | 858 | function filterDataForSubmit( $data ) { |
| 859 | 859 | return $data; |
| Index: trunk/phase3/includes/ImageGallery.php |
| — | — | @@ -75,7 +75,7 @@ |
| 76 | 76 | /** |
| 77 | 77 | * Set the caption (as plain text) |
| 78 | 78 | * |
| 79 | | - * @param $caption Caption |
| | 79 | + * @param $caption string Caption |
| 80 | 80 | */ |
| 81 | 81 | function setCaption( $caption ) { |
| 82 | 82 | $this->mCaption = htmlspecialchars( $caption ); |
| Index: trunk/phase3/includes/FormOptions.php |
| — | — | @@ -65,7 +65,7 @@ |
| 66 | 66 | * |
| 67 | 67 | * @param $data Mixed: value to guess type for |
| 68 | 68 | * @exception MWException Unsupported datatype |
| 69 | | - * @return Type constant |
| | 69 | + * @return int Type constant |
| 70 | 70 | */ |
| 71 | 71 | public static function guessType( $data ) { |
| 72 | 72 | if ( is_bool( $data ) ) { |
| Index: trunk/phase3/includes/Import.php |
| — | — | @@ -301,7 +301,8 @@ |
| 302 | 302 | |
| 303 | 303 | /** |
| 304 | 304 | * Notify the callback function of a revision |
| 305 | | - * @param $revision A WikiRevision object |
| | 305 | + * @param $revision |WikiRevision object |
| | 306 | + * @return bool|mixed |
| 306 | 307 | */ |
| 307 | 308 | private function revisionCallback( $revision ) { |
| 308 | 309 | if ( isset( $this->mRevisionCallback ) ) { |
| — | — | @@ -314,7 +315,8 @@ |
| 315 | 316 | |
| 316 | 317 | /** |
| 317 | 318 | * Notify the callback function of a new log item |
| 318 | | - * @param $revision A WikiRevision object |
| | 319 | + * @param $revision WikiRevision object |
| | 320 | + * @return bool|mixed |
| 319 | 321 | */ |
| 320 | 322 | private function logItemCallback( $revision ) { |
| 321 | 323 | if ( isset( $this->mLogItemCallback ) ) { |
| Index: trunk/phase3/includes/libs/CSSJanus.php |
| — | — | @@ -122,7 +122,7 @@ |
| 123 | 123 | * @param $css String: stylesheet to transform |
| 124 | 124 | * @param $swapLtrRtlInURL Boolean: If true, swap 'ltr' and 'rtl' in URLs |
| 125 | 125 | * @param $swapLeftRightInURL Boolean: If true, swap 'left' and 'right' in URLs |
| 126 | | - * @return Transformed stylesheet |
| | 126 | + * @return string Transformed stylesheet |
| 127 | 127 | */ |
| 128 | 128 | public static function transform( $css, $swapLtrRtlInURL = false, $swapLeftRightInURL = false ) { |
| 129 | 129 | // We wrap tokens in ` , not ~ like the original implementation does. |
| Index: trunk/phase3/includes/libs/IEUrlExtension.php |
| — | — | @@ -73,7 +73,7 @@ |
| 74 | 74 | * a potentially harmful file extension. |
| 75 | 75 | * |
| 76 | 76 | * @param $urlPart string The right-hand portion of a URL |
| 77 | | - * @param $extWhitelist An array of file extensions which may occur in this |
| | 77 | + * @param $extWhitelist array An array of file extensions which may occur in this |
| 78 | 78 | * URL, and which should be allowed. |
| 79 | 79 | * @return bool |
| 80 | 80 | */ |
| Index: trunk/phase3/includes/cache/MessageCache.php |
| — | — | @@ -588,7 +588,7 @@ |
| 589 | 589 | * @param $isFullKey Boolean: specifies whether $key is a two part key |
| 590 | 590 | * "msg/lang". |
| 591 | 591 | * |
| 592 | | - * @return string|false |
| | 592 | + * @return string|bool |
| 593 | 593 | */ |
| 594 | 594 | function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) { |
| 595 | 595 | global $wgLanguageCode, $wgContLang; |
| Index: trunk/phase3/includes/Collation.php |
| — | — | @@ -311,7 +311,7 @@ |
| 312 | 312 | * -1, 0 or 1 in the style of strcmp(). |
| 313 | 313 | * @param $target string The target value to find. |
| 314 | 314 | * |
| 315 | | - * @return The item index of the lower bound, or false if the target value |
| | 315 | + * @return int|bool The item index of the lower bound, or false if the target value |
| 316 | 316 | * sorts before all items. |
| 317 | 317 | */ |
| 318 | 318 | function findLowerBound( $valueCallback, $valueCount, $comparisonCallback, $target ) { |
| Index: trunk/phase3/includes/ChangesFeed.php |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | * @param $lastmod Integer: timestamp of the last item in the recentchanges table |
| 109 | 109 | * @param $timekey String: memcached key of the last modification |
| 110 | 110 | * @param $key String: memcached key of the content |
| 111 | | - * @return feed's content on cache hit or false on cache miss |
| | 111 | + * @return string|bool feed's content on cache hit or false on cache miss |
| 112 | 112 | */ |
| 113 | 113 | public function loadFromCache( $lastmod, $timekey, $key ) { |
| 114 | 114 | global $wgFeedCacheTimeout, $wgOut, $messageMemc; |
| Index: trunk/phase3/includes/filerepo/RepoGroup.php |
| — | — | @@ -213,7 +213,7 @@ |
| 214 | 214 | * Returns false if the file does not exist. |
| 215 | 215 | * |
| 216 | 216 | * @param $hash String base 36 SHA-1 hash |
| 217 | | - * @param $options Option array, same as findFile() |
| | 217 | + * @param $options array Option array, same as findFile() |
| 218 | 218 | * @return File object or false if it is not found |
| 219 | 219 | */ |
| 220 | 220 | function findFileFromKey( $hash, $options = array() ) { |
| — | — | @@ -339,7 +339,8 @@ |
| 340 | 340 | |
| 341 | 341 | /** |
| 342 | 342 | * Split a virtual URL into repo, zone and rel parts |
| 343 | | - * @return an array containing repo, zone and rel |
| | 343 | + * @param $url string |
| | 344 | + * @return array containing repo, zone and rel |
| 344 | 345 | */ |
| 345 | 346 | function splitVirtualUrl( $url ) { |
| 346 | 347 | if ( substr( $url, 0, 9 ) != 'mwrepo://' ) { |
| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -344,7 +344,7 @@ |
| 345 | 345 | /** |
| 346 | 346 | * Find many files at once. |
| 347 | 347 | * |
| 348 | | - * @param $items An array of titles, or an array of findFile() options with |
| | 348 | + * @param $items array An array of titles, or an array of findFile() options with |
| 349 | 349 | * the "title" option giving the title. Example: |
| 350 | 350 | * |
| 351 | 351 | * $findItem = array( 'title' => $title, 'private' => true ); |
| — | — | @@ -996,7 +996,7 @@ |
| 997 | 997 | /** |
| 998 | 998 | * Checks existence of a a file |
| 999 | 999 | * |
| 1000 | | - * @param $file Virtual URL (or storage path) of file to check |
| | 1000 | + * @param $file string Virtual URL (or storage path) of file to check |
| 1001 | 1001 | * @param $flags Integer: bitwise combination of the following flags: |
| 1002 | 1002 | * self::FILES_ONLY Mark file as existing only if it is a file (not directory) |
| 1003 | 1003 | * @return bool |
| — | — | @@ -1012,7 +1012,7 @@ |
| 1013 | 1013 | * @param $files Array: Virtual URLs (or storage paths) of files to check |
| 1014 | 1014 | * @param $flags Integer: bitwise combination of the following flags: |
| 1015 | 1015 | * self::FILES_ONLY Mark file as existing only if it is a file (not directory) |
| 1016 | | - * @return Either array of files and existence flags, or false |
| | 1016 | + * @return array|bool Either array of files and existence flags, or false |
| 1017 | 1017 | */ |
| 1018 | 1018 | public function fileExistsBatch( $files, $flags = 0 ) { |
| 1019 | 1019 | $result = array(); |
| Index: trunk/phase3/includes/filerepo/file/LocalFile.php |
| — | — | @@ -1301,7 +1301,7 @@ |
| 1302 | 1302 | * |
| 1303 | 1303 | * May throw database exceptions on error. |
| 1304 | 1304 | * |
| 1305 | | - * @param $versions set of record ids of deleted items to restore, |
| | 1305 | + * @param $versions array set of record ids of deleted items to restore, |
| 1306 | 1306 | * or empty to restore all revisions. |
| 1307 | 1307 | * @param $unsuppress Boolean |
| 1308 | 1308 | * @return FileRepoStatus |
| Index: trunk/phase3/includes/filerepo/file/File.php |
| — | — | @@ -987,8 +987,8 @@ |
| 988 | 988 | * |
| 989 | 989 | * STUB |
| 990 | 990 | * @param $limit integer Limit of rows to return |
| 991 | | - * @param $start timestamp Only revisions older than $start will be returned |
| 992 | | - * @param $end timestamp Only revisions newer than $end will be returned |
| | 991 | + * @param $start string timestamp Only revisions older than $start will be returned |
| | 992 | + * @param $end string timestamp Only revisions newer than $end will be returned |
| 993 | 993 | * @param $inc bool Include the endpoints of the time range |
| 994 | 994 | * |
| 995 | 995 | * @return array |
| — | — | @@ -1185,7 +1185,7 @@ |
| 1186 | 1186 | * |
| 1187 | 1187 | * @param $suffix bool|string if not false, the name of a thumbnail file |
| 1188 | 1188 | * |
| 1189 | | - * @return path |
| | 1189 | + * @return string path |
| 1190 | 1190 | */ |
| 1191 | 1191 | function getThumbUrl( $suffix = false ) { |
| 1192 | 1192 | $this->assertRepoDefined(); |
| Index: trunk/phase3/includes/ChangesList.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | * This first argument used to be an User object. |
| 65 | 65 | * |
| 66 | 66 | * @deprecated in 1.18; use newFromContext() instead |
| 67 | | - * @param $unused Unused |
| | 67 | + * @param $unused |
| 68 | 68 | * @return ChangesList|EnhancedChangesList|OldChangesList derivative |
| 69 | 69 | */ |
| 70 | 70 | public static function newFromUser( $unused ) { |
| Index: trunk/phase3/includes/GlobalFunctions.php |
| — | — | @@ -1768,7 +1768,7 @@ |
| 1769 | 1769 | * Return a string consisting of callers in the stack. Useful sometimes |
| 1770 | 1770 | * for profiling specific points. |
| 1771 | 1771 | * |
| 1772 | | - * @param $limit The maximum depth of the stack frame to return, or false for |
| | 1772 | + * @param $limit int The maximum depth of the stack frame to return, or false for |
| 1773 | 1773 | * the entire stack. |
| 1774 | 1774 | * @return String |
| 1775 | 1775 | */ |
| — | — | @@ -1977,7 +1977,7 @@ |
| 1978 | 1978 | * A wrapper around the PHP function var_export(). |
| 1979 | 1979 | * Either print it or add it to the regular output ($wgOut). |
| 1980 | 1980 | * |
| 1981 | | - * @param $var A PHP variable to dump. |
| | 1981 | + * @param $var mixed A PHP variable to dump. |
| 1982 | 1982 | */ |
| 1983 | 1983 | function wfVarDump( $var ) { |
| 1984 | 1984 | global $wgOut; |
| — | — | @@ -2749,11 +2749,11 @@ |
| 2750 | 2750 | * Execute a shell command, with time and memory limits mirrored from the PHP |
| 2751 | 2751 | * configuration if supported. |
| 2752 | 2752 | * @param $cmd String Command line, properly escaped for shell. |
| 2753 | | - * @param &$retval optional, will receive the program's exit code. |
| | 2753 | + * @param &$retval null|Mixed optional, will receive the program's exit code. |
| 2754 | 2754 | * (non-zero is usually failure) |
| 2755 | 2755 | * @param $environ Array optional environment variables which should be |
| 2756 | 2756 | * added to the executed command environment. |
| 2757 | | - * @return collected stdout as a string (trailing newlines stripped) |
| | 2757 | + * @return string collected stdout as a string (trailing newlines stripped) |
| 2758 | 2758 | */ |
| 2759 | 2759 | function wfShellExec( $cmd, &$retval = null, $environ = array() ) { |
| 2760 | 2760 | global $IP, $wgMaxShellMemory, $wgMaxShellFileSize, $wgMaxShellTime; |
| — | — | @@ -3513,7 +3513,7 @@ |
| 3514 | 3514 | /** |
| 3515 | 3515 | * Get the script URL. |
| 3516 | 3516 | * |
| 3517 | | - * @return script URL |
| | 3517 | + * @return string script URL |
| 3518 | 3518 | */ |
| 3519 | 3519 | function wfGetScriptUrl() { |
| 3520 | 3520 | if( isset( $_SERVER['SCRIPT_NAME'] ) ) { |
| Index: trunk/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -860,7 +860,7 @@ |
| 861 | 861 | /** |
| 862 | 862 | * List all tables on the database |
| 863 | 863 | * |
| 864 | | - * @param $prefix Only show tables with this prefix, e.g. mw_ |
| | 864 | + * @param $prefix string Only show tables with this prefix, e.g. mw_ |
| 865 | 865 | * @param $fname String: calling function name |
| 866 | 866 | * @return array |
| 867 | 867 | */ |
| Index: trunk/phase3/includes/db/DatabaseIbm_db2.php |
| — | — | @@ -667,7 +667,7 @@ |
| 668 | 668 | * Fields can be retrieved with $row->fieldname, with fields acting like |
| 669 | 669 | * member variables. |
| 670 | 670 | * |
| 671 | | - * @param $res SQL result object as returned from Database::query(), etc. |
| | 671 | + * @param $res array|ResultWrapper SQL result object as returned from Database::query(), etc. |
| 672 | 672 | * @return DB2 row object |
| 673 | 673 | * @throws DBUnexpectedError Thrown if the database returns an error |
| 674 | 674 | */ |
| — | — | @@ -689,8 +689,8 @@ |
| 690 | 690 | * Fetch the next row from the given result object, in associative array |
| 691 | 691 | * form. Fields are retrieved with $row['fieldname']. |
| 692 | 692 | * |
| 693 | | - * @param $res SQL result object as returned from Database::query(), etc. |
| 694 | | - * @return DB2 row object |
| | 693 | + * @param $res array|ResultWrapper SQL result object as returned from Database::query(), etc. |
| | 694 | + * @return ResultWrapper row object |
| 695 | 695 | * @throws DBUnexpectedError Thrown if the database returns an error |
| 696 | 696 | */ |
| 697 | 697 | public function fetchRow( $res ) { |
| — | — | @@ -715,7 +715,7 @@ |
| 716 | 716 | * Doesn't escape numbers |
| 717 | 717 | * |
| 718 | 718 | * @param $s String: string to escape |
| 719 | | - * @return escaped string |
| | 719 | + * @return string escaped string |
| 720 | 720 | */ |
| 721 | 721 | public function addQuotes( $s ) { |
| 722 | 722 | //$this->installPrint( "DB2::addQuotes( $s )\n" ); |
| — | — | @@ -758,7 +758,7 @@ |
| 759 | 759 | /** |
| 760 | 760 | * Alias for addQuotes() |
| 761 | 761 | * @param $s String: string to escape |
| 762 | | - * @return escaped string |
| | 762 | + * @return string escaped string |
| 763 | 763 | */ |
| 764 | 764 | public function strencode( $s ) { |
| 765 | 765 | // Bloody useless function |
| — | — | @@ -904,7 +904,7 @@ |
| 905 | 905 | /** |
| 906 | 906 | * Generates a timestamp in an insertable format |
| 907 | 907 | * |
| 908 | | - * @param $ts timestamp |
| | 908 | + * @param $ts string timestamp |
| 909 | 909 | * @return String: timestamp value |
| 910 | 910 | */ |
| 911 | 911 | public function timestamp( $ts = 0 ) { |
| — | — | @@ -915,7 +915,7 @@ |
| 916 | 916 | /** |
| 917 | 917 | * Return the next in a sequence, save the value for retrieval via insertId() |
| 918 | 918 | * @param $seqName String: name of a defined sequence in the database |
| 919 | | - * @return next value in that sequence |
| | 919 | + * @return int next value in that sequence |
| 920 | 920 | */ |
| 921 | 921 | public function nextSequenceValue( $seqName ) { |
| 922 | 922 | // Not using sequences in the primary schema to allow for easier migration |
| — | — | @@ -934,7 +934,7 @@ |
| 935 | 935 | |
| 936 | 936 | /** |
| 937 | 937 | * This must be called after nextSequenceVal |
| 938 | | - * @return Last sequence value used as a primary key |
| | 938 | + * @return int Last sequence value used as a primary key |
| 939 | 939 | */ |
| 940 | 940 | public function insertId() { |
| 941 | 941 | return $this->mInsertId; |
| — | — | @@ -1121,11 +1121,11 @@ |
| 1122 | 1122 | * UPDATE wrapper, takes a condition array and a SET array |
| 1123 | 1123 | * |
| 1124 | 1124 | * @param $table String: The table to UPDATE |
| 1125 | | - * @param $values An array of values to SET |
| 1126 | | - * @param $conds An array of conditions ( WHERE ). Use '*' to update all rows. |
| | 1125 | + * @param $values array An array of values to SET |
| | 1126 | + * @param $conds array An array of conditions ( WHERE ). Use '*' to update all rows. |
| 1127 | 1127 | * @param $fname String: The Class::Function calling this function |
| 1128 | 1128 | * ( for the log ) |
| 1129 | | - * @param $options An array of UPDATE options, can be one or |
| | 1129 | + * @param $options array An array of UPDATE options, can be one or |
| 1130 | 1130 | * more of IGNORE, LOW_PRIORITY |
| 1131 | 1131 | * @return Boolean |
| 1132 | 1132 | */ |
| — | — | @@ -1206,7 +1206,7 @@ |
| 1207 | 1207 | * Moves the row pointer of the result set |
| 1208 | 1208 | * @param $res Object: result set |
| 1209 | 1209 | * @param $row Integer: row number |
| 1210 | | - * @return success or failure |
| | 1210 | + * @return bool success or failure |
| 1211 | 1211 | */ |
| 1212 | 1212 | public function dataSeek( $res, $row ) { |
| 1213 | 1213 | if ( $res instanceof ResultWrapper ) { |
| — | — | @@ -1502,7 +1502,7 @@ |
| 1503 | 1503 | * Verifies that an index was created as unique |
| 1504 | 1504 | * @param $table String: table name |
| 1505 | 1505 | * @param $index String: index name |
| 1506 | | - * @param $fname function name for profiling |
| | 1506 | + * @param $fname string function name for profiling |
| 1507 | 1507 | * @return Bool |
| 1508 | 1508 | */ |
| 1509 | 1509 | public function indexUnique ( $table, $index, |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | * - false to disable debugging |
| 255 | 255 | * - omitted or null to do nothing |
| 256 | 256 | * |
| 257 | | - * @return The previous value of the flag |
| | 257 | + * @return bool|null previous value of the flag |
| 258 | 258 | */ |
| 259 | 259 | function debug( $debug = null ) { |
| 260 | 260 | return wfSetBit( $this->mFlags, DBO_DEBUG, $debug ); |
| — | — | @@ -279,7 +279,7 @@ |
| 280 | 280 | * |
| 281 | 281 | * @param $buffer null|bool |
| 282 | 282 | * |
| 283 | | - * @return The previous value of the flag |
| | 283 | + * @return null|bool The previous value of the flag |
| 284 | 284 | */ |
| 285 | 285 | function bufferResults( $buffer = null ) { |
| 286 | 286 | if ( is_null( $buffer ) ) { |
| — | — | @@ -310,8 +310,8 @@ |
| 311 | 311 | * Historically, transactions were allowed to be "nested". This is no |
| 312 | 312 | * longer supported, so this function really only returns a boolean. |
| 313 | 313 | * |
| 314 | | - * @param $level An integer (0 or 1), or omitted to leave it unchanged. |
| 315 | | - * @return The previous value |
| | 314 | + * @param $level int An integer (0 or 1), or omitted to leave it unchanged. |
| | 315 | + * @return int The previous value |
| 316 | 316 | */ |
| 317 | 317 | function trxLevel( $level = null ) { |
| 318 | 318 | return wfSetVar( $this->mTrxLevel, $level ); |
| — | — | @@ -319,8 +319,8 @@ |
| 320 | 320 | |
| 321 | 321 | /** |
| 322 | 322 | * Get/set the number of errors logged. Only useful when errors are ignored |
| 323 | | - * @param $count The count to set, or omitted to leave it unchanged. |
| 324 | | - * @return The error count |
| | 323 | + * @param $count int The count to set, or omitted to leave it unchanged. |
| | 324 | + * @return int The error count |
| 325 | 325 | */ |
| 326 | 326 | function errorCount( $count = null ) { |
| 327 | 327 | return wfSetVar( $this->mErrorCount, $count ); |
| — | — | @@ -328,8 +328,8 @@ |
| 329 | 329 | |
| 330 | 330 | /** |
| 331 | 331 | * Get/set the table prefix. |
| 332 | | - * @param $prefix The table prefix to set, or omitted to leave it unchanged. |
| 333 | | - * @return The previous table prefix. |
| | 332 | + * @param $prefix string The table prefix to set, or omitted to leave it unchanged. |
| | 333 | + * @return string The previous table prefix. |
| 334 | 334 | */ |
| 335 | 335 | function tablePrefix( $prefix = null ) { |
| 336 | 336 | return wfSetVar( $this->mTablePrefix, $prefix ); |
| — | — | @@ -1371,7 +1371,7 @@ |
| 1372 | 1372 | * @param $options string|array Query options |
| 1373 | 1373 | * @param $join_conds string|array Join conditions |
| 1374 | 1374 | * |
| 1375 | | - * @return SQL query string. |
| | 1375 | + * @return string SQL query string. |
| 1376 | 1376 | * @see DatabaseBase::select() |
| 1377 | 1377 | */ |
| 1378 | 1378 | function selectSQLText( $table, $vars, $conds = '', $fname = 'DatabaseBase::select', $options = array(), $join_conds = array() ) { |
| — | — | @@ -2789,7 +2789,7 @@ |
| 2790 | 2790 | * @param $timeout Integer: the maximum number of seconds to wait for |
| 2791 | 2791 | * synchronisation |
| 2792 | 2792 | * |
| 2793 | | - * @return An integer: zero if the slave was past that position already, |
| | 2793 | + * @return integer: zero if the slave was past that position already, |
| 2794 | 2794 | * greater than zero if we waited for some period of time, less than |
| 2795 | 2795 | * zero if we timed out. |
| 2796 | 2796 | */ |
| — | — | @@ -2909,7 +2909,7 @@ |
| 2910 | 2910 | /** |
| 2911 | 2911 | * List all tables on the database |
| 2912 | 2912 | * |
| 2913 | | - * @param $prefix Only show tables with this prefix, e.g. mw_ |
| | 2913 | + * @param $prefix string Only show tables with this prefix, e.g. mw_ |
| 2914 | 2914 | * @param $fname String: calling function name |
| 2915 | 2915 | */ |
| 2916 | 2916 | function listTables( $prefix = null, $fname = 'DatabaseBase::listTables' ) { |
| — | — | @@ -3351,7 +3351,7 @@ |
| 3352 | 3352 | * @param $lockName String: Name of lock to release |
| 3353 | 3353 | * @param $method String: Name of method calling us |
| 3354 | 3354 | * |
| 3355 | | - * @return Returns 1 if the lock was released, 0 if the lock was not established |
| | 3355 | + * @return int Returns 1 if the lock was released, 0 if the lock was not established |
| 3356 | 3356 | * by this thread (in which case the lock is not released), and NULL if the named |
| 3357 | 3357 | * lock did not exist |
| 3358 | 3358 | */ |
| Index: trunk/phase3/includes/db/DatabaseSqlite.php |
| — | — | @@ -817,7 +817,7 @@ |
| 818 | 818 | /** |
| 819 | 819 | * List all tables on the database |
| 820 | 820 | * |
| 821 | | - * @param $prefix Only show tables with this prefix, e.g. mw_ |
| | 821 | + * @param $prefix string Only show tables with this prefix, e.g. mw_ |
| 822 | 822 | * @param $fname String: calling function name |
| 823 | 823 | * |
| 824 | 824 | * @return array |
| Index: trunk/phase3/includes/installer/SqliteInstaller.php |
| — | — | @@ -207,7 +207,7 @@ |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | 210 | /** |
| 211 | | - * @return Staus |
| | 211 | + * @return Status |
| 212 | 212 | */ |
| 213 | 213 | public function createTables() { |
| 214 | 214 | $status = parent::createTables(); |
| Index: trunk/phase3/includes/installer/WebInstallerPage.php |
| — | — | @@ -341,7 +341,7 @@ |
| 342 | 342 | |
| 343 | 343 | /** |
| 344 | 344 | * Initiate an upgrade of the existing database |
| 345 | | - * @param $vars Variables from LocalSettings.php and AdminSettings.php |
| | 345 | + * @param $vars array Variables from LocalSettings.php and AdminSettings.php |
| 346 | 346 | * @return Status |
| 347 | 347 | */ |
| 348 | 348 | protected function handleExistingUpgrade( $vars ) { |
| Index: trunk/phase3/includes/diff/DairikiDiff.php |
| — | — | @@ -661,7 +661,7 @@ |
| 662 | 662 | * |
| 663 | 663 | * $diff = new Diff($lines1, $lines2); |
| 664 | 664 | * $rev = $diff->reverse(); |
| 665 | | - * @return object A Diff object representing the inverse of the |
| | 665 | + * @return object object A Diff object representing the inverse of the |
| 666 | 666 | * original diff. |
| 667 | 667 | */ |
| 668 | 668 | function reverse() { |
| Index: trunk/phase3/includes/Hooks.php |
| — | — | @@ -259,7 +259,7 @@ |
| 260 | 260 | /** |
| 261 | 261 | * This REALLY should be protected... but it's public for compatibility |
| 262 | 262 | * |
| 263 | | - * @param $errno Unused |
| | 263 | + * @param $errno |
| 264 | 264 | * @param $errstr String: error message |
| 265 | 265 | * @return Boolean: false |
| 266 | 266 | */ |