Merge 6b07b39 into 96baa2a

src/ApplicationFactory.php

@@ -353,6 +353,26 @@ public function getInMemoryPoolCache() {
 		return $this->callbackLoader->singleton( 'InMemoryPoolCache' );
 	}
 
+	/**
+	 * @since 2.5
+	 *
+	 * @return \LoadBalancer
+	 */
+	public function getLoadBalancer() {
+		return $this->callbackLoader->singleton( 'DBLoadBalancer' );
+	}
+
+	/**
+	 * @since 2.5
+	 *
+	 * @param \IDatabase $db
+	 * @return string
+	 */
+	public function getDefaultSearchEngineTypeForDB( \IDatabase $db ) {
+		return $this->callbackLoader->create( 'DefaultSearchEngineTypeForDB', $db );
+
+	}
+
 	/**
 	 * @since 2.4
 	 *

src/MediaWiki/Search/Search.php

@@ -4,7 +4,6 @@
 
 use Content;
 use DatabaseBase;
-use MediaWiki\MediaWikiServices;
 use RuntimeException;
 use SearchEngine;
 use SMW\ApplicationFactory;
@@ -49,10 +48,6 @@ public function setFallbackSearchEngine( SearchEngine $fallbackSearch = null ) {
 	 */
 	private function assertValidFallbackSearchEngineType( $type ) {
 
-		if ( $type === null ) {
-			return;
-		}
-
 		if ( !class_exists( $type ) ) {
 			throw new RuntimeException( "$type does not exist." );
 		}
@@ -62,23 +57,6 @@ private function assertValidFallbackSearchEngineType( $type ) {
 		}
 	}
 
-	/**
-	 * @param $db
-	 * @return string
-	 */
-	private function getDefaultSearchEngineTypeForDB( $db ) {
-
-		if ( method_exists( 'SearchEngineFactory', 'getSearchEngineClass' ) ) { // MW > 1.27
-
-			return \SearchEngineFactory::getSearchEngineClass( $db );
-
-		} else { // MW <= 1.27
-
-			return $db->getSearchEngine();
-
-		}
-	}
-
 	/**
 	 * @return SearchEngine
 	 */
@@ -88,14 +66,14 @@ public function getFallbackSearchEngine() {
 
 			$type = ApplicationFactory::getInstance()->getSettings()->get( 'smwgFallbackSearchType' );
 
-			$this->assertValidFallbackSearchEngineType( $type );
-
 			$dbr = $this->getDB();
 
 			if ( $type === null ) {
-				$type = $this->getDefaultSearchEngineTypeForDB( $dbr );
+				$type = ApplicationFactory::getInstance()->getDefaultSearchEngineTypeForDB( $dbr );
 			}
 
+			$this->assertValidFallbackSearchEngineType( $type );
+
 			$this->fallbackSearch = new $type( $dbr );
 		}
 
@@ -111,12 +89,14 @@ public function setDB( DatabaseBase $connection ) {
 	}
 
 	/**
-	 * @return DatabaseBase
+	 * @return \IDatabase
 	 */
 	public function getDB() {
 
 		if ( $this->database === null ) {
-			$this->database = wfGetDB( defined( 'DB_REPLICA' ) ? DB_REPLICA : DB_SLAVE );
+
+			$this->database = ApplicationFactory::getInstance()->getLoadBalancer()->getConnection( defined( 'DB_REPLICA' ) ? DB_REPLICA : DB_SLAVE );
+
 		}
 
 		return $this->database;

src/SharedCallbackContainer.php

@@ -2,6 +2,8 @@
 
 namespace SMW;
 
+use LBFactory;
+use MediaWiki\MediaWikiServices;
 use Onoi\BlobStore\BlobStore;
 use Onoi\CallbackContainer\CallbackContainer;
 use Onoi\CallbackContainer\CallbackLoader;
@@ -100,6 +102,27 @@ private function registerCallbackHandlers( $callbackLoader ) {
 			return new DeferredCallableUpdate( $callback );
 		} );
 
+		$callbackLoader->registerExpectedReturnType( 'DBLoadBalancer', '\LoadBalancer' );
+
+		$callbackLoader->registerCallback( 'DBLoadBalancer', function() {
+			if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( '\MediaWiki\MediaWikiServices', 'getDBLoadBalancer' ) ) { // > MW 1.27
+				return MediaWikiServices::getInstance()->getDBLoadBalancer();
+			}
+
+			return LBFactory::singleton()->getMainLB();
+		} );
+
+		$callbackLoader->registerCallback( 'DefaultSearchEngineTypeForDB', function( \IDatabase $db ) use ( $callbackLoader ) {
+
+			if ( class_exists( '\MediaWiki\MediaWikiServices' ) && method_exists( 'SearchEngineFactory', 'getSearchEngineClass' ) ) { // MW > 1.27
+
+				return MediaWikiServices::getInstance()->getSearchEngineFactory()->getSearchEngineClass( $db );
+
+			}
+
+			return $db->getSearchEngine();
+		} );
+
 		/**
 		 * @var InMemoryPoolCache
 		 */

tests/phpunit/Unit/MediaWiki/Search/SearchTest.php

@@ -55,15 +55,23 @@ public function testSetGetDBConnection() {
 
 	public function testGetDefaultFallbackSearchEngineForNullFallbackSearchType() {
 
-		// #1531
-		$searchEngine = class_exists( 'SearchDatabase' ) ? 'SearchDatabase' : 'SearchEngine';
+		$searchEngine = 'SearchDatabase';
+
+		if ( class_exists( 'SearchEngine' ) ) {
+
+			$reflection = new \ReflectionClass( 'SearchEngine' );
+
+			if ( $reflection->isInstantiable() ) {
+				$searchEngine = 'SearchEngine';
+			}
+		}
 
 		$databaseBase = $this->getMockBuilder( '\DatabaseBase' )
 			->disableOriginalConstructor()
 			->setMethods( array( 'getSearchEngine' ) )
 			->getMockForAbstractClass();
 
-		$databaseBase->expects( $this->once() )
+		$databaseBase->expects( $this->any() )
 			->method( 'getSearchEngine' )
 			->will( $this->returnValue( $searchEngine ) );
 
@@ -73,7 +81,7 @@ public function testGetDefaultFallbackSearchEngineForNullFallbackSearchType() {
 		$search->setDB( $databaseBase );
 
 		$this->assertInstanceOf(
-			$searchEngine,
+			'SearchEngine',
 			$search->getFallbackSearchEngine()
 		);
 	}