Index: trunk/phase3/includes/Xml.php |
— | — | @@ -254,8 +254,8 @@ |
255 | 255 | |
256 | 256 | /** |
257 | 257 | * Shortcut to make a specific element with a class attribute |
258 | | - * @param $text content of the element, will be escaped |
259 | | - * @param $class class name of the span element |
| 258 | + * @param $text string content of the element, will be escaped |
| 259 | + * @param $class string class name of the span element |
260 | 260 | * @param $tag string element name |
261 | 261 | * @param $attribs array other attributes |
262 | 262 | * @return string |
Index: trunk/phase3/includes/User.php |
— | — | @@ -445,7 +445,7 @@ |
446 | 446 | /** |
447 | 447 | * Get the username corresponding to a given user ID |
448 | 448 | * @param $id Int User ID |
449 | | - * @return String|false The corresponding username |
| 449 | + * @return String|bool The corresponding username |
450 | 450 | */ |
451 | 451 | public static function whoIs( $id ) { |
452 | 452 | $dbr = wfGetDB( DB_SLAVE ); |
— | — | @@ -456,7 +456,7 @@ |
457 | 457 | * Get the real name of a user given their user ID |
458 | 458 | * |
459 | 459 | * @param $id Int User ID |
460 | | - * @return String|false The corresponding user's real name |
| 460 | + * @return String|bool The corresponding user's real name |
461 | 461 | */ |
462 | 462 | public static function whoIsReal( $id ) { |
463 | 463 | $dbr = wfGetDB( DB_SLAVE ); |
Index: trunk/phase3/includes/search/SearchEngine.php |
— | — | @@ -91,7 +91,7 @@ |
92 | 92 | * @since 1.18 |
93 | 93 | * @param $feature String |
94 | 94 | * @param $data Mixed |
95 | | - * @return Noolean |
| 95 | + * @return bool |
96 | 96 | */ |
97 | 97 | public function setFeatureData( $feature, $data ) { |
98 | 98 | $this->features[$feature] = $data; |
— | — | @@ -771,7 +771,7 @@ |
772 | 772 | } |
773 | 773 | |
774 | 774 | /** |
775 | | - * @return Double or null if not supported |
| 775 | + * @return Double|null if not supported |
776 | 776 | */ |
777 | 777 | function getScore() { |
778 | 778 | return null; |
Index: trunk/phase3/includes/parser/Preprocessor_Hash.php |
— | — | @@ -869,7 +869,7 @@ |
870 | 870 | * $args is optionally a multi-root PPNode or array containing the template arguments |
871 | 871 | * |
872 | 872 | * @param $args PPNode_Hash_Array|array |
873 | | - * @param $title Title|false |
| 873 | + * @param $title Title|bool |
874 | 874 | * |
875 | 875 | * @return PPTemplateFrame_Hash |
876 | 876 | */ |
Index: trunk/phase3/includes/parser/Parser.php |
— | — | @@ -616,7 +616,7 @@ |
617 | 617 | /** |
618 | 618 | * Accessor/mutator for the Title object |
619 | 619 | * |
620 | | - * @param $x New Title object or null to just get the current one |
| 620 | + * @param $x Title object or null to just get the current one |
621 | 621 | * @return Title object |
622 | 622 | */ |
623 | 623 | function Title( $x = null ) { |
— | — | @@ -3671,7 +3671,7 @@ |
3672 | 3672 | * Return the text to be used for a given extension tag. |
3673 | 3673 | * This is the ghost of strip(). |
3674 | 3674 | * |
3675 | | - * @param $params Associative array of parameters: |
| 3675 | + * @param $params array Associative array of parameters: |
3676 | 3676 | * name PPNode for the tag name |
3677 | 3677 | * attr PPNode for unparsed text where tag attributes are thought to be |
3678 | 3678 | * attributes Optional associative array of parsed attributes |
Index: trunk/phase3/includes/Linker.php |
— | — | @@ -848,7 +848,7 @@ |
849 | 849 | * This will make a broken link if $file is false. |
850 | 850 | * |
851 | 851 | * @param $title Title object. |
852 | | - * @param $file File|false mixed File object or false |
| 852 | + * @param $file File|bool mixed File object or false |
853 | 853 | * @param $html String: pre-sanitized HTML |
854 | 854 | * @return String: HTML |
855 | 855 | * |
Index: trunk/phase3/includes/UserMailer.php |
— | — | @@ -109,7 +109,7 @@ |
110 | 110 | /** |
111 | 111 | * Creates a single string from an associative array |
112 | 112 | * |
113 | | - * @param $headers Associative Array: keys are header field names, |
| 113 | + * @param $headers array Associative Array: keys are header field names, |
114 | 114 | * values are ... values. |
115 | 115 | * @param $endl String: The end of line character. Defaults to "\n" |
116 | 116 | * @return String |
Index: trunk/phase3/includes/HTMLForm.php |
— | — | @@ -874,7 +874,7 @@ |
875 | 875 | * |
876 | 876 | * @since 1.19 |
877 | 877 | * |
878 | | - * @param string|false $action |
| 878 | + * @param string|bool $action |
879 | 879 | */ |
880 | 880 | public function setAction( $action ) { |
881 | 881 | $this->mAction = $action; |
Index: trunk/phase3/includes/revisiondelete/RevisionDeleter.php |
— | — | @@ -43,7 +43,7 @@ |
44 | 44 | * |
45 | 45 | * @param $n Integer: the new bitfield. |
46 | 46 | * @param $o Integer: the old bitfield. |
47 | | - * @return An array as described above. |
| 47 | + * @return array An array as described above. |
48 | 48 | * @since 1.19 public |
49 | 49 | */ |
50 | 50 | public static function getChanges( $n, $o ) { |
Index: trunk/phase3/includes/revisiondelete/RevisionDeleteAbstracts.php |
— | — | @@ -196,7 +196,7 @@ |
197 | 197 | |
198 | 198 | /** |
199 | 199 | * Get log parameter array. |
200 | | - * @param $params Associative array of log parameters, same as updateLog() |
| 200 | + * @param $params array Associative array of log parameters, same as updateLog() |
201 | 201 | * @return array |
202 | 202 | */ |
203 | 203 | public function getLogParams( $params ) { |
Index: trunk/phase3/includes/OutputPage.php |
— | — | @@ -1075,7 +1075,7 @@ |
1076 | 1076 | /** |
1077 | 1077 | * Add new language links |
1078 | 1078 | * |
1079 | | - * @param $newLinkArray Associative array mapping language code to the page |
| 1079 | + * @param $newLinkArray array Associative array mapping language code to the page |
1080 | 1080 | * name |
1081 | 1081 | */ |
1082 | 1082 | public function addLanguageLinks( $newLinkArray ) { |
— | — | @@ -1085,7 +1085,7 @@ |
1086 | 1086 | /** |
1087 | 1087 | * Reset the language links and add new language links |
1088 | 1088 | * |
1089 | | - * @param $newLinkArray Associative array mapping language code to the page |
| 1089 | + * @param $newLinkArray array Associative array mapping language code to the page |
1090 | 1090 | * name |
1091 | 1091 | */ |
1092 | 1092 | public function setLanguageLinks( $newLinkArray ) { |
— | — | @@ -1366,7 +1366,7 @@ |
1367 | 1367 | /** |
1368 | 1368 | * Set the displayed file version |
1369 | 1369 | * |
1370 | | - * @param $file File|false |
| 1370 | + * @param $file File|bool |
1371 | 1371 | * @return Mixed: previous value |
1372 | 1372 | */ |
1373 | 1373 | public function setFileVersion( $file ) { |
Index: trunk/phase3/includes/logging/LogEventsList.php |
— | — | @@ -606,7 +606,7 @@ |
607 | 607 | * @param $types String|Array Log types to show |
608 | 608 | * @param $page String|Title The page title to show log entries for |
609 | 609 | * @param $user String The user who made the log entries |
610 | | - * @param $param Associative Array with the following additional options: |
| 610 | + * @param $param array Associative Array with the following additional options: |
611 | 611 | * - lim Integer Limit of items to show, default is 50 |
612 | 612 | * - conds Array Extra conditions for the query (e.g. "log_action != 'revision'") |
613 | 613 | * - showIfEmpty boolean Set to false if you don't want any output in case the loglist is empty |
Index: trunk/phase3/includes/logging/LogEntry.php |
— | — | @@ -344,7 +344,7 @@ |
345 | 345 | * |
346 | 346 | * @since 1.19 |
347 | 347 | * |
348 | | - * @param $parameters Associative array |
| 348 | + * @param $parameters array Associative array |
349 | 349 | */ |
350 | 350 | public function setParameters( $parameters ) { |
351 | 351 | $this->parameters = $parameters; |
Index: trunk/phase3/includes/installer/PostgresInstaller.php |
— | — | @@ -110,9 +110,9 @@ |
111 | 111 | |
112 | 112 | /** |
113 | 113 | * Open a PG connection with given parameters |
114 | | - * @param $user User name |
115 | | - * @param $password Password |
116 | | - * @param $dbName Database name |
| 114 | + * @param $user string User name |
| 115 | + * @param $password string Password |
| 116 | + * @param $dbName string Database name |
117 | 117 | * @return Status |
118 | 118 | */ |
119 | 119 | protected function openConnectionWithParams( $user, $password, $dbName ) { |
— | — | @@ -168,14 +168,14 @@ |
169 | 169 | * separate connection for this allows us to avoid accidental cross-module |
170 | 170 | * dependencies. |
171 | 171 | * |
172 | | - * @param $type The type of connection to get: |
| 172 | + * @param $type string The type of connection to get: |
173 | 173 | * - create-db: A connection for creating DBs, suitable for pre- |
174 | 174 | * installation. |
175 | 175 | * - create-schema: A connection to the new DB, for creating schemas and |
176 | 176 | * other similar objects in the new DB. |
177 | 177 | * - create-tables: A connection with a role suitable for creating tables. |
178 | 178 | * |
179 | | - * @return A Status object. On success, a connection object will be in the |
| 179 | + * @return Status object. On success, a connection object will be in the |
180 | 180 | * value member. |
181 | 181 | */ |
182 | 182 | protected function openPgConnection( $type ) { |
— | — | @@ -365,10 +365,11 @@ |
366 | 366 | |
367 | 367 | /** |
368 | 368 | * Recursive helper for canCreateObjectsForWebUser(). |
369 | | - * @param $conn Database object |
370 | | - * @param $targetMember Role ID of the member to look for |
371 | | - * @param $group Role ID of the group to look for |
372 | | - * @param $maxDepth Maximum recursive search depth |
| 369 | + * @param $conn DatabaseBase object |
| 370 | + * @param $targetMember int Role ID of the member to look for |
| 371 | + * @param $group int Role ID of the group to look for |
| 372 | + * @param $maxDepth int Maximum recursive search depth |
| 373 | + * @return bool |
373 | 374 | */ |
374 | 375 | protected function isRoleMember( $conn, $targetMember, $group, $maxDepth ) { |
375 | 376 | if ( $targetMember === $group ) { |
Index: trunk/phase3/includes/WebRequest.php |
— | — | @@ -838,7 +838,7 @@ |
839 | 839 | * Get a request header, or false if it isn't set |
840 | 840 | * @param $name String: case-insensitive header name |
841 | 841 | * |
842 | | - * @return string|false |
| 842 | + * @return string|bool |
843 | 843 | */ |
844 | 844 | public function getHeader( $name ) { |
845 | 845 | $this->initHeaders(); |
Index: trunk/phase3/includes/media/GIFMetadataExtractor.php |
— | — | @@ -286,7 +286,7 @@ |
287 | 287 | * sub-blocks in the returned value. Normally this is false, |
288 | 288 | * except XMP is weird and does a hack where you need to keep |
289 | 289 | * these length bytes. |
290 | | - * @return The data. |
| 290 | + * @return string The data. |
291 | 291 | */ |
292 | 292 | static function readBlock( $fh, $includeLengths = false ) { |
293 | 293 | $data = ''; |
Index: trunk/phase3/includes/media/BitmapMetadataHandler.php |
— | — | @@ -193,7 +193,7 @@ |
194 | 194 | * They don't really have native metadata, so just merges together |
195 | 195 | * XMP and image comment. |
196 | 196 | * |
197 | | - * @param $filename full path to file |
| 197 | + * @param $filename string full path to file |
198 | 198 | * @return Array metadata array |
199 | 199 | */ |
200 | 200 | static public function GIF ( $filename ) { |
Index: trunk/phase3/includes/media/Generic.php |
— | — | @@ -482,8 +482,8 @@ |
483 | 483 | * Check for zero-sized thumbnails. These can be generated when |
484 | 484 | * no disk space is available or some other error occurs |
485 | 485 | * |
486 | | - * @param $dstPath The location of the suspect file |
487 | | - * @param $retval Return value of some shell process, file will be deleted if this is non-zero |
| 486 | + * @param $dstPath string The location of the suspect file |
| 487 | + * @param $retval int Return value of some shell process, file will be deleted if this is non-zero |
488 | 488 | * @return bool if removed, false otherwise |
489 | 489 | */ |
490 | 490 | function removeBadFile( $dstPath, $retval = 0 ) { |
Index: trunk/phase3/includes/PathRouter.php |
— | — | @@ -123,9 +123,9 @@ |
124 | 124 | /** |
125 | 125 | * Add a new path pattern to the path router |
126 | 126 | * |
127 | | - * @param $path The path pattern to add |
128 | | - * @param $params The params for this path pattern |
129 | | - * @param $options The options for this path pattern |
| 127 | + * @param $path string The path pattern to add |
| 128 | + * @param $params array The params for this path pattern |
| 129 | + * @param $options array The options for this path pattern |
130 | 130 | */ |
131 | 131 | public function add( $path, $params = array(), $options = array() ) { |
132 | 132 | if ( is_array( $path ) ) { |
— | — | @@ -195,7 +195,7 @@ |
196 | 196 | /** |
197 | 197 | * Parse a path and return the query matches for the path |
198 | 198 | * |
199 | | - * @param $path The path to parse |
| 199 | + * @param $path string The path to parse |
200 | 200 | * @return Array The array of matches for the path |
201 | 201 | */ |
202 | 202 | public function parse( $path ) { |
Index: trunk/phase3/includes/MagicWord.php |
— | — | @@ -813,7 +813,7 @@ |
814 | 814 | * |
815 | 815 | * @param $text string |
816 | 816 | * |
817 | | - * @return string|false |
| 817 | + * @return string|bool |
818 | 818 | */ |
819 | 819 | public function matchStartToEnd( $text ) { |
820 | 820 | $hash = $this->getHash(); |
— | — | @@ -861,7 +861,7 @@ |
862 | 862 | * |
863 | 863 | * @param $text string |
864 | 864 | * |
865 | | - * @return int|false |
| 865 | + * @return int|bool |
866 | 866 | */ |
867 | 867 | public function matchStartAndRemove( &$text ) { |
868 | 868 | $regexes = $this->getRegexStart(); |
Index: trunk/phase3/includes/Title.php |
— | — | @@ -260,7 +260,7 @@ |
261 | 261 | * Load Title object fields from a DB row. |
262 | 262 | * If false is given, the title will be treated as non-existing. |
263 | 263 | * |
264 | | - * @param $row Object|false database row |
| 264 | + * @param $row Object|bool database row |
265 | 265 | * @return void |
266 | 266 | */ |
267 | 267 | public function loadFromRow( $row ) { |
Index: trunk/phase3/includes/SkinTemplate.php |
— | — | @@ -1345,7 +1345,7 @@ |
1346 | 1346 | /** |
1347 | 1347 | * Get a Message object with its context set |
1348 | 1348 | * |
1349 | | - * @param $name Str message name |
| 1349 | + * @param $name string message name |
1350 | 1350 | * @return Message |
1351 | 1351 | */ |
1352 | 1352 | public function getMsg( $name ) { |
Index: trunk/phase3/includes/WikiPage.php |
— | — | @@ -414,7 +414,7 @@ |
415 | 415 | * Revision::FOR_PUBLIC to be displayed to all users |
416 | 416 | * Revision::FOR_THIS_USER to be displayed to $wgUser |
417 | 417 | * Revision::RAW get the text regardless of permissions |
418 | | - * @return String|false The text of the current revision |
| 418 | + * @return String|bool The text of the current revision |
419 | 419 | */ |
420 | 420 | public function getText( $audience = Revision::FOR_PUBLIC ) { |
421 | 421 | $this->loadLastEdit(); |
— | — | @@ -427,7 +427,7 @@ |
428 | 428 | /** |
429 | 429 | * Get the text of the current revision. No side-effects... |
430 | 430 | * |
431 | | - * @return String|false The text of the current revision |
| 431 | + * @return String|bool The text of the current revision |
432 | 432 | */ |
433 | 433 | public function getRawText() { |
434 | 434 | $this->loadLastEdit(); |
— | — | @@ -1059,7 +1059,7 @@ |
1060 | 1060 | * If the given revision is newer than the currently set page_latest, |
1061 | 1061 | * update the page record. Otherwise, do nothing. |
1062 | 1062 | * |
1063 | | - * @param $dbw Database object |
| 1063 | + * @param $dbw DatabaseBase object |
1064 | 1064 | * @param $revision Revision object |
1065 | 1065 | * @return mixed |
1066 | 1066 | */ |
Index: trunk/phase3/includes/HttpFunctions.php |
— | — | @@ -417,8 +417,6 @@ |
418 | 418 | * Parses the headers, including the HTTP status code and any |
419 | 419 | * Set-Cookie headers. This function expectes the headers to be |
420 | 420 | * found in an array in the member variable headerList. |
421 | | - * |
422 | | - * @return nothing |
423 | 421 | */ |
424 | 422 | protected function parseHeader() { |
425 | 423 | $lastname = ""; |
— | — | @@ -446,8 +444,6 @@ |
447 | 445 | * RFC2616, section 10, |
448 | 446 | * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a |
449 | 447 | * list of status codes.) |
450 | | - * |
451 | | - * @return nothing |
452 | 448 | */ |
453 | 449 | protected function setStatus() { |
454 | 450 | if ( !$this->respHeaders ) { |
Index: trunk/phase3/includes/specials/SpecialRecentchanges.php |
— | — | @@ -366,7 +366,7 @@ |
367 | 367 | * |
368 | 368 | * @param $conds Array |
369 | 369 | * @param $opts FormOptions |
370 | | - * @return database result or false (for Recentchangeslinked only) |
| 370 | + * @return bool|ResultWrapper result or false (for Recentchangeslinked only) |
371 | 371 | */ |
372 | 372 | public function doMainQuery( $conds, $opts ) { |
373 | 373 | $tables = array( 'recentchanges' ); |
Index: trunk/phase3/includes/specials/SpecialMostlinkedtemplates.php |
— | — | @@ -75,7 +75,7 @@ |
76 | 76 | /** |
77 | 77 | * Pre-cache page existence to speed up link generation |
78 | 78 | * |
79 | | - * @param $db Database connection |
| 79 | + * @param $db DatabaseBase connection |
80 | 80 | * @param $res ResultWrapper |
81 | 81 | */ |
82 | 82 | public function preprocessResults( $db, $res ) { |
Index: trunk/phase3/includes/specials/SpecialDeletedContributions.php |
— | — | @@ -237,7 +237,7 @@ |
238 | 238 | /** |
239 | 239 | * Get the Database object in use |
240 | 240 | * |
241 | | - * @return Database |
| 241 | + * @return DatabaseBase |
242 | 242 | */ |
243 | 243 | public function getDatabase() { |
244 | 244 | return $this->mDb; |
— | — | @@ -254,7 +254,6 @@ |
255 | 255 | * Special page "deleted user contributions". |
256 | 256 | * Shows a list of the deleted contributions of a user. |
257 | 257 | * |
258 | | - * @return none |
259 | 258 | * @param $par String: (optional) user name of the user for which to show the contributions |
260 | 259 | */ |
261 | 260 | function execute( $par ) { |
Index: trunk/phase3/includes/Skin.php |
— | — | @@ -22,7 +22,7 @@ |
23 | 23 | |
24 | 24 | /** |
25 | 25 | * Fetch the set of available skins. |
26 | | - * @return associative array of strings |
| 26 | + * @return array associative array of strings |
27 | 27 | */ |
28 | 28 | static function getSkinNames() { |
29 | 29 | global $wgValidSkinNames; |
Index: trunk/phase3/includes/SpecialPage.php |
— | — | @@ -200,7 +200,7 @@ |
201 | 201 | * |
202 | 202 | * @param $user User object to check permissions, $wgUser will be used |
203 | 203 | * if not provided |
204 | | - * @return Associative array mapping page's name to its SpecialPage object |
| 204 | + * @return array Associative array mapping page's name to its SpecialPage object |
205 | 205 | * @deprecated since 1.18 call SpecialPageFactory method directly |
206 | 206 | */ |
207 | 207 | static function getUsablePages( User $user = null ) { |
— | — | @@ -211,7 +211,7 @@ |
212 | 212 | /** |
213 | 213 | * Return categorised listable special pages for all users |
214 | 214 | * |
215 | | - * @return Associative array mapping page's name to its SpecialPage object |
| 215 | + * @return array Associative array mapping page's name to its SpecialPage object |
216 | 216 | * @deprecated since 1.18 call SpecialPageFactory method directly |
217 | 217 | */ |
218 | 218 | static function getRegularPages() { |
— | — | @@ -223,7 +223,7 @@ |
224 | 224 | * Return categorised listable special pages which are available |
225 | 225 | * for the current user, but not for everyone |
226 | 226 | * |
227 | | - * @return Associative array mapping page's name to its SpecialPage object |
| 227 | + * @return array Associative array mapping page's name to its SpecialPage object |
228 | 228 | * @deprecated since 1.18 call SpecialPageFactory method directly |
229 | 229 | */ |
230 | 230 | static function getRestrictedPages() { |
— | — | @@ -988,7 +988,7 @@ |
989 | 989 | * False otherwise. |
990 | 990 | * |
991 | 991 | * @param $par String Subpage string |
992 | | - * @return Title|false |
| 992 | + * @return Title|bool |
993 | 993 | */ |
994 | 994 | abstract public function getRedirect( $par ); |
995 | 995 | |
Index: trunk/phase3/includes/Pager.php |
— | — | @@ -433,7 +433,7 @@ |
434 | 434 | * By default, all parameters passed in the URL are used, except for a |
435 | 435 | * short blacklist. |
436 | 436 | * |
437 | | - * @return Associative array |
| 437 | + * @return array Associative array |
438 | 438 | */ |
439 | 439 | function getDefaultQuery() { |
440 | 440 | if ( !isset( $this->mDefaultQuery ) ) { |
Index: trunk/phase3/includes/IP.php |
— | — | @@ -198,7 +198,7 @@ |
199 | 199 | * |
200 | 200 | * A bare IPv6 address is accepted despite the lack of square brackets. |
201 | 201 | * |
202 | | - * @param $both The string with the host and port |
| 202 | + * @param $both string The string with the host and port |
203 | 203 | * @return array |
204 | 204 | */ |
205 | 205 | public static function splitHostAndPort( $both ) { |