rdbms: Document varargs for IDatabase::buildLike

This is needed in order for Phan not to consider calls to
IDatabase::buildLike as invalid. Interestingly, it does not
consider calls to Database::buildLike invalid.

Bug: T191668
Change-Id: I0e027f5ec66d20b1d11e3441086001f6a751e1f5

includes/libs/rdbms/database/DBConnRef.php

@@ -35,7 +35,7 @@ class DBConnRef implements IDatabase {
 	public function __construct( ILoadBalancer $lb, $conn, $role ) {
 		$this->lb = $lb;
 		$this->role = $role;
-		if ( $conn instanceof Database ) {
+		if ( $conn instanceof IDatabase && !( $conn instanceof DBConnRef ) ) {
 			$this->conn = $conn; // live handle
 		} elseif ( is_array( $conn ) && count( $conn ) >= 4 && $conn[self::FLD_DOMAIN] !== false ) {
 			$this->params = $conn;
@@ -461,7 +461,7 @@ public function addIdentifierQuotes( $s ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
-	public function buildLike() {
+	public function buildLike( $param ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 

includes/libs/rdbms/database/Database.php

@@ -2718,11 +2718,11 @@ protected function escapeLikeInternal( $s, $escapeChar = '`' ) {
 			$s );
 	}
 
-	public function buildLike() {
-		$params = func_get_args();
-
-		if ( count( $params ) > 0 && is_array( $params[0] ) ) {
-			$params = $params[0];
+	public function buildLike( $param, ...$params ) {
+		if ( is_array( $param ) ) {
+			$params = $param;
+		} else {
+			$params = func_get_args();
 		}
 
 		$s = '';

includes/libs/rdbms/database/IDatabase.php

@@ -1220,9 +1220,10 @@ public function addIdentifierQuotes( $s );
 	 *   $query .= $dbr->buildLike( $pattern );
 	 *
 	 * @since 1.16
+	 * @param array[]|string|LikeMatch $param
 	 * @return string Fully built LIKE statement
 	 */
-	public function buildLike();
+	public function buildLike( $param );
 
 	/**
 	 * Returns a token for buildLike() that denotes a '_' to be used in a LIKE query

tests/phpunit/includes/Revision/RevisionStoreTest.php

@@ -16,7 +16,7 @@
 use MWException;
 use Title;
 use WANObjectCache;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 use WikitextContent;
@@ -70,10 +70,10 @@ private function getMockLoadBalancer() {
 	}
 
 	/**
-	 * @return \PHPUnit_Framework_MockObject_MockObject|Database
+	 * @return \PHPUnit_Framework_MockObject_MockObject|IDatabase
 	 */
 	private function getMockDatabase() {
-		return $this->getMockBuilder( Database::class )
+		return $this->getMockBuilder( IDatabase::class )
 			->disableOriginalConstructor()->getMock();
 	}
 

tests/phpunit/includes/Storage/NameTableStoreTest.php

@@ -10,7 +10,7 @@
 use MediaWikiTestCase;
 use Psr\Log\NullLogger;
 use WANObjectCache;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 use Wikimedia\TestingAccessWrapper;
 
@@ -57,37 +57,25 @@ private function getMockLoadBalancer( $db ) {
 	}
 
 	private function getCallCheckingDb( $insertCalls, $selectCalls ) {
-		$mock = $this->getMockBuilder( Database::class )
+		$proxiedMethods = [
+			'select' => $selectCalls,
+			'insert' => $insertCalls,
+			'affectedRows' => null,
+			'insertId' => null,
+			'getSessionLagStatus' => null,
+			'writesPending' => null,
+			'onTransactionPreCommitOrIdle' => null
+		];
+		$mock = $this->getMockBuilder( IDatabase::class )
 			->disableOriginalConstructor()
 			->getMock();
-		$mock->expects( $this->exactly( $insertCalls ) )
-			->method( 'insert' )
-			->willReturnCallback( function ( ...$args ) {
-				return call_user_func_array( [ $this->db, 'insert' ], $args );
-			} );
-		$mock->expects( $this->exactly( $selectCalls ) )
-			->method( 'select' )
-			->willReturnCallback( function ( ...$args ) {
-				return call_user_func_array( [ $this->db, 'select' ], $args );
-			} );
-		$mock->expects( $this->exactly( $insertCalls ) )
-			->method( 'affectedRows' )
-			->willReturnCallback( function ( ...$args ) {
-				return call_user_func_array( [ $this->db, 'affectedRows' ], $args );
-			} );
-		$mock->expects( $this->any() )
-			->method( 'insertId' )
-			->willReturnCallback( function ( ...$args ) {
-				return call_user_func_array( [ $this->db, 'insertId' ], $args );
-			} );
-		$mock->expects( $this->any() )
-			->method( 'query' )
-			->willReturn( [] );
-		$mock->expects( $this->any() )
-			->method( 'isOpen' )
-			->willReturn( true );
-		$wrapper = TestingAccessWrapper::newFromObject( $mock );
-		$wrapper->queryLogger = new NullLogger();
+		foreach ( $proxiedMethods as $method => $count ) {
+			$mock->expects( is_int( $count ) ? $this->exactly( $count ) : $this->any() )
+				->method( $method )
+				->willReturnCallback( function ( ...$args ) use ( $method ) {
+					return call_user_func_array( [ $this->db, $method ], $args );
+				} );
+		}
 		return $mock;
 	}
 

tests/phpunit/includes/libs/rdbms/database/DBConnRefTest.php

@@ -1,9 +1,8 @@
 <?php
 
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\FakeResultWrapper;
-use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\ILoadBalancer;
 use Wikimedia\Rdbms\ResultWrapper;
 
@@ -40,7 +39,7 @@ function () use ( $lb ) {
 	 * @return IDatabase
 	 */
 	private function getDatabaseMock() {
-		$db = $this->getMockBuilder( Database::class )
+		$db = $this->getMockBuilder( IDatabase::class )
 			->disableOriginalConstructor()
 			->getMock();
 
@@ -60,12 +59,6 @@ private function getDatabaseMock() {
 		$db->method( 'isOpen' )->willReturnCallback( function () use ( &$open ) {
 			return $open;
 		} );
-		$db->method( 'open' )->willReturnCallback( function () use ( &$open ) {
-			$open = true;
-
-			return $open;
-		} );
-		$db->method( '__toString' )->willReturn( 'MOCK_DB' );
 
 		return $db;
 	}