From e8eab2d3133a68317942797c5cdda9a6c35406d9 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 18 Oct 2016 11:05:39 -0700
Subject: [PATCH] Deprecate Database::getProperty()

Change-Id: If0399dded731b139ffbaab405eceeeafcdf9aed9
---
 includes/libs/rdbms/database/Database.php         | 5 +++++
 includes/libs/rdbms/database/IDatabase.php        | 8 --------
 includes/libs/rdbms/loadbalancer/LoadBalancer.php | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index a3544f194f..38f51d3f59 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -609,6 +609,11 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		return !!( $this->mFlags & $flag );
 	}
 
+	/**
+	 * @param string $name Class field name
+	 * @return mixed
+	 * @deprecated Since 1.28
+	 */
 	public function getProperty( $name ) {
 		return $this->$name;
 	}
diff --git a/includes/libs/rdbms/database/IDatabase.php b/includes/libs/rdbms/database/IDatabase.php
index 952a2d629a..c80fdec0db 100644
--- a/includes/libs/rdbms/database/IDatabase.php
+++ b/includes/libs/rdbms/database/IDatabase.php
@@ -322,14 +322,6 @@ interface IDatabase {
 	 */
 	public function getFlag( $flag );
 
-	/**
-	 * General read-only accessor
-	 *
-	 * @param string $name
-	 * @return string
-	 */
-	public function getProperty( $name );
-
 	/**
 	 * @return string
 	 */
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index b1c212ec32..894c0dcb4f 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -887,7 +887,7 @@ class LoadBalancer implements ILoadBalancer {
 			// If all servers were busy, mLastError will contain something sensible
 			throw new DBConnectionError( null, $this->mLastError );
 		} else {
-			$context['db_server'] = $conn->getProperty( 'mServer' );
+			$context['db_server'] = $conn->getServer();
 			$this->connLogger->warning(
 				"Connection error: {last_error} ({db_server})",
 				$context
-- 
2.20.1