@@ -30,7 +30,7 @@ |
||
30 | 30 | /** |
31 | 31 | * Do a prefix search of user names and return a list of matching user names. |
32 | 32 | * |
33 | - * @param string|User $audience The string 'public' or a user object to show the search for |
|
33 | + * @param string $audience The string 'public' or a user object to show the search for |
|
34 | 34 | * @param string $search |
35 | 35 | * @param int $limit |
36 | 36 | * @param int $offset How many results to offset from the beginning |
@@ -146,7 +146,7 @@ |
||
146 | 146 | * |
147 | 147 | * @param string $database |
148 | 148 | * @param bool $ignoreInvalidDB If true, don't check if $database is in $wgLocalDatabases |
149 | - * @return IDatabase|null If invalid selection |
|
149 | + * @return DatabaseBase|null If invalid selection |
|
150 | 150 | */ |
151 | 151 | public static function getDB( $database, $ignoreInvalidDB = false ) { |
152 | 152 | global $wgDBname; |
@@ -171,10 +171,16 @@ |
||
171 | 171 | return is_object( $datum ) ? get_class( $datum ) : gettype( $datum ); |
172 | 172 | } |
173 | 173 | |
174 | + /** |
|
175 | + * @param string $expected |
|
176 | + */ |
|
174 | 177 | public static function wrongType( $expected, $datum ) { |
175 | 178 | return "Expected $expected, but recieved " . self::typeOf( $datum ); |
176 | 179 | } |
177 | 180 | |
181 | + /** |
|
182 | + * @param integer $datum |
|
183 | + */ |
|
178 | 184 | public static function outOfRange( $min, $max, $datum ) { |
179 | 185 | return "Expected value between $min and $max, but recieved $datum"; |
180 | 186 | } |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | /** |
100 | - * @param array $condition Query conditions suitable for use with |
|
100 | + * @param array $conditions Query conditions suitable for use with |
|
101 | 101 | * IDatabase::select |
102 | 102 | */ |
103 | 103 | public function addConditions( array $conditions ) { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | } |
106 | 106 | |
107 | 107 | /** |
108 | - * @param array $condition Query join conditions suitable for use |
|
108 | + * @param array $conditions Query join conditions suitable for use |
|
109 | 109 | * with IDatabase::select |
110 | 110 | */ |
111 | 111 | public function addJoinConditions( array $conditions ) { |
@@ -299,7 +299,7 @@ discard block |
||
299 | 299 | * |
300 | 300 | * @param string $host |
301 | 301 | * @param int $port |
302 | - * @param bool|int $defaultPort |
|
302 | + * @param integer $defaultPort |
|
303 | 303 | * @return string |
304 | 304 | */ |
305 | 305 | public static function combineHostAndPort( $host, $port, $defaultPort = false ) { |
@@ -402,7 +402,7 @@ discard block |
||
402 | 402 | * hexadecimal string which sorts after the IPv4 addresses. |
403 | 403 | * |
404 | 404 | * @param string $ip Quad dotted/octet IP address. |
405 | - * @return string|bool False on failure |
|
405 | + * @return string|false False on failure |
|
406 | 406 | */ |
407 | 407 | public static function toHex( $ip ) { |
408 | 408 | if ( self::isIPv6( $ip ) ) { |
@@ -435,7 +435,7 @@ discard block |
||
435 | 435 | * Given an IPv6 address in octet notation, returns a pure hex string. |
436 | 436 | * |
437 | 437 | * @param string $ip Octet ipv6 IP address. |
438 | - * @return string|bool Pure hex (uppercase); false on failure |
|
438 | + * @return false|string Pure hex (uppercase); false on failure |
|
439 | 439 | */ |
440 | 440 | private static function IPv6ToRawHex( $ip ) { |
441 | 441 | $ip = self::sanitizeIP( $ip ); |
@@ -216,6 +216,7 @@ discard block |
||
216 | 216 | |
217 | 217 | /** |
218 | 218 | * @see self::generate() |
219 | + * @param integer $bytes |
|
219 | 220 | */ |
220 | 221 | public function realGenerate( $bytes, $forceStrong = false ) { |
221 | 222 | |
@@ -351,6 +352,7 @@ discard block |
||
351 | 352 | |
352 | 353 | /** |
353 | 354 | * @see self::generateHex() |
355 | + * @param integer $chars |
|
354 | 356 | */ |
355 | 357 | public function realGenerateHex( $chars, $forceStrong = false ) { |
356 | 358 | // hex strings are 2x the length of raw binary so we divide the length in half |
@@ -510,8 +510,8 @@ discard block |
||
510 | 510 | * Wait till the current timestamp reaches $time and return the current |
511 | 511 | * timestamp. This returns false if it would have to wait more than 10ms. |
512 | 512 | * |
513 | - * @param array $time Result of UIDGenerator::millitime() |
|
514 | - * @return array|bool UIDGenerator::millitime() result or false |
|
513 | + * @param integer[] $time Result of UIDGenerator::millitime() |
|
514 | + * @return resource UIDGenerator::millitime() result or false |
|
515 | 515 | */ |
516 | 516 | protected function timeWaitUntil( array $time ) { |
517 | 517 | do { |
@@ -571,7 +571,7 @@ discard block |
||
571 | 571 | } |
572 | 572 | |
573 | 573 | /** |
574 | - * @return array (current time in seconds, milliseconds since then) |
|
574 | + * @return integer[] (current time in seconds, milliseconds since then) |
|
575 | 575 | */ |
576 | 576 | protected static function millitime() { |
577 | 577 | list( $msec, $sec ) = explode( ' ', microtime() ); |
@@ -184,7 +184,7 @@ |
||
184 | 184 | |
185 | 185 | /** |
186 | 186 | * Throw an error, and log a debug message |
187 | - * @param mixed $code |
|
187 | + * @param string $code |
|
188 | 188 | * @param string $debugMessage |
189 | 189 | * @throws ZipDirectoryReaderError |
190 | 190 | */ |
@@ -22,20 +22,6 @@ |
||
22 | 22 | |
23 | 23 | /** |
24 | 24 | * @param array $config Configuration options |
25 | - * @param array $config['namespace'] Configuration for the NamespaceInputWidget |
|
26 | - * dropdown with list of namespaces |
|
27 | - * @param string $config['namespace']['includeAllValue'] If specified, |
|
28 | - * add an "all namespaces" option to the dropdown, and use this as the input value for it |
|
29 | - * @param array|null $config['invert'] Configuration for the "invert selection" |
|
30 | - * CheckboxInputWidget. If null, the checkbox will not be generated. |
|
31 | - * @param array|null $config['associated'] Configuration for the "include associated namespace" |
|
32 | - * CheckboxInputWidget. If null, the checkbox will not be generated. |
|
33 | - * @param array $config['invertLabel'] Configuration for the FieldLayout with label |
|
34 | - * wrapping the "invert selection" checkbox |
|
35 | - * @param string $config['invertLabel']['label'] Label text for the label |
|
36 | - * @param array $config['associatedLabel'] Configuration for the FieldLayout with label |
|
37 | - * wrapping the "include associated namespace" checkbox |
|
38 | - * @param string $config['associatedLabel']['label'] Label text for the label |
|
39 | 25 | */ |
40 | 26 | public function __construct( array $config = array() ) { |
41 | 27 | // Configuration initialization |