@@ -369,8 +369,8 @@ discard block |
||
| 369 | 369 | /** |
| 370 | 370 | * SELECT wrapper |
| 371 | 371 | * |
| 372 | - * @param mixed $table Array or string, table name(s) (prefix auto-added) |
|
| 373 | - * @param mixed $vars Array or string, field name(s) to be retrieved |
|
| 372 | + * @param string $table Array or string, table name(s) (prefix auto-added) |
|
| 373 | + * @param string $vars Array or string, field name(s) to be retrieved |
|
| 374 | 374 | * @param mixed $conds Array or string, condition(s) for WHERE |
| 375 | 375 | * @param string $fname Calling function name (use __METHOD__) for logs/profiling |
| 376 | 376 | * @param array $options Associative array of options (e.g. |
@@ -378,7 +378,7 @@ discard block |
||
| 378 | 378 | * code for list of supported stuff |
| 379 | 379 | * @param array $join_conds Associative array of table join conditions |
| 380 | 380 | * (optional) (e.g. array( 'page' => array('LEFT JOIN','page_latest=rev_id') ) |
| 381 | - * @return mixed Database result resource (feed to Database::fetchObject |
|
| 381 | + * @return MssqlResultWrapper Database result resource (feed to Database::fetchObject |
|
| 382 | 382 | * or whatever), or false on failure |
| 383 | 383 | * @throws DBQueryError |
| 384 | 384 | * @throws DBUnexpectedError |
@@ -716,7 +716,7 @@ discard block |
||
| 716 | 716 | * @param string $fname |
| 717 | 717 | * @param array $insertOptions |
| 718 | 718 | * @param array $selectOptions |
| 719 | - * @return null|ResultWrapper |
|
| 719 | + * @return ResultWrapper |
|
| 720 | 720 | * @throws Exception |
| 721 | 721 | */ |
| 722 | 722 | public function insertSelect( $destTable, $srcTable, $varMap, $conds, $fname = __METHOD__, |
@@ -860,7 +860,7 @@ discard block |
||
| 860 | 860 | * |
| 861 | 861 | * @param string $sql SQL query we will append the limit too |
| 862 | 862 | * @param int $limit The SQL limit |
| 863 | - * @param bool|int $offset The SQL offset (default false) |
|
| 863 | + * @param string|false $offset The SQL offset (default false) |
|
| 864 | 864 | * @return array|string |
| 865 | 865 | * @throws DBUnexpectedError |
| 866 | 866 | */ |
@@ -1149,7 +1149,7 @@ discard block |
||
| 1149 | 1149 | /** |
| 1150 | 1150 | * @param array $options An associative array of options to be turned into |
| 1151 | 1151 | * an SQL query, valid keys are listed in the function. |
| 1152 | - * @return array |
|
| 1152 | + * @return string[] |
|
| 1153 | 1153 | */ |
| 1154 | 1154 | public function makeSelectOptions( $options ) { |
| 1155 | 1155 | $tailOpts = ''; |
@@ -168,6 +168,11 @@ discard block |
||
| 168 | 168 | } |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | + /** |
|
| 172 | + * @param string $keyword |
|
| 173 | + * @param string $msg_ok |
|
| 174 | + * @param string $msg_failed |
|
| 175 | + */ |
|
| 171 | 176 | protected function query( $keyword, $msg_ok, $msg_failed ) { |
| 172 | 177 | if ( $this->dbw->doQuery( $keyword . " " . $this->id ) !== false ) { |
| 173 | 178 | } else { |
@@ -259,6 +264,9 @@ discard block |
||
| 259 | 264 | return true; |
| 260 | 265 | } |
| 261 | 266 | |
| 267 | + /** |
|
| 268 | + * @param string $name |
|
| 269 | + */ |
|
| 262 | 270 | function hasConstraint( $name ) { |
| 263 | 271 | $sql = "SELECT 1 FROM pg_catalog.pg_constraint c, pg_catalog.pg_namespace n " . |
| 264 | 272 | "WHERE c.connamespace = n.oid AND conname = '" . |
@@ -550,7 +558,7 @@ discard block |
||
| 550 | 558 | * Return the result of the last call to nextSequenceValue(); |
| 551 | 559 | * This must be called after nextSequenceValue(). |
| 552 | 560 | * |
| 553 | - * @return int|null |
|
| 561 | + * @return integer |
|
| 554 | 562 | */ |
| 555 | 563 | function insertId() { |
| 556 | 564 | return $this->mInsertId; |
@@ -1310,6 +1318,10 @@ discard block |
||
| 1310 | 1318 | return $this->relationExists( $sequence, 'S', $schema ); |
| 1311 | 1319 | } |
| 1312 | 1320 | |
| 1321 | + /** |
|
| 1322 | + * @param string $table |
|
| 1323 | + * @param string $trigger |
|
| 1324 | + */ |
|
| 1313 | 1325 | function triggerExists( $table, $trigger ) { |
| 1314 | 1326 | $q = <<<SQL |
| 1315 | 1327 | SELECT 1 FROM pg_class, pg_namespace, pg_trigger |
@@ -1333,6 +1345,10 @@ discard block |
||
| 1333 | 1345 | return $rows; |
| 1334 | 1346 | } |
| 1335 | 1347 | |
| 1348 | + /** |
|
| 1349 | + * @param string $table |
|
| 1350 | + * @param string $rule |
|
| 1351 | + */ |
|
| 1336 | 1352 | function ruleExists( $table, $rule ) { |
| 1337 | 1353 | $exists = $this->selectField( 'pg_rules', 'rulename', |
| 1338 | 1354 | array( |
@@ -1475,7 +1491,7 @@ discard block |
||
| 1475 | 1491 | * |
| 1476 | 1492 | * @param array $options An associative array of options to be turned into |
| 1477 | 1493 | * an SQL query, valid keys are listed in the function. |
| 1478 | - * @return array |
|
| 1494 | + * @return string[] |
|
| 1479 | 1495 | */ |
| 1480 | 1496 | function makeSelectOptions( $options ) { |
| 1481 | 1497 | $preLimitTail = $postLimitTail = ''; |
@@ -551,7 +551,7 @@ discard block |
||
| 551 | 551 | * Filter the options used in SELECT statements |
| 552 | 552 | * |
| 553 | 553 | * @param array $options |
| 554 | - * @return array |
|
| 554 | + * @return string[] |
|
| 555 | 555 | */ |
| 556 | 556 | function makeSelectOptions( $options ) { |
| 557 | 557 | foreach ( $options as $k => $v ) { |
@@ -1048,6 +1048,9 @@ discard block |
||
| 1048 | 1048 | class SQLiteField implements Field { |
| 1049 | 1049 | private $info, $tableName; |
| 1050 | 1050 | |
| 1051 | + /** |
|
| 1052 | + * @param string $tableName |
|
| 1053 | + */ |
|
| 1051 | 1054 | function __construct( $info, $tableName ) { |
| 1052 | 1055 | $this->info = $info; |
| 1053 | 1056 | $this->tableName = $tableName; |
@@ -31,6 +31,9 @@ |
||
| 31 | 31 | /** @var string */ |
| 32 | 32 | protected $mData; |
| 33 | 33 | |
| 34 | + /** |
|
| 35 | + * @param string $data |
|
| 36 | + */ |
|
| 34 | 37 | function __construct( $data ) { |
| 35 | 38 | $this->mData = $data; |
| 36 | 39 | } |
@@ -30,6 +30,9 @@ |
||
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | + /** |
|
| 34 | + * @param string $name |
|
| 35 | + */ |
|
| 33 | 36 | function __call( $name, array $arguments ) { |
| 34 | 37 | if ( $this->conn === null ) { |
| 35 | 38 | list( $db, $groups, $wiki ) = $this->params; |
@@ -48,7 +48,7 @@ |
||
| 48 | 48 | /** |
| 49 | 49 | * Create an update object from an array of Title objects, or a TitleArray object |
| 50 | 50 | * |
| 51 | - * @param Traversable|array $titles |
|
| 51 | + * @param TitleArrayFromResult|null $titles |
|
| 52 | 52 | * @param string[] $urlArr |
| 53 | 53 | * @return CdnCacheUpdate |
| 54 | 54 | */ |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | * |
| 47 | 47 | * @param int $id Page id to update |
| 48 | 48 | * @param Title|string $title Title of page to update |
| 49 | - * @param Content|string|bool $c Content of the page to update. Default: false. |
|
| 49 | + * @param Content|null $c Content of the page to update. Default: false. |
|
| 50 | 50 | * If a Content object, text will be gotten from it. String is for back-compat. |
| 51 | 51 | * Passing false tells the backend to just update the title, not the content |
| 52 | 52 | */ |
@@ -38,6 +38,12 @@ |
||
| 38 | 38 | protected $images = 0; |
| 39 | 39 | |
| 40 | 40 | // @todo deprecate this constructor |
| 41 | + |
|
| 42 | + /** |
|
| 43 | + * @param integer $views |
|
| 44 | + * @param integer $edits |
|
| 45 | + * @param integer $good |
|
| 46 | + */ |
|
| 41 | 47 | function __construct( $views, $edits, $good, $pages = 0, $users = 0 ) { |
| 42 | 48 | $this->edits = $edits; |
| 43 | 49 | $this->articles = $good; |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | * Constructor |
| 105 | 105 | * @param IContextSource $context Context to use, anything else will be ignored |
| 106 | 106 | * @param int $old Old ID we want to show and diff with. |
| 107 | - * @param string|int $new Either revision ID or 'prev' or 'next'. Default: 0. |
|
| 107 | + * @param integer $new Either revision ID or 'prev' or 'next'. Default: 0. |
|
| 108 | 108 | * @param int $rcid Deprecated, no longer used! |
| 109 | 109 | * @param bool $refreshCache If set, refreshes the diff cache |
| 110 | 110 | * @param bool $unhide If set, allow viewing deleted revs |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | } |
| 161 | 161 | |
| 162 | 162 | /** |
| 163 | - * @return bool|int |
|
| 163 | + * @return integer |
|
| 164 | 164 | */ |
| 165 | 165 | public function getNewid() { |
| 166 | 166 | $this->loadRevisionIds(); |
@@ -174,7 +174,7 @@ discard block |
||
| 174 | 174 | * |
| 175 | 175 | * @param int $id Revision ID |
| 176 | 176 | * |
| 177 | - * @return mixed URL or false |
|
| 177 | + * @return string|false URL or false |
|
| 178 | 178 | */ |
| 179 | 179 | public function deletedLink( $id ) { |
| 180 | 180 | if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) { |
@@ -675,7 +675,7 @@ discard block |
||
| 675 | 675 | * @param string|bool $ntitle Header for new text or false |
| 676 | 676 | * @param string $notice HTML between diff header and body |
| 677 | 677 | * |
| 678 | - * @return mixed |
|
| 678 | + * @return false|string |
|
| 679 | 679 | */ |
| 680 | 680 | public function getDiff( $otitle, $ntitle, $notice = '' ) { |
| 681 | 681 | $body = $this->getDiffBody(); |
@@ -697,7 +697,7 @@ discard block |
||
| 697 | 697 | /** |
| 698 | 698 | * Get the diff table body, without header |
| 699 | 699 | * |
| 700 | - * @return mixed (string/false) |
|
| 700 | + * @return false|string (string/false) |
|
| 701 | 701 | */ |
| 702 | 702 | public function getDiffBody() { |
| 703 | 703 | $this->mCacheHit = true; |
@@ -931,7 +931,7 @@ discard block |
||
| 931 | 931 | * |
| 932 | 932 | * @param string $text |
| 933 | 933 | * |
| 934 | - * @return mixed |
|
| 934 | + * @return string |
|
| 935 | 935 | */ |
| 936 | 936 | public function localiseLineNumbers( $text ) { |
| 937 | 937 | return preg_replace_callback( |