@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | * |
168 | 168 | * @param IDatabase $dbw |
169 | 169 | * @param integer $pageId |
170 | - * @return ScopedCallback|null Returns null on failure |
|
170 | + * @return ScopedCallback Returns null on failure |
|
171 | 171 | * @throws RuntimeException |
172 | 172 | * @since 1.27 |
173 | 173 | */ |
@@ -935,7 +935,7 @@ discard block |
||
935 | 935 | |
936 | 936 | /** |
937 | 937 | * @since 1.28 |
938 | - * @return null|Revision |
|
938 | + * @return Revision |
|
939 | 939 | */ |
940 | 940 | public function getRevision() { |
941 | 941 | return $this->mRevision; |
@@ -381,7 +381,7 @@ discard block |
||
381 | 381 | * Get all styles for a given context. |
382 | 382 | * |
383 | 383 | * @param ResourceLoaderContext $context |
384 | - * @return array CSS code for $context as an associative array mapping media type to CSS text. |
|
384 | + * @return string CSS code for $context as an associative array mapping media type to CSS text. |
|
385 | 385 | */ |
386 | 386 | public function getStyles( ResourceLoaderContext $context ) { |
387 | 387 | $styles = $this->readStyleFiles( |
@@ -631,7 +631,7 @@ discard block |
||
631 | 631 | * @param array $list List of file paths in any combination of index/path |
632 | 632 | * or path/options pairs |
633 | 633 | * @param string $option Option name |
634 | - * @param mixed $default Default value if the option isn't set |
|
634 | + * @param string $default Default value if the option isn't set |
|
635 | 635 | * @return array List of file paths, collated by $option |
636 | 636 | */ |
637 | 637 | protected static function collateFilePathListByOption( array $list, $option, $default ) { |
@@ -1007,6 +1007,7 @@ discard block |
||
1007 | 1007 | * the BOM character is not valid in the middle of a string. |
1008 | 1008 | * We already assume UTF-8 everywhere, so this should be safe. |
1009 | 1009 | * |
1010 | + * @param string $input |
|
1010 | 1011 | * @return string input minus the intial BOM char |
1011 | 1012 | */ |
1012 | 1013 | protected function stripBom( $input ) { |
@@ -104,7 +104,7 @@ discard block |
||
104 | 104 | * @since 1.18 |
105 | 105 | * @param string $feature |
106 | 106 | * @param mixed $data |
107 | - * @return bool |
|
107 | + * @return boolean|null |
|
108 | 108 | */ |
109 | 109 | public function setFeatureData( $feature, $data ) { |
110 | 110 | $this->features[$feature] = $data; |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | |
302 | 302 | /** |
303 | 303 | * Find snippet highlight settings for all users |
304 | - * @return array Contextlines, contextchars |
|
304 | + * @return integer[] Contextlines, contextchars |
|
305 | 305 | */ |
306 | 306 | public static function userHighlightPrefs() { |
307 | 307 | $contextlines = 2; // Hardcode this. Old defaults sucked. :) |
@@ -507,6 +507,7 @@ discard block |
||
507 | 507 | * Process completion search results. |
508 | 508 | * Resolves the titles and rescores. |
509 | 509 | * @param SearchSuggestionSet $suggestions |
510 | + * @param string $search |
|
510 | 511 | * @return SearchSuggestionSet |
511 | 512 | */ |
512 | 513 | protected function processCompletionResults( $search, SearchSuggestionSet $suggestions ) { |
@@ -590,7 +591,7 @@ discard block |
||
590 | 591 | * settings, returning a list of index numbers. |
591 | 592 | * @deprecated since 1.27; use SearchEngineConfig::userNamespaces() |
592 | 593 | * @param user $user |
593 | - * @return array |
|
594 | + * @return integer[] |
|
594 | 595 | */ |
595 | 596 | public static function userNamespaces( $user ) { |
596 | 597 | return MediaWikiServices::getInstance()->getSearchEngineConfig()->userNamespaces( $user ); |
@@ -599,7 +600,7 @@ discard block |
||
599 | 600 | /** |
600 | 601 | * An array of namespaces indexes to be searched by default |
601 | 602 | * @deprecated since 1.27; use SearchEngineConfig::defaultNamespaces() |
602 | - * @return array |
|
603 | + * @return integer[] |
|
603 | 604 | */ |
604 | 605 | public static function defaultNamespaces() { |
605 | 606 | return MediaWikiServices::getInstance()->getSearchEngineConfig()->defaultNamespaces(); |
@@ -610,7 +611,7 @@ discard block |
||
610 | 611 | * and preferences |
611 | 612 | * @deprecated since 1.27; use SearchEngineConfig::namespacesAsText() |
612 | 613 | * @param array $namespaces |
613 | - * @return array |
|
614 | + * @return string[] |
|
614 | 615 | */ |
615 | 616 | public static function namespacesAsText( $namespaces ) { |
616 | 617 | return MediaWikiServices::getInstance()->getSearchEngineConfig()->namespacesAsText( $namespaces ); |
@@ -648,7 +649,7 @@ discard block |
||
648 | 649 | * - default: set to true if this profile is the default |
649 | 650 | * |
650 | 651 | * @since 1.28 |
651 | - * @param $profileType the type of profiles |
|
652 | + * @param string $profileType the type of profiles |
|
652 | 653 | * @return array|null the list of profiles or null if none available |
653 | 654 | */ |
654 | 655 | public function getProfiles( $profileType ) { |
@@ -163,6 +163,9 @@ |
||
163 | 163 | } ); |
164 | 164 | } |
165 | 165 | |
166 | + /** |
|
167 | + * @param string $table |
|
168 | + */ |
|
166 | 169 | private function batchDeleteByPK( $table, array $conds, array $pk, $bSize ) { |
167 | 170 | $dbw = $this->mDb; // convenience |
168 | 171 | $res = $dbw->select( $table, $pk, $conds, __METHOD__ ); |
@@ -77,7 +77,7 @@ |
||
77 | 77 | |
78 | 78 | /** |
79 | 79 | * Get the global SessionManager |
80 | - * @return SessionManagerInterface |
|
80 | + * @return User |
|
81 | 81 | * (really a SessionManager, but this is to make IDEs less confused) |
82 | 82 | */ |
83 | 83 | public static function singleton() { |