From: Derick Alangi Date: Wed, 16 Jan 2019 13:29:53 +0000 (+0100) Subject: dao: Add a type hint to getConnection() and some extra newlines X-Git-Tag: 1.34.0-rc.0~3055^2 X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=324f03ede5eedd428d0f81a9e4d75c37d2a0be5f;p=lhc%2Fweb%2Fwiklou.git dao: Add a type hint to getConnection() and some extra newlines Change-Id: I57a060394403a6b7335fda68edaeabc02888e14d --- diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php index b6ccb53dec..79c0385b03 100644 --- a/includes/dao/DBAccessBase.php +++ b/includes/dao/DBAccessBase.php @@ -59,7 +59,7 @@ abstract class DBAccessBase implements IDBAccessObject { * * @return IDatabase */ - protected function getConnection( $id, $groups = [] ) { + protected function getConnection( $id, array $groups = [] ) { $loadBalancer = $this->getLoadBalancer(); return $loadBalancer->getConnection( $id, $groups, $this->wiki ); diff --git a/includes/dao/IDBAccessObject.php b/includes/dao/IDBAccessObject.php index a555c5527c..9c0e5eb45f 100644 --- a/includes/dao/IDBAccessObject.php +++ b/includes/dao/IDBAccessObject.php @@ -56,10 +56,13 @@ interface IDBAccessObject { /** Constants for object loading bitfield flags (higher => higher QoS) */ /** @var int Read from a replica DB/non-quorum */ const READ_NORMAL = 0; + /** @var int Read from the master/quorum */ const READ_LATEST = 1; + /* @var int Read from the master/quorum and lock out other writers */ const READ_LOCKING = self::READ_LATEST | 2; // READ_LATEST (1) and "LOCK IN SHARE MODE" (2) + /** @var int Read from the master/quorum and lock out other writers and locking readers */ const READ_EXCLUSIVE = self::READ_LOCKING | 4; // READ_LOCKING (3) and "FOR UPDATE" (4)