jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348147 )
Change subject: Cleanup phpdocs and add a type
......................................................................
Cleanup phpdocs and add a type
After the cleanups some phpdocs miss stuff or no longer match the code.
Also, added typing for function params to help IDE assist.
Change-Id: I09db8dcc00a1ec3c34c33d84f663053931c1af45
---
M includes/Hooks.php
M includes/SearchConfig.php
2 files changed, 4 insertions(+), 5 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
Objections:
Cindy-the-browser-test-bot: There's a problem with this change, please improve
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 99bdee7..a1e02ec 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -533,6 +533,8 @@
* @param string $term the original search term and all language
variants
* @param null|Title $titleResult resulting match. A Title if we found
something, unchanged otherwise.
* @return bool return false if we find something, true otherwise so
mediawiki can try its default behavior
+ * @throws ApiUsageException
+ * @throws UsageException
*/
public static function onSearchGetNearMatch( $term, &$titleResult ) {
global $wgContLang;
@@ -816,7 +818,7 @@
);
$container->defineService(
InterwikiResolver::SERVICE,
- function( $serviceContainer ) {
+ function( MediaWikiServices $serviceContainer ) {
$config = $serviceContainer->getConfigFactory()
->makeConfig( 'CirrusSearch' );
return $serviceContainer
diff --git a/includes/SearchConfig.php b/includes/SearchConfig.php
index e8ad504..d3c2dca 100644
--- a/includes/SearchConfig.php
+++ b/includes/SearchConfig.php
@@ -63,10 +63,6 @@
* see CirrusSearch::searchTextSecondTry().
*
* @param string|null $overrideName DB name for the wiki
- * @param bool $fullLoad set to true to fully load the target wiki
config
- * setting to false will only set the wikiId to $overrideName but will
- * keep the current wiki config. This should be removed and no longer
- * when all the wikis have the wiki field populated.
*/
public function __construct( $overrideName = null ) {
if ( $overrideName && $overrideName != wfWikiID() ) {
@@ -172,6 +168,7 @@
*
* @param string $docId Elasticsearch document id
* @return int Related mediawiki page id
+ * @throws \Exception
*/
public function makePageId( $docId ) {
if ( !$this->get( self::PREFIX_IDS ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/348147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I09db8dcc00a1ec3c34c33d84f663053931c1af45
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Smalyshev <[email protected]>
Gerrit-Reviewer: Cindy-the-browser-test-bot <[email protected]>
Gerrit-Reviewer: DCausse <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Gehel <[email protected]>
Gerrit-Reviewer: Tjones <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
