@@ -578,7 +578,7 @@ discard block |
||
578 | 578 | * fake password in which case leave it as it is. |
579 | 579 | * |
580 | 580 | * @param string $name |
581 | - * @param mixed $value |
|
581 | + * @param string $value |
|
582 | 582 | */ |
583 | 583 | public function setPassword( $name, $value ) { |
584 | 584 | if ( !preg_match( '/^\*+$/', $value ) ) { |
@@ -1266,7 +1266,7 @@ discard block |
||
1266 | 1266 | * |
1267 | 1267 | * If $versionInfo is not false, only executables with a version |
1268 | 1268 | * matching $versionInfo[1] will be returned. |
1269 | - * @return bool|string |
|
1269 | + * @return string|false |
|
1270 | 1270 | */ |
1271 | 1271 | public static function locateExecutable( $path, $names, $versionInfo = false ) { |
1272 | 1272 | if ( !is_array( $names ) ) { |
@@ -1298,14 +1298,14 @@ discard block |
||
1298 | 1298 | /** |
1299 | 1299 | * Same as locateExecutable(), but checks in getPossibleBinPaths() by default |
1300 | 1300 | * @see locateExecutable() |
1301 | - * @param array $names Array of possible names. |
|
1302 | - * @param array|bool $versionInfo Default: false or array with two members: |
|
1301 | + * @param string[] $names Array of possible names. |
|
1302 | + * @param string[] $versionInfo Default: false or array with two members: |
|
1303 | 1303 | * 0 => Command to run for version check, with $1 for the full executable name |
1304 | 1304 | * 1 => String to compare the output with |
1305 | 1305 | * |
1306 | 1306 | * If $versionInfo is not false, only executables with a version |
1307 | 1307 | * matching $versionInfo[1] will be returned. |
1308 | - * @return bool|string |
|
1308 | + * @return string|false |
|
1309 | 1309 | */ |
1310 | 1310 | public static function locateExecutableInDefaultPaths( $names, $versionInfo = false ) { |
1311 | 1311 | foreach ( self::getPossibleBinPaths() as $path ) { |
@@ -1324,7 +1324,7 @@ discard block |
||
1324 | 1324 | * Used only by environment checks. |
1325 | 1325 | * @param string $dir |
1326 | 1326 | * @param string $url |
1327 | - * @return bool|int|string |
|
1327 | + * @return string|false |
|
1328 | 1328 | */ |
1329 | 1329 | public function dirIsExecutable( $dir, $url ) { |
1330 | 1330 | $scriptTypes = array( |
@@ -289,7 +289,7 @@ |
||
289 | 289 | * @param string $table Table name |
290 | 290 | * @param string $field Field name to check |
291 | 291 | * @param string $patchFile Path to the patch to correct the field |
292 | - * @return bool |
|
292 | + * @return boolean|null |
|
293 | 293 | */ |
294 | 294 | protected function checkBin( $table, $field, $patchFile ) { |
295 | 295 | if ( !$this->doTable( $table ) ) { |
@@ -546,6 +546,9 @@ discard block |
||
546 | 546 | return $colnames; |
547 | 547 | } |
548 | 548 | |
549 | + /** |
|
550 | + * @param string $fkey |
|
551 | + */ |
|
549 | 552 | function fkeyDeltype( $fkey ) { |
550 | 553 | $q = <<<END |
551 | 554 | SELECT confdeltype FROM pg_constraint, pg_namespace |
@@ -726,6 +729,9 @@ discard block |
||
726 | 729 | } |
727 | 730 | } |
728 | 731 | |
732 | + /** |
|
733 | + * @param string $default |
|
734 | + */ |
|
729 | 735 | protected function setDefault( $table, $field, $default ) { |
730 | 736 | |
731 | 737 | $info = $this->db->fieldInfo( $table, $field ); |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | /** |
389 | 389 | * Show an error message in a box. Parameters are like wfMessage(), or |
390 | 390 | * alternatively, pass a Message object in. |
391 | - * @param string|Message $msg |
|
391 | + * @param string $msg |
|
392 | 392 | */ |
393 | 393 | public function showError( $msg /*...*/ ) { |
394 | 394 | if ( !( $msg instanceof Message ) ) { |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | * Set a session variable. |
487 | 487 | * |
488 | 488 | * @param string $name Key for the variable |
489 | - * @param mixed $value |
|
489 | + * @param boolean $value |
|
490 | 490 | */ |
491 | 491 | public function setSession( $name, $value ) { |
492 | 492 | $this->session[$name] = $value; |
@@ -98,7 +98,7 @@ discard block |
||
98 | 98 | /** |
99 | 99 | * Get a connection to the server that handles all sub-queues for this queue |
100 | 100 | * |
101 | - * @return RedisConnRef|bool Returns false on failure |
|
101 | + * @return boolean Returns false on failure |
|
102 | 102 | * @throws MWException |
103 | 103 | */ |
104 | 104 | protected function getConnection() { |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | |
123 | 123 | /** |
124 | 124 | * @param string $name |
125 | - * @return string |
|
125 | + * @return string[] |
|
126 | 126 | */ |
127 | 127 | private function decodeQueueName( $name ) { |
128 | 128 | list( $type, $wiki ) = explode( '/', $name, 2 ); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
133 | - * @return int|null UNIX timestamp to delay running this job until, otherwise null |
|
133 | + * @return string|null UNIX timestamp to delay running this job until, otherwise null |
|
134 | 134 | * @since 1.22 |
135 | 135 | */ |
136 | 136 | public function getReleaseTimestamp() { |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | } |
141 | 141 | |
142 | 142 | /** |
143 | - * @return int|null UNIX timestamp of when the job was queued, or null |
|
143 | + * @return string|null UNIX timestamp of when the job was queued, or null |
|
144 | 144 | * @since 1.26 |
145 | 145 | */ |
146 | 146 | public function getQueuedTimestamp() { |
@@ -150,7 +150,7 @@ discard block |
||
150 | 150 | } |
151 | 151 | |
152 | 152 | /** |
153 | - * @return int|null UNIX timestamp of when the job was runnable, or null |
|
153 | + * @return string|null UNIX timestamp of when the job was runnable, or null |
|
154 | 154 | * @since 1.26 |
155 | 155 | */ |
156 | 156 | public function getReadyTimestamp() { |
@@ -179,7 +179,7 @@ |
||
179 | 179 | * This pops a job off a queue as specified by $wgJobTypeConf and |
180 | 180 | * updates the aggregate job queue information cache as needed. |
181 | 181 | * |
182 | - * @param int|string $qtype JobQueueGroup::TYPE_* constant or job type string |
|
182 | + * @param integer $qtype JobQueueGroup::TYPE_* constant or job type string |
|
183 | 183 | * @param int $flags Bitfield of JobQueueGroup::USE_* constants |
184 | 184 | * @param array $blacklist List of job types to ignore |
185 | 185 | * @return Job|bool Returns false on failure |
@@ -378,7 +378,7 @@ discard block |
||
378 | 378 | /** |
379 | 379 | * @see JobQueue::doAck() |
380 | 380 | * @param Job $job |
381 | - * @return Job|bool |
|
381 | + * @return boolean |
|
382 | 382 | * @throws UnexpectedValueException |
383 | 383 | * @throws JobQueueError |
384 | 384 | */ |
@@ -480,7 +480,7 @@ discard block |
||
480 | 480 | |
481 | 481 | /** |
482 | 482 | * @see JobQueue::doDelete() |
483 | - * @return bool |
|
483 | + * @return boolean|null |
|
484 | 484 | * @throws JobQueueError |
485 | 485 | */ |
486 | 486 | protected function doDelete() { |
@@ -693,7 +693,7 @@ discard block |
||
693 | 693 | |
694 | 694 | /** |
695 | 695 | * @param array $fields |
696 | - * @return Job|bool |
|
696 | + * @return Job |
|
697 | 697 | */ |
698 | 698 | protected function getJobFromFields( array $fields ) { |
699 | 699 | $title = Title::makeTitle( $fields['namespace'], $fields['title'] ); |
@@ -77,6 +77,10 @@ |
||
77 | 77 | } |
78 | 78 | } |
79 | 79 | |
80 | + /** |
|
81 | + * @param File $file |
|
82 | + * @param string $thumbUrl |
|
83 | + */ |
|
80 | 84 | protected function hitThumbUrl( $file, $transformParams, &$thumbUrl ) { |
81 | 85 | global $wgUploadThumbnailRenderHttpCustomHost, $wgUploadThumbnailRenderHttpCustomDomain; |
82 | 86 |