Merge "SpecialProtectedpages: Remove options not used by HTMLForm"

[lhc/web/wiklou.git] / includes / revisiondelete / RevDelList.php

diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index 833e38b..011c7b0 100644 (file)
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -19,6 +19,8 @@
  * @ingroup RevisionDelete
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * Abstract base class for a list of deletable items. The list class
  * needs to be able to make a query from a set of identifiers to pull
@@ -81,7 +83,7 @@ abstract class RevDelList extends RevisionListBase {
        public function areAnySuppressed() {
                $bit = $this->getSuppressBit();
 
-               /** @var $item RevDelItem */
+               /** @var RevDelItem $item */
                foreach ( $this as $item ) {
                        if ( $item->getBits() & $bit ) {
                                return true;
@@ -149,7 +151,7 @@ abstract class RevDelList extends RevisionListBase {
                // passed to doPostCommitUpdates().
                $visibilityChangeMap = [];
 
-               /** @var $item RevDelItem */
+               /** @var RevDelItem $item */
                foreach ( $this as $item ) {
                        unset( $missing[$item->getId()] );
 
@@ -255,7 +257,8 @@ abstract class RevDelList extends RevisionListBase {
                $status->merge( $this->doPreCommitUpdates() );
                if ( !$status->isOK() ) {
                        // Fatal error, such as no configured archive directory or I/O failures
-                       wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
+                       $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+                       $lbFactory->rollbackMasterChanges( __METHOD__ );
                        return $status;
                }
 
@@ -291,7 +294,7 @@ abstract class RevDelList extends RevisionListBase {
 
        final protected function acquireItemLocks() {
                $status = Status::newGood();
-               /** @var $item RevDelItem */
+               /** @var RevDelItem $item */
                foreach ( $this as $item ) {
                        $status->merge( $item->lock() );
                }
@@ -301,7 +304,7 @@ abstract class RevDelList extends RevisionListBase {
 
        final protected function releaseItemLocks() {
                $status = Status::newGood();
-               /** @var $item RevDelItem */
+               /** @var RevDelItem $item */
                foreach ( $this as $item ) {
                        $status->merge( $item->unlock() );
                }
@@ -399,7 +402,7 @@ abstract class RevDelList extends RevisionListBase {
        /**
         * A hook for setVisibility(): do any necessary updates post-commit.
         * STUB
-        * @param array [id => ['oldBits' => $oldBits, 'newBits' => $newBits], ... ]
+        * @param array $visibilityChangeMap [id => ['oldBits' => $oldBits, 'newBits' => $newBits], ... ]
         * @return Status
         */
        public function doPostCommitUpdates( array $visibilityChangeMap ) {