rdbms: Remove IDatabase::numFields() method

Soft-deprecated since 1.37.

Unused https://codesearch.wmcloud.org/search/?q=numFields&i=nope&files=&excludeFiles=&repos=

Bug: T286694
Bug: T296960
Change-Id: I722602c8b11dcfc5cab70593876a4fb336e9684a

7 files changed, 1 insertions, 42 deletions

diff --git a/RELEASE-NOTES-1.38 b/RELEASE-NOTES-1.38
index b35d5af56efc..f8d71cc25e07 100644
--- a/RELEASE-NOTES-1.38
+++ b/RELEASE-NOTES-1.38
@@ -274,6 +274,7 @@ because of Phabricator reports.
   - ::getTopologyRootMaster() since 1.37
   - ::masterPosWait() since 1.37
   - ::dataSeek() soft-deprecated since 1.37
+  - ::numFields() soft-deprecated since 1.37
   - ::onTransactionIdle() soft-deprecated since 1.32
   - ::getMasterPos() since 1.37
 * …
diff --git a/includes/libs/rdbms/database/DBConnRef.php b/includes/libs/rdbms/database/DBConnRef.php
index 840d7f888880..105ed953b7a7 100644
--- a/includes/libs/rdbms/database/DBConnRef.php
+++ b/includes/libs/rdbms/database/DBConnRef.php
@@ -231,10 +231,6 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
-	public function numFields( $res ) {
-		return $this->__call( __FUNCTION__, func_get_args() );
-	}
-
 	public function fieldName( $res, $n ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 07c8114cae65..2e5a875fecff 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -872,10 +872,6 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 	}
 
-	public function numFields( IResultWrapper $res ) {
-		return count( $res->getFieldNames() );
-	}
-
 	public function fieldName( IResultWrapper $res, $n ) {
 		return $res->getFieldNames()[$n];
 	}
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 2c3e8580a7d6..3ec43598064c 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -426,17 +426,6 @@ interface IDatabase {
 	public function numRows( $res );
 
 	/**
-	 * Get the number of fields in a result object
-	 * @see https://www.php.net/mysql_num_fields
-	 *
-	 * @deprecated since 1.37
-	 *
-	 * @param IResultWrapper $res A SQL result
-	 * @return int
-	 */
-	public function numFields( IResultWrapper $res );
-
-	/**
 	 * Get a field name in a result object
 	 * @see https://www.php.net/mysql_field_name
 	 *
diff --git a/tests/phpunit/includes/db/DatabaseTestHelper.php b/tests/phpunit/includes/db/DatabaseTestHelper.php
index bdbcfa5fae55..010c58bfe1a2 100644
--- a/tests/phpunit/includes/db/DatabaseTestHelper.php
+++ b/tests/phpunit/includes/db/DatabaseTestHelper.php
@@ -195,10 +195,6 @@ class DatabaseTestHelper extends Database {
 		return -1;
 	}
 
-	public function numFields( $res ) {
-		return -1;
-	}
-
 	public function fieldName( $res, $n ) {
 		return 'test';
 	}
diff --git a/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php b/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
index 02d00163c321..cbc25c52aa75 100644
--- a/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/integration/includes/db/DatabaseSqliteTest.php
@@ -532,24 +532,6 @@ class DatabaseSqliteTest extends \MediaWikiIntegrationTestCase {
 	}
 
 	/**
-	 * @covers DatabaseSqlite::numFields
-	 */
-	public function testNumFields() {
-		$db = DatabaseSqlite::newStandaloneInstance( ':memory:' );
-
-		$databaseCreation = $db->query( 'CREATE TABLE a ( a_1 )', __METHOD__ );
-		$this->assertInstanceOf( ResultWrapper::class, $databaseCreation, "Failed to create table a" );
-		$res = $db->select( 'a', '*' );
-		$this->assertSame( 0, $db->numFields( $res ), "expects to get 0 fields for an empty table" );
-		$insertion = $db->insert( 'a', [ 'a_1' => 10 ], __METHOD__ );
-		$this->assertTrue( $insertion, "Insertion failed" );
-		$res = $db->select( 'a', '*' );
-		$this->assertSame( 1, $db->numFields( $res ), "wrong number of fields" );
-
-		$this->assertTrue( $db->close(), "closing database" );
-	}
-
-	/**
 	 * @covers \Wikimedia\Rdbms\DatabaseSqlite::__toString
 	 */
 	public function testToString() {
diff --git a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
index 56fe12a7df96..1d47319c81d5 100644
--- a/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
+++ b/tests/phpunit/unit/includes/libs/rdbms/database/DatabaseTest.php
@@ -456,7 +456,6 @@ class DatabaseTest extends PHPUnit\Framework\TestCase {
 			'insertId',
 			'lastError',
 			'lastErrno',
-			'numFields',
 			'numRows',
 			'open',
 			'strencode',