Thiemo Kreuz (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/400576 )
Change subject: Use ExtensionRegistry instead of class_exists
......................................................................
Use ExtensionRegistry instead of class_exists
Bug: T183096
Change-Id: I524dcf3dd33d561728afee5ca3f4ae3349924df4
---
M includes/CirrusSearch.php
M includes/SiteMatrixInterwikiResolver.php
2 files changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch
refs/changes/76/400576/1
diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index b5c2725..a5a36ac 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -545,7 +545,7 @@
}
if ( $useCompletion === 'beta' ) {
- return class_exists( '\BetaFeatures' ) &&
+ return ExtensionRegistry::getInstance()->isLoaded(
'BetaFeatures' ) &&
\BetaFeatures::isFeatureEnabled(
$GLOBALS['wgUser'], 'cirrussearch-completionsuggester' );
}
diff --git a/includes/SiteMatrixInterwikiResolver.php
b/includes/SiteMatrixInterwikiResolver.php
index 0328b35..a6cbbf5 100644
--- a/includes/SiteMatrixInterwikiResolver.php
+++ b/includes/SiteMatrixInterwikiResolver.php
@@ -2,6 +2,7 @@
namespace CirrusSearch;
+use ExtensionRegistry;
use \ObjectCache;
use \SiteMatrix;
use MediaWiki\MediaWikiServices;
@@ -25,7 +26,7 @@
if ( $config->getWikiId() !== wfWikiID() ) {
throw new \RuntimeException( "This resolver cannot with
an external wiki config. (config: " . $config->getWikiId() . ", global: " .
wfWikiID() );
}
- if ( !class_exists( SiteMatrix::class ) ) {
+ if ( !ExtensionRegistry::getInstance()->isLoaded( 'SiteMatrix'
) ) {
throw new \RuntimeException( "SiteMatrix is required" );
}
if ( !$this->config->has( 'SiteMatrixSites' ) ) {
@@ -38,16 +39,9 @@
* @return bool true if this resolver can run with the specified config
*/
public static function accepts( SearchConfig $config ) {
- if ( $config->getWikiId() !== wfWikiID() ) {
- return false;
- }
- if ( !class_exists( SiteMatrix::class ) ) {
- return false;
- }
- if ( !$config->has( 'SiteMatrixSites' ) ) {
- return false;
- }
- return true;
+ return $config->getWikiId() === wfWikiID()
+ && ExtensionRegistry::getInstance()->isLoaded(
'SiteMatrix' )
+ && $config->has( 'SiteMatrixSites' );
}
protected function loadMatrix() {
--
To view, visit https://gerrit.wikimedia.org/r/400576
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I524dcf3dd33d561728afee5ca3f4ae3349924df4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) <thiemo.kr...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
