Merge "Use {{int:}} on MediaWiki:Blockedtext and MediaWiki:Autoblockedtext"

[lhc/web/wiklou.git] / includes / libs / rdbms / lbfactory / ILBFactory.php

diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php
index 32d9008..45e7cbb 100644 (file)
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -55,6 +55,7 @@ interface ILBFactory {
         *  - queryLogger: PSR-3 logger instance. [optional]
         *  - perfLogger: PSR-3 logger instance. [optional]
         *  - errorLogger: Callback that takes an Exception and logs it. [optional]
+        *  - deprecationLogger: Callback to log a deprecation warning. [optional]
         * @throws InvalidArgumentException
         */
        public function __construct( array $conf );
@@ -194,12 +195,22 @@ interface ILBFactory {
        public function rollbackMasterChanges( $fname = __METHOD__ );
 
        /**
-        * Check if a transaction round is active
+        * Check if an explicit transaction round is active
         * @return bool
         * @since 1.29
         */
        public function hasTransactionRound();
 
+       /**
+        * Check if transaction rounds can be started, committed, or rolled back right now
+        *
+        * This can be used as a recusion guard to avoid exceptions in transaction callbacks
+        *
+        * @return bool
+        * @since 1.32
+        */
+       public function isReadyForRoundOperations();
+
        /**
         * Determine if any master connection has pending changes
         * @return bool