| Index: trunk/phase3/maintenance/benchmarks/bench_delete_truncate.php |
| — | — | @@ -44,8 +44,7 @@ |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | | - * @param $dbw DatabaseBase |
| 49 | | - * @return void |
| | 48 | + * @param $dbw DatabaseBase |
| 50 | 49 | */ |
| 51 | 50 | private function insertData( $dbw ) { |
| 52 | 51 | $range = range( 0, 1024 ); |
| — | — | @@ -57,16 +56,14 @@ |
| 58 | 57 | } |
| 59 | 58 | |
| 60 | 59 | /** |
| 61 | | - * @param $dbw DatabaseBase |
| 62 | | - * @return void |
| | 60 | + * @param $dbw DatabaseBase |
| 63 | 61 | */ |
| 64 | 62 | private function delete( $dbw ) { |
| 65 | 63 | $dbw->delete( 'text', '*', __METHOD__ ); |
| 66 | 64 | } |
| 67 | 65 | |
| 68 | 66 | /** |
| 69 | | - * @param $dbw DatabaseBase |
| 70 | | - * @return void |
| | 67 | + * @param $dbw DatabaseBase |
| 71 | 68 | */ |
| 72 | 69 | private function truncate( $dbw ) { |
| 73 | 70 | $test = $dbw->tableName( 'test' ); |
| Index: trunk/phase3/maintenance/locking/LockServerDaemon.php |
| — | — | @@ -101,9 +101,6 @@ |
| 102 | 102 | : 10; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | | - /** |
| 106 | | - * @return void |
| 107 | | - */ |
| 108 | 105 | protected function setupSocket() { |
| 109 | 106 | if ( !function_exists( 'socket_create' ) ) { |
| 110 | 107 | throw new Exception( "PHP sockets extension missing from PHP CLI mode." ); |
| — | — | @@ -125,9 +122,6 @@ |
| 126 | 123 | $this->startTime = time(); |
| 127 | 124 | } |
| 128 | 125 | |
| 129 | | - /** |
| 130 | | - * @return void |
| 131 | | - */ |
| 132 | 126 | public function main() { |
| 133 | 127 | // Setup socket and start listing |
| 134 | 128 | $this->setupSocket(); |
| — | — | @@ -354,8 +348,6 @@ |
| 355 | 349 | |
| 356 | 350 | /** |
| 357 | 351 | * Clear locks for sessions that have been dead for a while |
| 358 | | - * |
| 359 | | - * @return void |
| 360 | 352 | */ |
| 361 | 353 | protected function purgeExpiredLocks() { |
| 362 | 354 | $now = time(); |
| — | — | @@ -370,7 +362,6 @@ |
| 371 | 363 | /** |
| 372 | 364 | * @param $key string |
| 373 | 365 | * @param $session string |
| 374 | | - * @return void |
| 375 | 366 | */ |
| 376 | 367 | protected function set_sh_lock( $key, $session ) { |
| 377 | 368 | if ( !isset( $this->shLocks[$key][$session] ) ) { |
| — | — | @@ -383,7 +374,6 @@ |
| 384 | 375 | /** |
| 385 | 376 | * @param $key string |
| 386 | 377 | * @param $session string |
| 387 | | - * @return void |
| 388 | 378 | */ |
| 389 | 379 | protected function set_ex_lock( $key, $session ) { |
| 390 | 380 | if ( !isset( $this->exLocks[$key][$session] ) ) { |
| — | — | @@ -396,7 +386,6 @@ |
| 397 | 387 | /** |
| 398 | 388 | * @param $key string |
| 399 | 389 | * @param $session string |
| 400 | | - * @return void |
| 401 | 390 | */ |
| 402 | 391 | protected function unset_sh_lock( $key, $session ) { |
| 403 | 392 | if ( isset( $this->shLocks[$key][$session] ) ) { |
| — | — | @@ -415,7 +404,6 @@ |
| 416 | 405 | /** |
| 417 | 406 | * @param $key string |
| 418 | 407 | * @param $session string |
| 419 | | - * @return void |
| 420 | 408 | */ |
| 421 | 409 | protected function unset_ex_lock( $key, $session ) { |
| 422 | 410 | if ( isset( $this->exLocks[$key] ) && $this->exLocks[$key] === $session ) { |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -12,7 +12,6 @@ |
| 13 | 13 | class CoreParserFunctions { |
| 14 | 14 | /** |
| 15 | 15 | * @param $parser Parser |
| 16 | | - * @return void |
| 17 | 16 | */ |
| 18 | 17 | static function register( $parser ) { |
| 19 | 18 | global $wgAllowDisplayTitle, $wgAllowSlowParserFunctions; |
| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -286,7 +286,6 @@ |
| 287 | 287 | * @param $name string Title dbKey |
| 288 | 288 | * @param $timestamp string MW timestamp of file creation (or false if non-existing) |
| 289 | 289 | * @param $sha string base 36 SHA-1 of file (or false if non-existing) |
| 290 | | - * @return void |
| 291 | 290 | */ |
| 292 | 291 | function addImage( $name, $timestamp = null, $sha1 = null ) { |
| 293 | 292 | $this->mImages[$name] = 1; |
| — | — | @@ -300,7 +299,6 @@ |
| 301 | 300 | * @param $title Title |
| 302 | 301 | * @param $page_id |
| 303 | 302 | * @param $rev_id |
| 304 | | - * @return void |
| 305 | 303 | */ |
| 306 | 304 | function addTemplate( $title, $page_id, $rev_id ) { |
| 307 | 305 | $ns = $title->getNamespace(); |
| Index: trunk/phase3/includes/parser/CoreTagHooks.php |
| — | — | @@ -12,7 +12,6 @@ |
| 13 | 13 | class CoreTagHooks { |
| 14 | 14 | /** |
| 15 | 15 | * @param $parser Parser |
| 16 | | - * @return void |
| 17 | 16 | */ |
| 18 | 17 | static function register( $parser ) { |
| 19 | 18 | global $wgRawHtml; |
| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -39,8 +39,7 @@ |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | /** |
| 43 | | - * @param $file File: |
| 44 | | - * @return void |
| | 43 | + * @param $file File |
| 45 | 44 | */ |
| 46 | 45 | public function setFile( $file ) { |
| 47 | 46 | $this->mPage->setFile( $file ); |
| Index: trunk/phase3/includes/TitleArray.php |
| — | — | @@ -53,7 +53,6 @@ |
| 54 | 54 | |
| 55 | 55 | /** |
| 56 | 56 | * @param $row ResultWrapper |
| 57 | | - * @return void |
| 58 | 57 | */ |
| 59 | 58 | protected function setCurrent( $row ) { |
| 60 | 59 | if ( $row === false ) { |
| Index: trunk/phase3/includes/db/Database.php |
| — | — | @@ -3052,7 +3052,6 @@ |
| 3053 | 3053 | * Override database's default connection timeout |
| 3054 | 3054 | * |
| 3055 | 3055 | * @param $timeout Integer in seconds |
| 3056 | | - * @return void |
| 3057 | 3056 | * @deprecated since 1.19; use setSessionOptions() |
| 3058 | 3057 | */ |
| 3059 | 3058 | public function setTimeout( $timeout ) { |
| — | — | @@ -3068,7 +3067,6 @@ |
| 3069 | 3068 | * hours or days. |
| 3070 | 3069 | * |
| 3071 | 3070 | * @param $options Array |
| 3072 | | - * @return void |
| 3073 | 3071 | */ |
| 3074 | 3072 | public function setSessionOptions( array $options ) {} |
| 3075 | 3073 | |
| Index: trunk/phase3/includes/db/CloneDatabase.php |
| — | — | @@ -86,18 +86,18 @@ |
| 87 | 87 | * Clone the table structure |
| 88 | 88 | */ |
| 89 | 89 | public function cloneTableStructure() { |
| 90 | | - |
| | 90 | + |
| 91 | 91 | foreach( $this->tablesToClone as $tbl ) { |
| 92 | 92 | # Clean up from previous aborted run. So that table escaping |
| 93 | 93 | # works correctly across DB engines, we need to change the pre- |
| 94 | 94 | # fix back and forth so tableName() works right. |
| 95 | | - |
| | 95 | + |
| 96 | 96 | self::changePrefix( $this->oldTablePrefix ); |
| 97 | 97 | $oldTableName = $this->db->tableName( $tbl, 'raw' ); |
| 98 | | - |
| | 98 | + |
| 99 | 99 | self::changePrefix( $this->newTablePrefix ); |
| 100 | 100 | $newTableName = $this->db->tableName( $tbl, 'raw' ); |
| 101 | | - |
| | 101 | + |
| 102 | 102 | if( $this->dropCurrentTables && !in_array( $this->db->getType(), array( 'postgres', 'oracle' ) ) ) { |
| 103 | 103 | $this->db->dropTable( $tbl, __METHOD__ ); |
| 104 | 104 | wfDebug( __METHOD__." dropping {$newTableName}\n", true); |
| — | — | @@ -107,9 +107,9 @@ |
| 108 | 108 | # Create new table |
| 109 | 109 | wfDebug( __METHOD__." duplicating $oldTableName to $newTableName\n", true ); |
| 110 | 110 | $this->db->duplicateTableStructure( $oldTableName, $newTableName, $this->useTemporaryTables ); |
| 111 | | - |
| | 111 | + |
| 112 | 112 | } |
| 113 | | - |
| | 113 | + |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | 116 | /** |
| — | — | @@ -129,8 +129,7 @@ |
| 130 | 130 | /** |
| 131 | 131 | * Change the table prefix on all open DB connections/ |
| 132 | 132 | * |
| 133 | | - * @param $prefix |
| 134 | | - * @return void |
| | 133 | + * @param $prefix |
| 135 | 134 | */ |
| 136 | 135 | public static function changePrefix( $prefix ) { |
| 137 | 136 | global $wgDBprefix; |
| — | — | @@ -139,18 +138,16 @@ |
| 140 | 139 | } |
| 141 | 140 | |
| 142 | 141 | /** |
| 143 | | - * @param $lb LoadBalancer |
| 144 | | - * @param $prefix |
| 145 | | - * @return void |
| | 142 | + * @param $lb LoadBalancer |
| | 143 | + * @param $prefix |
| 146 | 144 | */ |
| 147 | 145 | public static function changeLBPrefix( $lb, $prefix ) { |
| 148 | 146 | $lb->forEachOpenConnection( array( 'CloneDatabase', 'changeDBPrefix' ), array( $prefix ) ); |
| 149 | 147 | } |
| 150 | 148 | |
| 151 | 149 | /** |
| 152 | | - * @param $db DatabaseBase |
| 153 | | - * @param $prefix |
| 154 | | - * @return void |
| | 150 | + * @param $db DatabaseBase |
| | 151 | + * @param $prefix |
| 155 | 152 | */ |
| 156 | 153 | public static function changeDBPrefix( $db, $prefix ) { |
| 157 | 154 | $db->tablePrefix( $prefix ); |
| Index: trunk/phase3/includes/filerepo/file/TempFSFile.php |
| — | — | @@ -66,7 +66,6 @@ |
| 67 | 67 | * Clean up the temporary file only after an object goes out of scope |
| 68 | 68 | * |
| 69 | 69 | * @param $object Object |
| 70 | | - * @return void |
| 71 | 70 | */ |
| 72 | 71 | public function bind( $object ) { |
| 73 | 72 | if ( is_object( $object ) ) { |
| — | — | @@ -76,8 +75,6 @@ |
| 77 | 76 | |
| 78 | 77 | /** |
| 79 | 78 | * Set flag to not clean up after the temporary file |
| 80 | | - * |
| 81 | | - * @return void |
| 82 | 79 | */ |
| 83 | 80 | public function preserve() { |
| 84 | 81 | $this->canDelete = false; |
| Index: trunk/phase3/includes/filerepo/file/File.php |
| — | — | @@ -1694,8 +1694,7 @@ |
| 1695 | 1695 | } |
| 1696 | 1696 | |
| 1697 | 1697 | /** |
| 1698 | | - * @param $from |
| 1699 | | - * @return void |
| | 1698 | + * @param $from |
| 1700 | 1699 | */ |
| 1701 | 1700 | function redirectedFrom( $from ) { |
| 1702 | 1701 | $this->redirected = $from; |
| Index: trunk/phase3/includes/filerepo/LocalRepo.php |
| — | — | @@ -261,7 +261,6 @@ |
| 262 | 262 | * Invalidates image redirect cache related to that image |
| 263 | 263 | * |
| 264 | 264 | * @param $title Title of page |
| 265 | | - * @return void |
| 266 | 265 | */ |
| 267 | 266 | function invalidateImageRedirect( Title $title ) { |
| 268 | 267 | global $wgMemc; |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/DBLockManager.php |
| — | — | @@ -281,7 +281,6 @@ |
| 282 | 282 | * |
| 283 | 283 | * @param $lockDb string |
| 284 | 284 | * @param $db DatabaseBase |
| 285 | | - * @return void |
| 286 | 285 | * @throws DBError |
| 287 | 286 | */ |
| 288 | 287 | protected function initConnection( $lockDb, DatabaseBase $db ) {} |
| Index: trunk/phase3/includes/filerepo/backend/lockmanager/LockManagerGroup.php |
| — | — | @@ -27,8 +27,6 @@ |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | 30 | * Register lock managers from the global variables |
| 31 | | - * |
| 32 | | - * @return void |
| 33 | 31 | */ |
| 34 | 32 | protected function initFromGlobals() { |
| 35 | 33 | global $wgLockManagers; |
| — | — | @@ -40,7 +38,6 @@ |
| 41 | 39 | * Register an array of file lock manager configurations |
| 42 | 40 | * |
| 43 | 41 | * @param $configs Array |
| 44 | | - * @return void |
| 45 | 42 | * @throws MWException |
| 46 | 43 | */ |
| 47 | 44 | protected function register( array $configs ) { |
| Index: trunk/phase3/includes/filerepo/backend/FileOp.php |
| — | — | @@ -54,8 +54,6 @@ |
| 55 | 55 | |
| 56 | 56 | /** |
| 57 | 57 | * Disable file backups for this operation |
| 58 | | - * |
| 59 | | - * @return void |
| 60 | 58 | */ |
| 61 | 59 | final protected function disableBackups() { |
| 62 | 60 | $this->useBackups = false; |
| — | — | @@ -65,8 +63,6 @@ |
| 66 | 64 | * Allow stale data for file reads and existence checks. |
| 67 | 65 | * If this is called, then disableBackups() should also be called |
| 68 | 66 | * unless the affected files are known to have not changed recently. |
| 69 | | - * |
| 70 | | - * @return void |
| 71 | 67 | */ |
| 72 | 68 | final protected function allowStaleReads() { |
| 73 | 69 | $this->useLatest = false; |
| — | — | @@ -504,7 +500,6 @@ |
| 505 | 501 | * Log a file operation failure and preserve any temp files |
| 506 | 502 | * |
| 507 | 503 | * @param $fileOp FileOp |
| 508 | | - * @return void |
| 509 | 504 | */ |
| 510 | 505 | final protected function logFailure( $action ) { |
| 511 | 506 | $params = $this->params; |
| Index: trunk/phase3/includes/filerepo/backend/FileBackendGroup.php |
| — | — | @@ -32,8 +32,6 @@ |
| 33 | 33 | |
| 34 | 34 | /** |
| 35 | 35 | * Destroy the singleton instance |
| 36 | | - * |
| 37 | | - * @return void |
| 38 | 36 | */ |
| 39 | 37 | public static function destroySingleton() { |
| 40 | 38 | self::$instance = null; |
| — | — | @@ -41,8 +39,6 @@ |
| 42 | 40 | |
| 43 | 41 | /** |
| 44 | 42 | * Register file backends from the global variables |
| 45 | | - * |
| 46 | | - * @return void |
| 47 | 43 | */ |
| 48 | 44 | protected function initFromGlobals() { |
| 49 | 45 | global $wgLocalFileRepo, $wgForeignFileRepos, $wgFileBackends; |
| — | — | @@ -93,7 +89,6 @@ |
| 94 | 90 | * Register an array of file backend configurations |
| 95 | 91 | * |
| 96 | 92 | * @param $configs Array |
| 97 | | - * @return void |
| 98 | 93 | * @throws MWException |
| 99 | 94 | */ |
| 100 | 95 | protected function register( array $configs ) { |
| Index: trunk/phase3/includes/filerepo/backend/FileBackend.php |
| — | — | @@ -515,7 +515,6 @@ |
| 516 | 516 | * If $paths is given, then only the cache for those files will be cleared. |
| 517 | 517 | * |
| 518 | 518 | * @param $paths Array Storage paths |
| 519 | | - * @return void |
| 520 | 519 | */ |
| 521 | 520 | abstract public function clearCache( array $paths = null ); |
| 522 | 521 | |
| — | — | @@ -1164,8 +1163,6 @@ |
| 1165 | 1164 | |
| 1166 | 1165 | /** |
| 1167 | 1166 | * Prune the cache if it is too big to add an item |
| 1168 | | - * |
| 1169 | | - * @return void |
| 1170 | 1167 | */ |
| 1171 | 1168 | protected function trimCache() { |
| 1172 | 1169 | if ( count( $this->cache ) >= $this->maxCacheSize ) { |
| Index: trunk/phase3/includes/filerepo/FileRepo.php |
| — | — | @@ -126,7 +126,6 @@ |
| 127 | 127 | * directories, in case the user has not configured offline storage |
| 128 | 128 | * |
| 129 | 129 | * @param $dir string |
| 130 | | - * @return void |
| 131 | 130 | */ |
| 132 | 131 | protected function initDeletedDir( $dir ) { |
| 133 | 132 | $this->backend->secure( // prevent web access & dir listings |
| — | — | @@ -718,8 +717,7 @@ |
| 719 | 718 | * Each file can be a (zone, rel) pair, virtual url, storage path, or FS path. |
| 720 | 719 | * It will try to delete each file, but ignores any errors that may occur. |
| 721 | 720 | * |
| 722 | | - * @param $pairs array List of files to delete |
| 723 | | - * @return void |
| | 721 | + * @param $files array List of files to delete |
| 724 | 722 | */ |
| 725 | 723 | public function cleanupBatch( $files ) { |
| 726 | 724 | $operations = array(); |
| — | — | @@ -1217,7 +1215,6 @@ |
| 1218 | 1216 | * May use either the database or the filesystem. |
| 1219 | 1217 | * |
| 1220 | 1218 | * @param $callback Array|string |
| 1221 | | - * @return void |
| 1222 | 1219 | */ |
| 1223 | 1220 | public function enumFiles( $callback ) { |
| 1224 | 1221 | $this->enumFilesInStorage( $callback ); |
| — | — | @@ -1228,7 +1225,6 @@ |
| 1229 | 1226 | * May use either the database or the filesystem. |
| 1230 | 1227 | * |
| 1231 | 1228 | * @param $callback Array|string |
| 1232 | | - * @return void |
| 1233 | 1229 | */ |
| 1234 | 1230 | protected function enumFilesInStorage( $callback ) { |
| 1235 | 1231 | $publicRoot = $this->getZonePath( 'public' ); |
| Index: trunk/phase3/includes/SquidPurgeClient.php |
| — | — | @@ -340,7 +340,6 @@ |
| 341 | 341 | |
| 342 | 342 | /** |
| 343 | 343 | * @param $client SquidPurgeClient |
| 344 | | - * @return void |
| 345 | 344 | */ |
| 346 | 345 | public function addClient( $client ) { |
| 347 | 346 | $this->clients[] = $client; |
| Index: trunk/phase3/includes/Hooks.php |
| — | — | @@ -39,7 +39,6 @@ |
| 40 | 40 | * |
| 41 | 41 | * @param $name Mixed: name of hook |
| 42 | 42 | * @param $callback Mixed: callback function to attach |
| 43 | | - * @return void |
| 44 | 43 | */ |
| 45 | 44 | public static function register( $name, $callback ) { |
| 46 | 45 | if( !isset( self::$handlers[$name] ) ) { |
| Index: trunk/phase3/includes/api/ApiQueryAllLinks.php |
| — | — | @@ -49,7 +49,6 @@ |
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * @param $resultPageSet ApiPageSet |
| 53 | | - * @return void |
| 54 | 53 | */ |
| 55 | 54 | private function run( $resultPageSet = null ) { |
| 56 | 55 | $db = $this->getDB(); |
| Index: trunk/phase3/includes/api/ApiQueryRandom.php |
| — | — | @@ -46,12 +46,11 @@ |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | | - * @param $randstr |
| 51 | | - * @param $limit |
| 52 | | - * @param $namespace |
| | 50 | + * @param $randstr |
| | 51 | + * @param $limit |
| | 52 | + * @param $namespace |
| 53 | 53 | * @param $resultPageSet ApiPageSet |
| 54 | | - * @param $redirect |
| 55 | | - * @return void |
| | 54 | + * @param $redirect |
| 56 | 55 | */ |
| 57 | 56 | protected function prepareQuery( $randstr, $limit, $namespace, &$resultPageSet, $redirect ) { |
| 58 | 57 | $this->resetQueryParams(); |
| — | — | @@ -101,7 +100,6 @@ |
| 102 | 101 | |
| 103 | 102 | /** |
| 104 | 103 | * @param $resultPageSet ApiPageSet |
| 105 | | - * @return void |
| 106 | 104 | */ |
| 107 | 105 | public function run( $resultPageSet = null ) { |
| 108 | 106 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryExtLinksUsage.php |
| — | — | @@ -47,7 +47,6 @@ |
| 48 | 48 | |
| 49 | 49 | /** |
| 50 | 50 | * @param $resultPageSet ApiPageSet |
| 51 | | - * @return void |
| 52 | 51 | */ |
| 53 | 52 | private function run( $resultPageSet = null ) { |
| 54 | 53 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryAllpages.php |
| — | — | @@ -45,7 +45,6 @@ |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @param $resultPageSet ApiPageSet |
| 49 | | - * @return void |
| 50 | 49 | */ |
| 51 | 50 | public function executeGenerator( $resultPageSet ) { |
| 52 | 51 | if ( $resultPageSet->isResolvingRedirects() ) { |
| — | — | @@ -57,7 +56,6 @@ |
| 58 | 57 | |
| 59 | 58 | /** |
| 60 | 59 | * @param $resultPageSet ApiPageSet |
| 61 | | - * @return void |
| 62 | 60 | */ |
| 63 | 61 | private function run( $resultPageSet = null ) { |
| 64 | 62 | $db = $this->getDB(); |
| Index: trunk/phase3/includes/api/ApiQueryBacklinks.php |
| — | — | @@ -119,7 +119,6 @@ |
| 120 | 120 | |
| 121 | 121 | /** |
| 122 | 122 | * @param $resultPageSet ApiPageSet |
| 123 | | - * @return void |
| 124 | 123 | */ |
| 125 | 124 | private function prepareFirstQuery( $resultPageSet = null ) { |
| 126 | 125 | /* SELECT page_id, page_title, page_namespace, page_is_redirect |
| — | — | @@ -161,7 +160,6 @@ |
| 162 | 161 | |
| 163 | 162 | /** |
| 164 | 163 | * @param $resultPageSet ApiPageSet |
| 165 | | - * @return void |
| 166 | 164 | */ |
| 167 | 165 | private function prepareSecondQuery( $resultPageSet = null ) { |
| 168 | 166 | /* SELECT page_id, page_title, page_namespace, page_is_redirect, pl_title, pl_namespace |
| — | — | @@ -223,7 +221,6 @@ |
| 224 | 222 | |
| 225 | 223 | /** |
| 226 | 224 | * @param $resultPageSet ApiPageSet |
| 227 | | - * @return void |
| 228 | 225 | */ |
| 229 | 226 | private function run( $resultPageSet = null ) { |
| 230 | 227 | $this->params = $this->extractRequestParams( false ); |
| Index: trunk/phase3/includes/api/ApiQueryBase.php |
| — | — | @@ -505,7 +505,6 @@ |
| 506 | 506 | * Also adds relevant block information |
| 507 | 507 | * |
| 508 | 508 | * @param bool $showBlockInfo |
| 509 | | - * @return void |
| 510 | 509 | */ |
| 511 | 510 | public function showHiddenUsersAddBlockInfo( $showBlockInfo ) { |
| 512 | 511 | $userCanViewHiddenUsers = $this->getUser()->isAllowed( 'hideuser' ); |
| Index: trunk/phase3/includes/api/ApiImport.php |
| — | — | @@ -181,7 +181,6 @@ |
| 182 | 182 | * @param $revisionCount int |
| 183 | 183 | * @param $successCount int |
| 184 | 184 | * @param $pageInfo |
| 185 | | - * @return void |
| 186 | 185 | */ |
| 187 | 186 | function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) { |
| 188 | 187 | // Add a result entry |
| Index: trunk/phase3/includes/api/ApiQueryCategoryMembers.php |
| — | — | @@ -49,7 +49,6 @@ |
| 50 | 50 | |
| 51 | 51 | /** |
| 52 | 52 | * @param $resultPageSet ApiPageSet |
| 53 | | - * @return void |
| 54 | 53 | */ |
| 55 | 54 | private function run( $resultPageSet = null ) { |
| 56 | 55 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryAllimages.php |
| — | — | @@ -61,7 +61,6 @@ |
| 62 | 62 | |
| 63 | 63 | /** |
| 64 | 64 | * @param $resultPageSet ApiPageSet |
| 65 | | - * @return void |
| 66 | 65 | */ |
| 67 | 66 | public function executeGenerator( $resultPageSet ) { |
| 68 | 67 | if ( $resultPageSet->isResolvingRedirects() ) { |
| — | — | @@ -73,7 +72,6 @@ |
| 74 | 73 | |
| 75 | 74 | /** |
| 76 | 75 | * @param $resultPageSet ApiPageSet |
| 77 | | - * @return void |
| 78 | 76 | */ |
| 79 | 77 | private function run( $resultPageSet = null ) { |
| 80 | 78 | $repo = $this->mRepo; |
| Index: trunk/phase3/includes/api/ApiQuerySearch.php |
| — | — | @@ -45,7 +45,6 @@ |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @param $resultPageSet ApiPageSet |
| 49 | | - * @return void |
| 50 | 49 | */ |
| 51 | 50 | private function run( $resultPageSet = null ) { |
| 52 | 51 | global $wgContLang; |
| Index: trunk/phase3/includes/api/ApiQueryWatchlistRaw.php |
| — | — | @@ -46,7 +46,6 @@ |
| 47 | 47 | |
| 48 | 48 | /** |
| 49 | 49 | * @param $resultPageSet ApiPageSet |
| 50 | | - * @return void |
| 51 | 50 | */ |
| 52 | 51 | private function run( $resultPageSet = null ) { |
| 53 | 52 | $this->selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' ); |
| Index: trunk/phase3/includes/api/ApiQueryProtectedTitles.php |
| — | — | @@ -45,7 +45,6 @@ |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @param $resultPageSet ApiPageSet |
| 49 | | - * @return void |
| 50 | 49 | */ |
| 51 | 50 | private function run( $resultPageSet = null ) { |
| 52 | 51 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryIWBacklinks.php |
| — | — | @@ -45,7 +45,6 @@ |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @param $resultPageSet ApiPageSet |
| 49 | | - * @return void |
| 50 | 49 | */ |
| 51 | 50 | public function run( $resultPageSet = null ) { |
| 52 | 51 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryWatchlist.php |
| — | — | @@ -50,7 +50,6 @@ |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * @param $resultPageSet ApiPageSet |
| 54 | | - * @return void |
| 55 | 54 | */ |
| 56 | 55 | private function run( $resultPageSet = null ) { |
| 57 | 56 | $this->selectNamedDB( 'watchlist', DB_SLAVE, 'watchlist' ); |
| Index: trunk/phase3/includes/api/ApiQueryLangBacklinks.php |
| — | — | @@ -45,7 +45,6 @@ |
| 46 | 46 | |
| 47 | 47 | /** |
| 48 | 48 | * @param $resultPageSet ApiPageSet |
| 49 | | - * @return void |
| 50 | 49 | */ |
| 51 | 50 | public function run( $resultPageSet = null ) { |
| 52 | 51 | $params = $this->extractRequestParams(); |
| Index: trunk/phase3/includes/api/ApiQueryInfo.php |
| — | — | @@ -51,7 +51,6 @@ |
| 52 | 52 | |
| 53 | 53 | /** |
| 54 | 54 | * @param $pageSet ApiPageSet |
| 55 | | - * @return void |
| 56 | 55 | */ |
| 57 | 56 | public function requestExtraData( $pageSet ) { |
| 58 | 57 | global $wgDisableCounters; |
| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -521,7 +521,6 @@ |
| 522 | 522 | * @param $context ResourceLoaderContext |
| 523 | 523 | * @param $mtime string TS_MW timestamp to use for last-modified |
| 524 | 524 | * @param $private bool True iff response contains any private modules |
| 525 | | - * @return void |
| 526 | 525 | */ |
| 527 | 526 | protected function sendResponseHeaders( ResourceLoaderContext $context, $mtime, $private ) { |
| 528 | 527 | global $wgResourceLoaderMaxage; |
| Index: trunk/phase3/includes/media/MediaTransformOutput.php |
| — | — | @@ -50,7 +50,6 @@ |
| 51 | 51 | |
| 52 | 52 | /** |
| 53 | 53 | * @param $storagePath string The permanent storage path |
| 54 | | - * @return void |
| 55 | 54 | */ |
| 56 | 55 | public function setStoragePath( $storagePath ) { |
| 57 | 56 | $this->storagePath = $storagePath; |
| Index: trunk/phase3/includes/media/GIFMetadataExtractor.php |
| — | — | @@ -233,7 +233,6 @@ |
| 234 | 234 | /** |
| 235 | 235 | * @param $fh |
| 236 | 236 | * @param $bpp |
| 237 | | - * @return void |
| 238 | 237 | */ |
| 239 | 238 | static function readGCT( $fh, $bpp ) { |
| 240 | 239 | if ( $bpp > 0 ) { |
| Index: trunk/phase3/includes/Wiki.php |
| — | — | @@ -145,8 +145,6 @@ |
| 146 | 146 | * - redirect loop |
| 147 | 147 | * - special pages |
| 148 | 148 | * - normal pages |
| 149 | | - * |
| 150 | | - * @return void |
| 151 | 149 | */ |
| 152 | 150 | private function performRequest() { |
| 153 | 151 | global $wgServer, $wgUsePathInfo, $wgTitle; |
| Index: trunk/phase3/includes/cache/FileCacheBase.php |
| — | — | @@ -151,7 +151,6 @@ |
| 152 | 152 | |
| 153 | 153 | /** |
| 154 | 154 | * Clear the cache for this page |
| 155 | | - * @return void |
| 156 | 155 | */ |
| 157 | 156 | public function clearCache() { |
| 158 | 157 | wfSuppressWarnings(); |
| — | — | @@ -162,7 +161,6 @@ |
| 163 | 162 | |
| 164 | 163 | /** |
| 165 | 164 | * Create parent directors of $this->cachePath() |
| 166 | | - * @return void |
| 167 | 165 | */ |
| 168 | 166 | protected function checkCacheDirs() { |
| 169 | 167 | wfMkdirParents( dirname( $this->cachePath() ), null, __METHOD__ ); |
| — | — | @@ -198,7 +196,6 @@ |
| 199 | 197 | /** |
| 200 | 198 | * Roughly increments the cache misses in the last hour by unique visitors |
| 201 | 199 | * @param $request WebRequest |
| 202 | | - * @return void |
| 203 | 200 | */ |
| 204 | 201 | public function incrMissesRecent( WebRequest $request ) { |
| 205 | 202 | global $wgMemc; |
| Index: trunk/phase3/includes/cache/HTMLFileCache.php |
| — | — | @@ -92,7 +92,6 @@ |
| 93 | 93 | /** |
| 94 | 94 | * Read from cache to context output |
| 95 | 95 | * @param $context IContextSource |
| 96 | | - * @return void |
| 97 | 96 | */ |
| 98 | 97 | public function loadFromFileCache( IContextSource $context ) { |
| 99 | 98 | global $wgMimeType, $wgLanguageCode; |
| Index: trunk/phase3/includes/cache/SquidUpdate.php |
| — | — | @@ -99,7 +99,6 @@ |
| 100 | 100 | * XXX report broken Squids per mail or log |
| 101 | 101 | * |
| 102 | 102 | * @param $urlArr array |
| 103 | | - * @return void |
| 104 | 103 | */ |
| 105 | 104 | static function purge( $urlArr ) { |
| 106 | 105 | global $wgSquidServers, $wgHTCPMulticastAddress, $wgHTCPPort; |
| Index: trunk/phase3/includes/Title.php |
| — | — | @@ -261,7 +261,6 @@ |
| 262 | 262 | * If false is given, the title will be treated as non-existing. |
| 263 | 263 | * |
| 264 | 264 | * @param $row Object|false database row |
| 265 | | - * @return void |
| 266 | 265 | */ |
| 267 | 266 | public function loadFromRow( $row ) { |
| 268 | 267 | if ( $row ) { // page found |
| Index: trunk/phase3/includes/WikiPage.php |
| — | — | @@ -367,7 +367,6 @@ |
| 368 | 368 | * A DB query result object or... |
| 369 | 369 | * "fromdb" to get from a slave DB or... |
| 370 | 370 | * "fromdbmaster" to get from the master DB |
| 371 | | - * @return void |
| 372 | 371 | */ |
| 373 | 372 | public function loadPageData( $data = 'fromdb' ) { |
| 374 | 373 | if ( $data === 'fromdbmaster' ) { |
| — | — | @@ -622,7 +621,6 @@ |
| 623 | 622 | /** |
| 624 | 623 | * Set the page timestamp (use only to avoid DB queries) |
| 625 | 624 | * @param $ts string MW timestamp of last article revision |
| 626 | | - * @return void |
| 627 | 625 | */ |
| 628 | 626 | public function setTimestamp( $ts ) { |
| 629 | 627 | $this->mTimestamp = wfTimestamp( TS_MW, $ts ); |
| — | — | @@ -705,7 +703,6 @@ |
| 706 | 704 | * Set the cached timestamp for the last time the page changed. |
| 707 | 705 | * This is only used to help handle slave lag by comparing to page_touched. |
| 708 | 706 | * @param $timestamp string |
| 709 | | - * @return void |
| 710 | 707 | */ |
| 711 | 708 | public function setCachedLastEditTime( $timestamp ) { |
| 712 | 709 | global $wgMemc; |
| Index: trunk/phase3/includes/specials/SpecialImport.php |
| — | — | @@ -349,7 +349,6 @@ |
| 350 | 350 | * @param int $revisionCount |
| 351 | 351 | * @param $successCount |
| 352 | 352 | * @param $pageInfo |
| 353 | | - * @return void |
| 354 | 353 | */ |
| 355 | 354 | function reportPage( $title, $origTitle, $revisionCount, $successCount, $pageInfo ) { |
| 356 | 355 | global $wgContLang; |
| Index: trunk/phase3/includes/specials/SpecialUserlogin.php |
| — | — | @@ -656,7 +656,6 @@ |
| 657 | 657 | /** |
| 658 | 658 | * Clear the login attempt throttle hit count for the (username,current IP) tuple. |
| 659 | 659 | * @param $username string The user name |
| 660 | | - * @return void |
| 661 | 660 | */ |
| 662 | 661 | public static function clearLoginThrottle( $username ) { |
| 663 | 662 | global $wgMemc, $wgRequest; |
| Index: trunk/phase3/includes/specials/SpecialShortpages.php |
| — | — | @@ -56,7 +56,6 @@ |
| 57 | 57 | /** |
| 58 | 58 | * @param $db DatabaseBase |
| 59 | 59 | * @param $res |
| 60 | | - * @return void |
| 61 | 60 | */ |
| 62 | 61 | function preprocessResults( $db, $res ) { |
| 63 | 62 | # There's no point doing a batch check if we aren't caching results; |
| Index: trunk/phase3/includes/specials/SpecialMergeHistory.php |
| — | — | @@ -39,9 +39,6 @@ |
| 40 | 40 | parent::__construct( 'MergeHistory', 'mergehistory' ); |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | | - /** |
| 44 | | - * @return void |
| 45 | | - */ |
| 46 | 43 | private function loadRequestParams() { |
| 47 | 44 | $request = $this->getRequest(); |
| 48 | 45 | $this->mAction = $request->getVal( 'action' ); |
| Index: trunk/phase3/includes/Preferences.php |
| — | — | @@ -129,7 +129,6 @@ |
| 130 | 130 | * @param $user User |
| 131 | 131 | * @param $context IContextSource |
| 132 | 132 | * @param $defaultPreferences |
| 133 | | - * @return void |
| 134 | 133 | */ |
| 135 | 134 | static function profilePreferences( $user, IContextSource $context, &$defaultPreferences ) { |
| 136 | 135 | global $wgAuth, $wgContLang, $wgParser, $wgCookieExpiration, $wgLanguageCode, |
| — | — | @@ -456,7 +455,6 @@ |
| 457 | 456 | * @param $user User |
| 458 | 457 | * @param $context IContextSource |
| 459 | 458 | * @param $defaultPreferences |
| 460 | | - * @return void |
| 461 | 459 | */ |
| 462 | 460 | static function skinPreferences( $user, IContextSource $context, &$defaultPreferences ) { |
| 463 | 461 | ## Skin ##################################### |
| — | — | @@ -532,7 +530,6 @@ |
| 533 | 531 | * @param $user User |
| 534 | 532 | * @param $context IContextSource |
| 535 | 533 | * @param $defaultPreferences |
| 536 | | - * @return void |
| 537 | 534 | */ |
| 538 | 535 | static function datetimePreferences( $user, IContextSource $context, &$defaultPreferences ) { |
| 539 | 536 | ## Date and time ##################################### |
| Index: trunk/phase3/includes/UserArray.php |
| — | — | @@ -60,7 +60,6 @@ |
| 61 | 61 | |
| 62 | 62 | /** |
| 63 | 63 | * @param $row |
| 64 | | - * @return void |
| 65 | 64 | */ |
| 66 | 65 | protected function setCurrent( $row ) { |
| 67 | 66 | if ( $row === false ) { |
| Index: trunk/phase3/includes/Pager.php |
| — | — | @@ -394,8 +394,6 @@ |
| 395 | 395 | * Called from getBody(), before getStartBody() is called and |
| 396 | 396 | * after doQuery() was called. This will be called only if there |
| 397 | 397 | * are rows in the result set. |
| 398 | | - * |
| 399 | | - * @return void |
| 400 | 398 | */ |
| 401 | 399 | protected function doBatchLookups() {} |
| 402 | 400 | |
| Index: trunk/phase3/includes/HistoryBlob.php |
| — | — | @@ -94,7 +94,6 @@ |
| 95 | 95 | |
| 96 | 96 | /** |
| 97 | 97 | * @param $text string |
| 98 | | - * @return void |
| 99 | 98 | */ |
| 100 | 99 | public function setText( $text ) { |
| 101 | 100 | $this->uncompress(); |
| Index: trunk/phase3/thumb.php |
| — | — | @@ -29,8 +29,6 @@ |
| 30 | 30 | |
| 31 | 31 | /** |
| 32 | 32 | * Handle a thumbnail request via query parameters |
| 33 | | - * |
| 34 | | - * @return void |
| 35 | 33 | */ |
| 36 | 34 | function wfThumbHandleRequest() { |
| 37 | 35 | $params = get_magic_quotes_gpc() |
| — | — | @@ -42,8 +40,6 @@ |
| 43 | 41 | |
| 44 | 42 | /** |
| 45 | 43 | * Handle a thumbnail request via thumbnail file URL |
| 46 | | - * |
| 47 | | - * @return void |
| 48 | 44 | */ |
| 49 | 45 | function wfThumbHandle404() { |
| 50 | 46 | # lighttpd puts the original request in REQUEST_URI, while |
| — | — | @@ -69,7 +65,6 @@ |
| 70 | 66 | * Stream a thumbnail specified by parameters |
| 71 | 67 | * |
| 72 | 68 | * @param $params Array |
| 73 | | - * @return void |
| 74 | 69 | */ |
| 75 | 70 | function wfStreamThumb( array $params ) { |
| 76 | 71 | wfProfileIn( __METHOD__ ); |
| — | — | @@ -266,7 +261,6 @@ |
| 267 | 262 | * |
| 268 | 263 | * @param $status integer |
| 269 | 264 | * @param $msg string |
| 270 | | - * @return void |
| 271 | 265 | */ |
| 272 | 266 | function wfThumbError( $status, $msg ) { |
| 273 | 267 | global $wgShowHostnames; |