From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 22 Aug 2018 04:25:48 +0000 (-0700)
Subject: rdbms: fix a few IDEA warnings in Database
X-Git-Tag: 1.34.0-rc.0~4338^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=8053bc9e0dc56d610305065cd1703dc2dfff3775;p=lhc%2Fweb%2Fwiklou.git

rdbms: fix a few IDEA warnings in Database

Change-Id: I1bdca5c643ff81eb822443b8e45f71f5f3fb2155
---

diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index e35e0827b0..cf8d06461b 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -266,7 +266,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	/** @var int[] Prior flags member variable values */
 	private $priorFlags = [];
 
-	/** @var object|string Class name or object With profileIn/profileOut methods */
+	/** @var mixed Class name or object With profileIn/profileOut methods */
 	protected $profiler;
 	/** @var TransactionProfiler */
 	protected $trxProfiler;
@@ -3496,7 +3496,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 					list( $phpCallback ) = $callback;
 					$phpCallback( $this );
 				} catch ( Exception $ex ) {
-					$this->errorLogger( $ex );
+					( $this->errorLogger )( $ex );
 					$e = $e ?: $ex;
 				}
 			}
@@ -4018,7 +4018,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 	 * a wrapper. Nowadays, raw database objects are never exposed to external
 	 * callers, so this is unnecessary in external code.
 	 *
-	 * @param bool|ResultWrapper|resource|object $result
+	 * @param bool|ResultWrapper|resource $result
 	 * @return bool|ResultWrapper
 	 */
 	protected function resultObject( $result ) {