From 6ac483dc9af7db17da5564b41c6663d4a647ce8b Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 6 Feb 2017 13:39:32 -0800 Subject: [PATCH] rdbms: Avoid declaration incompatibility IDEA warnings in safeWaitForMasterPos() Change-Id: Id30105889b45c7448d8b095f0340796e577bd76a --- includes/libs/rdbms/loadbalancer/ILoadBalancer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php index fc306b49b4..84649ad656 100644 --- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php +++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php @@ -370,7 +370,7 @@ interface ILoadBalancer { * * Use this only for mutli-database commits * - * @param integer $type IDatabase::TRIGGER_* constant + * @param int $type IDatabase::TRIGGER_* constant * @return Exception|null The first exception or null if there were none */ public function runMasterPostTrxCallbacks( $type ); @@ -532,10 +532,10 @@ interface ILoadBalancer { * * @param IDatabase $conn Replica DB * @param DBMasterPos|bool $pos Master position; default: current position - * @param integer|null $timeout Timeout in seconds [optional] + * @param int $timeout Timeout in seconds [optional] * @return bool Success */ - public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = null ); + public function safeWaitForMasterPos( IDatabase $conn, $pos = false, $timeout = 10 ); /** * Set a callback via IDatabase::setTransactionListener() on -- 2.20.1