@@ -1290,7 +1290,7 @@ discard block |
||
1290 | 1290 | * (lists are truncated to 10000 item with no way to page), and is just a performance risk. |
1291 | 1291 | * |
1292 | 1292 | * @param string $container Resolved Swift container |
1293 | - * @param array $readGrps List of the possible criteria for a request to have |
|
1293 | + * @param string[] $readGrps List of the possible criteria for a request to have |
|
1294 | 1294 | * access to read a container. Each item is one of the following formats: |
1295 | 1295 | * - account:user : Grants access if the request is by the given user |
1296 | 1296 | * - ".r:<regex>" : Grants access if the request is from a referrer host that |
@@ -1298,7 +1298,7 @@ discard block |
||
1298 | 1298 | * Setting this to '*' effectively makes a container public. |
1299 | 1299 | * -".rlistings:<regex>" : Grants access if the request is from a referrer host that |
1300 | 1300 | * matches the expression and the request is for a listing. |
1301 | - * @param array $writeGrps A list of the possible criteria for a request to have |
|
1301 | + * @param string[] $writeGrps A list of the possible criteria for a request to have |
|
1302 | 1302 | * access to write to a container. Each item is of the following format: |
1303 | 1303 | * - account:user : Grants access if the request is by the given user |
1304 | 1304 | * @return Status |
@@ -1681,7 +1681,7 @@ discard block |
||
1681 | 1681 | * @param array $creds From getAuthentication() |
1682 | 1682 | * @param string $container |
1683 | 1683 | * @param string $object |
1684 | - * @return array |
|
1684 | + * @return string |
|
1685 | 1685 | */ |
1686 | 1686 | protected function storageUrl( array $creds, $container = null, $object = null ) { |
1687 | 1687 | $parts = array( $creds['storage_url'] ); |
@@ -1880,7 +1880,7 @@ discard block |
||
1880 | 1880 | class SwiftFileBackendDirList extends SwiftFileBackendList { |
1881 | 1881 | /** |
1882 | 1882 | * @see Iterator::current() |
1883 | - * @return string|bool String (relative path) or false |
|
1883 | + * @return string String (relative path) or false |
|
1884 | 1884 | */ |
1885 | 1885 | public function current() { |
1886 | 1886 | return substr( current( $this->bufferIter ), $this->suffixStart, -1 ); |
@@ -1897,7 +1897,7 @@ discard block |
||
1897 | 1897 | class SwiftFileBackendFileList extends SwiftFileBackendList { |
1898 | 1898 | /** |
1899 | 1899 | * @see Iterator::current() |
1900 | - * @return string|bool String (relative path) or false |
|
1900 | + * @return string String (relative path) or false |
|
1901 | 1901 | */ |
1902 | 1902 | public function current() { |
1903 | 1903 | list( $path, $stat ) = current( $this->bufferIter ); |
@@ -215,7 +215,7 @@ discard block |
||
215 | 215 | |
216 | 216 | /** |
217 | 217 | * Fields in the filearchive table |
218 | - * @return array |
|
218 | + * @return string[] |
|
219 | 219 | */ |
220 | 220 | static function selectFields() { |
221 | 221 | return array( |
@@ -421,7 +421,7 @@ discard block |
||
421 | 421 | /** |
422 | 422 | * Returns the number of pages of a multipage document, or false for |
423 | 423 | * documents which aren't multipage documents |
424 | - * @return bool|int |
|
424 | + * @return string|boolean |
|
425 | 425 | */ |
426 | 426 | function pageCount() { |
427 | 427 | if ( !isset( $this->pageCount ) ) { |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | protected $repoClass = 'ForeignApiRepo'; |
34 | 34 | |
35 | 35 | /** |
36 | - * @param Title|string|bool $title |
|
36 | + * @param Title|null $title |
|
37 | 37 | * @param ForeignApiRepo $repo |
38 | 38 | * @param array $info |
39 | 39 | * @param bool $exists |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | |
152 | 152 | /** |
153 | 153 | * @param int $page |
154 | - * @return int|number |
|
154 | + * @return integer |
|
155 | 155 | */ |
156 | 156 | public function getWidth( $page = 1 ) { |
157 | 157 | return isset( $this->mInfo['width'] ) ? intval( $this->mInfo['width'] ) : 0; |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | |
168 | 168 | /** |
169 | - * @return bool|null|string |
|
169 | + * @return string|null |
|
170 | 170 | */ |
171 | 171 | public function getMetadata() { |
172 | 172 | if ( isset( $this->mInfo['metadata'] ) ) { |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | } |
206 | 206 | |
207 | 207 | /** |
208 | - * @return bool|int|null |
|
208 | + * @return integer|null |
|
209 | 209 | */ |
210 | 210 | public function getSize() { |
211 | 211 | return isset( $this->mInfo['size'] ) ? intval( $this->mInfo['size'] ) : null; |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | } |
269 | 269 | |
270 | 270 | /** |
271 | - * @return bool|string |
|
271 | + * @return string|false |
|
272 | 272 | */ |
273 | 273 | function getTimestamp() { |
274 | 274 | return wfTimestamp( TS_MW, |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | |
104 | 104 | /** |
105 | 105 | * Fields in the oldimage table |
106 | - * @return array |
|
106 | + * @return string[] |
|
107 | 107 | */ |
108 | 108 | static function selectFields() { |
109 | 109 | return array( |
@@ -232,7 +232,7 @@ discard block |
||
232 | 232 | |
233 | 233 | /** |
234 | 234 | * @param string $prefix |
235 | - * @return array |
|
235 | + * @return string[] |
|
236 | 236 | */ |
237 | 237 | function getCacheFields( $prefix = 'img_' ) { |
238 | 238 | $fields = parent::getCacheFields( $prefix ); |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | } |
179 | 179 | |
180 | 180 | /** |
181 | - * @return bool |
|
181 | + * @return boolean|string |
|
182 | 182 | */ |
183 | 183 | function getMetadata() { |
184 | 184 | if ( !isset( $this->metadata ) ) { |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | } |
194 | 194 | |
195 | 195 | /** |
196 | - * @return bool|string |
|
196 | + * @return string|false |
|
197 | 197 | */ |
198 | 198 | function getURL() { |
199 | 199 | if ( $this->repo ) { |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | } |
212 | 212 | |
213 | 213 | /** |
214 | - * @param array $data |
|
214 | + * @param string $data |
|
215 | 215 | * @return bool|array |
216 | 216 | */ |
217 | 217 | function getImageInfo( $data ) { |
@@ -546,7 +546,7 @@ discard block |
||
546 | 546 | * @param string $target Used in cache key creation, mostly |
547 | 547 | * @param array $query The query parameters for the API request |
548 | 548 | * @param int $cacheTTL Time to live for the memcached caching |
549 | - * @return null |
|
549 | + * @return string |
|
550 | 550 | */ |
551 | 551 | public function httpGetCached( $target, $query, $cacheTTL = 3600 ) { |
552 | 552 | if ( $this->mApiBase ) { |
@@ -84,7 +84,7 @@ |
||
84 | 84 | * Get a key on the primary cache for this repository. |
85 | 85 | * Returns false if the repository's cache is not accessible at this site. |
86 | 86 | * The parameters are the parts of the key, as for wfMemcKey(). |
87 | - * @return bool|string |
|
87 | + * @return string|false |
|
88 | 88 | */ |
89 | 89 | function getSharedCacheKey( /*...*/ ) { |
90 | 90 | if ( $this->hasSharedCache() ) { |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | * Search repositories for an image. |
106 | 106 | * You can also use wfFindFile() to do this. |
107 | 107 | * |
108 | - * @param Title|string $title Title object or string |
|
108 | + * @param string $title Title object or string |
|
109 | 109 | * @param array $options Associative array of options: |
110 | 110 | * time: requested time for an archived image, or false for the |
111 | 111 | * current version. An image object will be returned which was |
@@ -315,7 +315,7 @@ discard block |
||
315 | 315 | /** |
316 | 316 | * Get the repo instance with a given key. |
317 | 317 | * @param string|int $index |
318 | - * @return bool|LocalRepo |
|
318 | + * @return string |
|
319 | 319 | */ |
320 | 320 | function getRepo( $index ) { |
321 | 321 | if ( !$this->reposInitialised ) { |
@@ -52,6 +52,9 @@ |
||
52 | 52 | */ |
53 | 53 | const RESTART_ON_ERROR = 1; |
54 | 54 | |
55 | + /** |
|
56 | + * @param integer $numProcs |
|
57 | + */ |
|
55 | 58 | public function __construct( $numProcs, $flags = 0 ) { |
56 | 59 | if ( PHP_SAPI != 'cli' ) { |
57 | 60 | throw new MWException( "ForkController cannot be used from the web." ); |