| Index: trunk/phase3/includes/db/DatabaseError.php |
| — | — | @@ -262,10 +262,10 @@ |
| 263 | 263 | |
| 264 | 264 | /** |
| 265 | 265 | * @param $db DatabaseBase |
| 266 | | - * @param $error |
| 267 | | - * @param $errno |
| 268 | | - * @param $sql |
| 269 | | - * @param $fname |
| | 266 | + * @param $error string |
| | 267 | + * @param $errno int|string |
| | 268 | + * @param $sql string |
| | 269 | + * @param $fname string |
| 270 | 270 | */ |
| 271 | 271 | function __construct( DatabaseBase &$db, $error, $errno, $sql, $fname ) { |
| 272 | 272 | $message = "A database error has occurred. Did you forget to run maintenance/update.php after upgrading? See: https://www.mediawiki.org/wiki/Manual:Upgrading#Run_the_update_script\n" . |
| Index: trunk/phase3/includes/db/LBFactory_Multi.php |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | var $lastWiki, $lastSection; |
| 56 | 56 | |
| 57 | 57 | /** |
| 58 | | - * @param $conf |
| | 58 | + * @param $conf array |
| 59 | 59 | */ |
| 60 | 60 | function __construct( $conf ) { |
| 61 | 61 | $this->chronProt = new ChronologyProtector; |
| — | — | @@ -173,7 +173,7 @@ |
| 174 | 174 | * Make a new load balancer object based on template and load array |
| 175 | 175 | * |
| 176 | 176 | * @param $template |
| 177 | | - * @param $loads |
| | 177 | + * @param $loads array |
| 178 | 178 | * @param $groupLoads |
| 179 | 179 | * @return LoadBalancer |
| 180 | 180 | */ |
| — | — | @@ -191,7 +191,7 @@ |
| 192 | 192 | * Make a server array as expected by LoadBalancer::__construct, using a template and load array |
| 193 | 193 | * |
| 194 | 194 | * @param $template |
| 195 | | - * @param $loads |
| | 195 | + * @param $loads array |
| 196 | 196 | * @param $groupLoads |
| 197 | 197 | * @return array |
| 198 | 198 | */ |
| — | — | @@ -248,7 +248,7 @@ |
| 249 | 249 | |
| 250 | 250 | /** |
| 251 | 251 | * Get the database name and prefix based on the wiki ID |
| 252 | | - * @param bool $wiki |
| | 252 | + * @param $wiki bool |
| 253 | 253 | * @return array |
| 254 | 254 | */ |
| 255 | 255 | function getDBNameAndPrefix( $wiki = false ) { |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -2280,7 +2280,7 @@ |
| 2281 | 2281 | * Any implementation of this function should *not* involve reusing |
| 2282 | 2282 | * sequence numbers created for rolled-back transactions. |
| 2283 | 2283 | * See http://bugs.mysql.com/bug.php?id=30767 for details. |
| 2284 | | - * @param $seqName |
| | 2284 | + * @param $seqName string |
| 2285 | 2285 | * @return null |
| 2286 | 2286 | */ |
| 2287 | 2287 | function nextSequenceValue( $seqName ) { |
| — | — | @@ -2374,9 +2374,9 @@ |
| 2375 | 2375 | * REPLACE query wrapper for MySQL and SQLite, which have a native REPLACE |
| 2376 | 2376 | * statement. |
| 2377 | 2377 | * |
| 2378 | | - * @param $table Table name |
| 2379 | | - * @param $rows Rows to insert |
| 2380 | | - * @param $fname Caller function name |
| | 2378 | + * @param $table string Table name |
| | 2379 | + * @param $rows array Rows to insert |
| | 2380 | + * @param $fname string Caller function name |
| 2381 | 2381 | * |
| 2382 | 2382 | * @return ResultWrapper |
| 2383 | 2383 | */ |
| — | — | @@ -3017,8 +3017,8 @@ |
| 3018 | 3018 | * don't allow simple quoted strings to be inserted. To insert into such |
| 3019 | 3019 | * a field, pass the data through this function before passing it to |
| 3020 | 3020 | * DatabaseBase::insert(). |
| 3021 | | - * @param $b |
| 3022 | | - * @return |
| | 3021 | + * @param $b string |
| | 3022 | + * @return string |
| 3023 | 3023 | */ |
| 3024 | 3024 | function encodeBlob( $b ) { |
| 3025 | 3025 | return $b; |
| — | — | @@ -3028,8 +3028,8 @@ |
| 3029 | 3029 | * Some DBMSs return a special placeholder object representing blob fields |
| 3030 | 3030 | * in result objects. Pass the object through this function to return the |
| 3031 | 3031 | * original string. |
| 3032 | | - * @param $b |
| 3033 | | - * @return |
| | 3032 | + * @param $b string |
| | 3033 | + * @return string |
| 3034 | 3034 | */ |
| 3035 | 3035 | function decodeBlob( $b ) { |
| 3036 | 3036 | return $b; |
| Index: trunk/phase3/includes/db/LBFactory.php |
| — | — | @@ -42,7 +42,6 @@ |
| 43 | 43 | |
| 44 | 44 | /** |
| 45 | 45 | * Shut down, close connections and destroy the cached instance. |
| 46 | | - * |
| 47 | 46 | */ |
| 48 | 47 | static function destroyInstance() { |
| 49 | 48 | if ( self::$instance ) { |
| — | — | @@ -111,7 +110,7 @@ |
| 112 | 111 | * Execute a function for each tracked load balancer |
| 113 | 112 | * The callback is called with the load balancer as the first parameter, |
| 114 | 113 | * and $params passed as the subsequent parameters. |
| 115 | | - * @param $callback |
| | 114 | + * @param $callback string|array |
| 116 | 115 | * @param array $params |
| 117 | 116 | */ |
| 118 | 117 | abstract function forEachLB( $callback, $params = array() ); |
| — | — | @@ -124,7 +123,7 @@ |
| 125 | 124 | |
| 126 | 125 | /** |
| 127 | 126 | * Call a method of each tracked load balancer |
| 128 | | - * @param $methodName |
| | 127 | + * @param $methodName string |
| 129 | 128 | * @param $args array |
| 130 | 129 | */ |
| 131 | 130 | function forEachLBCallMethod( $methodName, $args = array() ) { |
| — | — | @@ -134,7 +133,7 @@ |
| 135 | 134 | /** |
| 136 | 135 | * Private helper for forEachLBCallMethod |
| 137 | 136 | * @param $loadBalancer |
| 138 | | - * @param $methodName |
| | 137 | + * @param $methodName string |
| 139 | 138 | * @param $args |
| 140 | 139 | */ |
| 141 | 140 | function callMethod( $loadBalancer, $methodName, $args ) { |
| Index: trunk/phase3/includes/db/LoadBalancer.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | * Given an array of non-normalised probabilities, this function will select |
| 103 | 103 | * an element and return the appropriate key |
| 104 | 104 | * |
| 105 | | - * @param $weights |
| | 105 | + * @param $weights array |
| 106 | 106 | * |
| 107 | 107 | * @return int |
| 108 | 108 | */ |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
| 136 | | - * @param $loads |
| | 136 | + * @param $loads array |
| 137 | 137 | * @param $wiki bool |
| 138 | 138 | * @return bool|int|string |
| 139 | 139 | */ |
| — | — | @@ -336,8 +336,8 @@ |
| 337 | 337 | |
| 338 | 338 | /** |
| 339 | 339 | * Wait for a specified number of microseconds, and return the period waited |
| 340 | | - * @param $t |
| 341 | | - * @return |
| | 340 | + * @param $t int |
| | 341 | + * @return int |
| 342 | 342 | */ |
| 343 | 343 | function sleep( $t ) { |
| 344 | 344 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -351,7 +351,7 @@ |
| 352 | 352 | * Set the master wait position |
| 353 | 353 | * If a DB_SLAVE connection has been opened already, waits |
| 354 | 354 | * Otherwise sets a variable telling it to wait if such a connection is opened |
| 355 | | - * @param $pos |
| | 355 | + * @param $pos int |
| 356 | 356 | */ |
| 357 | 357 | public function waitFor( $pos ) { |
| 358 | 358 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -369,7 +369,7 @@ |
| 370 | 370 | |
| 371 | 371 | /** |
| 372 | 372 | * Set the master wait position and wait for ALL slaves to catch up to it |
| 373 | | - * @param $pos |
| | 373 | + * @param $pos int |
| 374 | 374 | */ |
| 375 | 375 | public function waitForAll( $pos ) { |
| 376 | 376 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -384,7 +384,7 @@ |
| 385 | 385 | * Get any open connection to a given server index, local or foreign |
| 386 | 386 | * Returns false if there is no connection open |
| 387 | 387 | * |
| 388 | | - * @param $i |
| | 388 | + * @param $i int |
| 389 | 389 | * @return DatabaseBase|false |
| 390 | 390 | */ |
| 391 | 391 | function getAnyOpenConnection( $i ) { |
| Index: trunk/phase3/includes/db/DatabaseMysql.php |
| — | — | @@ -23,7 +23,7 @@ |
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | | - * @param $sql |
| | 27 | + * @param $sql string |
| 28 | 28 | * @return resource |
| 29 | 29 | */ |
| 30 | 30 | protected function doQuery( $sql ) { |
| — | — | @@ -36,10 +36,10 @@ |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | /** |
| 40 | | - * @param $server |
| 41 | | - * @param $user |
| 42 | | - * @param $password |
| 43 | | - * @param $dbName |
| | 40 | + * @param $server string |
| | 41 | + * @param $user string |
| | 42 | + * @param $password string |
| | 43 | + * @param $dbName string |
| 44 | 44 | * @return bool |
| 45 | 45 | * @throws DBConnectionError |
| 46 | 46 | */ |
| — | — | @@ -167,7 +167,7 @@ |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | /** |
| 171 | | - * @param $res |
| | 171 | + * @param $res ResultWrapper |
| 172 | 172 | * @throws DBUnexpectedError |
| 173 | 173 | */ |
| 174 | 174 | function freeResult( $res ) { |
| — | — | @@ -183,7 +183,7 @@ |
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | /** |
| 187 | | - * @param $res |
| | 187 | + * @param $res ResultWrapper |
| 188 | 188 | * @return object|stdClass |
| 189 | 189 | * @throws DBUnexpectedError |
| 190 | 190 | */ |
| — | — | @@ -201,7 +201,7 @@ |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | 204 | /** |
| 205 | | - * @param $res |
| | 205 | + * @param $res ResultWrapper |
| 206 | 206 | * @return array |
| 207 | 207 | * @throws DBUnexpectedError |
| 208 | 208 | */ |
| — | — | @@ -220,7 +220,7 @@ |
| 221 | 221 | |
| 222 | 222 | /** |
| 223 | 223 | * @throws DBUnexpectedError |
| 224 | | - * @param $res |
| | 224 | + * @param $res ResultWrapper |
| 225 | 225 | * @return int |
| 226 | 226 | */ |
| 227 | 227 | function numRows( $res ) { |
| — | — | @@ -237,7 +237,7 @@ |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | /** |
| 241 | | - * @param $res |
| | 241 | + * @param $res ResultWrapper |
| 242 | 242 | * @return int |
| 243 | 243 | */ |
| 244 | 244 | function numFields( $res ) { |
| — | — | @@ -248,8 +248,8 @@ |
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | /** |
| 252 | | - * @param $res |
| 253 | | - * @param $n |
| | 252 | + * @param $res ResultWrapper |
| | 253 | + * @param $n string |
| 254 | 254 | * @return string |
| 255 | 255 | */ |
| 256 | 256 | function fieldName( $res, $n ) { |
| — | — | @@ -267,7 +267,7 @@ |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | /** |
| 271 | | - * @param $res |
| | 271 | + * @param $res ResultWrapper |
| 272 | 272 | * @param $row |
| 273 | 273 | * @return bool |
| 274 | 274 | */ |
| — | — | @@ -318,9 +318,9 @@ |
| 319 | 319 | } |
| 320 | 320 | |
| 321 | 321 | /** |
| 322 | | - * @param $table |
| | 322 | + * @param $table string |
| 323 | 323 | * @param $uniqueIndexes |
| 324 | | - * @param $rows |
| | 324 | + * @param $rows array |
| 325 | 325 | * @param $fname string |
| 326 | 326 | * @return ResultWrapper |
| 327 | 327 | */ |
| — | — | @@ -382,8 +382,8 @@ |
| 383 | 383 | * Get information about an index into an object |
| 384 | 384 | * Returns false if the index does not exist |
| 385 | 385 | * |
| 386 | | - * @param $table |
| 387 | | - * @param $index |
| | 386 | + * @param $table string |
| | 387 | + * @param $index string |
| 388 | 388 | * @param $fname string |
| 389 | 389 | * @return false|array |
| 390 | 390 | */ |
| — | — | @@ -670,8 +670,8 @@ |
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | /** |
| 674 | | - * @param $lockName |
| 675 | | - * @param $method |
| | 674 | + * @param $lockName string |
| | 675 | + * @param $method string |
| 676 | 676 | * @param $timeout int |
| 677 | 677 | * @return bool |
| 678 | 678 | */ |
| — | — | @@ -690,9 +690,9 @@ |
| 691 | 691 | |
| 692 | 692 | /** |
| 693 | 693 | * FROM MYSQL DOCS: http://dev.mysql.com/doc/refman/5.0/en/miscellaneous-functions.html#function_release-lock |
| 694 | | - * @param $lockName |
| | 694 | + * @param $lockName string |
| 695 | 695 | * @param $method string |
| 696 | | - * @return |
| | 696 | + * @return bool |
| 697 | 697 | */ |
| 698 | 698 | public function unlock( $lockName, $method ) { |
| 699 | 699 | $lockName = $this->addQuotes( $lockName ); |
| — | — | @@ -702,9 +702,9 @@ |
| 703 | 703 | } |
| 704 | 704 | |
| 705 | 705 | /** |
| 706 | | - * @param $read |
| 707 | | - * @param $write |
| 708 | | - * @param $method |
| | 706 | + * @param $read array |
| | 707 | + * @param $write array |
| | 708 | + * @param $method string |
| 709 | 709 | * @param $lowPriority bool |
| 710 | 710 | */ |
| 711 | 711 | public function lockTables( $read, $write, $method, $lowPriority = true ) { |
| — | — | @@ -761,13 +761,13 @@ |
| 762 | 762 | |
| 763 | 763 | /** |
| 764 | 764 | * DELETE where the condition is a join. MySql uses multi-table deletes. |
| 765 | | - * @param $delTable |
| 766 | | - * @param $joinTable |
| 767 | | - * @param $delVar |
| 768 | | - * @param $joinVar |
| | 765 | + * @param $delTable string |
| | 766 | + * @param $joinTable string |
| | 767 | + * @param $delVar string |
| | 768 | + * @param $joinVar string |
| 769 | 769 | * @param $conds array|string |
| 770 | 770 | * @param $fname bool |
| 771 | | - * @return bool|\ResultWrapper |
| | 771 | + * @return bool|ResultWrapper |
| 772 | 772 | */ |
| 773 | 773 | function deleteJoin( $delTable, $joinTable, $delVar, $joinVar, $conds, $fname = 'DatabaseBase::deleteJoin' ) { |
| 774 | 774 | if ( !$conds ) { |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -288,7 +288,7 @@ |
| 289 | 289 | abstract function outputPage( OutputPage $out = null ); |
| 290 | 290 | |
| 291 | 291 | /** |
| 292 | | - * @param $data |
| | 292 | + * @param $data array |
| 293 | 293 | * @return string |
| 294 | 294 | */ |
| 295 | 295 | static function makeVariablesScript( $data ) { |
| — | — | @@ -543,7 +543,7 @@ |
| 544 | 544 | } |
| 545 | 545 | |
| 546 | 546 | /** |
| 547 | | - * @param $debugText |
| | 547 | + * @param $debugText string |
| 548 | 548 | * @return string |
| 549 | 549 | */ |
| 550 | 550 | private function formatDebugHTML( $debugText ) { |
| — | — | @@ -734,7 +734,7 @@ |
| 735 | 735 | } |
| 736 | 736 | |
| 737 | 737 | /** |
| 738 | | - * @param string $type |
| | 738 | + * @param $type string |
| 739 | 739 | * @return string |
| 740 | 740 | */ |
| 741 | 741 | function getCopyright( $type = 'detect' ) { |
| — | — | @@ -976,7 +976,7 @@ |
| 977 | 977 | } |
| 978 | 978 | |
| 979 | 979 | /** |
| 980 | | - * @param $id |
| | 980 | + * @param $id User|int |
| 981 | 981 | * @return bool |
| 982 | 982 | */ |
| 983 | 983 | function showEmailUser( $id ) { |
| — | — | @@ -1027,7 +1027,7 @@ |
| 1028 | 1028 | } |
| 1029 | 1029 | |
| 1030 | 1030 | /** |
| 1031 | | - * @param $name |
| | 1031 | + * @param $name string |
| 1032 | 1032 | * @param $urlaction string |
| 1033 | 1033 | * @return String |
| 1034 | 1034 | */ |
| — | — | @@ -1037,8 +1037,8 @@ |
| 1038 | 1038 | } |
| 1039 | 1039 | |
| 1040 | 1040 | /** |
| 1041 | | - * @param $name |
| 1042 | | - * @param $subpage |
| | 1041 | + * @param $name string |
| | 1042 | + * @param $subpage string |
| 1043 | 1043 | * @param $urlaction string |
| 1044 | 1044 | * @return String |
| 1045 | 1045 | */ |
| — | — | @@ -1048,7 +1048,7 @@ |
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | 1051 | /** |
| 1052 | | - * @param $name |
| | 1052 | + * @param $name string |
| 1053 | 1053 | * @param $urlaction string |
| 1054 | 1054 | * @return String |
| 1055 | 1055 | */ |
| — | — | @@ -1059,7 +1059,7 @@ |
| 1060 | 1060 | } |
| 1061 | 1061 | |
| 1062 | 1062 | /** |
| 1063 | | - * @param $name |
| | 1063 | + * @param $name string |
| 1064 | 1064 | * @param $urlaction string |
| 1065 | 1065 | * @return String |
| 1066 | 1066 | */ |
| — | — | @@ -1134,7 +1134,7 @@ |
| 1135 | 1135 | * make sure we have some title to operate on |
| 1136 | 1136 | * |
| 1137 | 1137 | * @param $title Title |
| 1138 | | - * @param $name |
| | 1138 | + * @param $name string |
| 1139 | 1139 | */ |
| 1140 | 1140 | static function checkTitle( &$title, $name ) { |
| 1141 | 1141 | if ( !is_object( $title ) ) { |