From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 24 Oct 2018 11:05:41 +0000 (-0700)
Subject: rdbms: Use "mixed" type for $profiler field in LoadBalancer
X-Git-Tag: 1.34.0-rc.0~3654^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/supprimer.php?a=commitdiff_plain;h=5ad3a32361c372c0d92351928067532a9882f579;p=lhc%2Fweb%2Fwiklou.git

rdbms: Use "mixed" type for $profiler field in LoadBalancer

Change-Id: I8d110d0420a155bb62f4212933d9de2562dc7661
---

diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 1f3fe4cf54..0e8f0d3970 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -47,7 +47,7 @@ class LoadBalancer implements ILoadBalancer {
 	private $srvCache;
 	/** @var WANObjectCache */
 	private $wanCache;
-	/** @var object|string Class name or object With profileIn/profileOut methods */
+	/** @var mixed Class name or object With profileIn/profileOut methods */
 	private $profiler;
 	/** @var TransactionProfiler */
 	private $trxProfiler;