From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 22 May 2015 18:18:12 +0000 (-0700)
Subject: Cleaned up various revisiondelete IDE warnings
X-Git-Tag: 1.31.0-rc.0~11256
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=4161843d87160470cf485c9cd816fb8472a293dc;p=lhc%2Fweb%2Fwiklou.git

Cleaned up various revisiondelete IDE warnings

Change-Id: I4750eabf9985785520aaac8eca12d488ca746966
---

diff --git a/includes/revisiondelete/RevDelItem.php b/includes/revisiondelete/RevDelItem.php
index ebdbf3a8ac..dba368d849 100644
--- a/includes/revisiondelete/RevDelItem.php
+++ b/includes/revisiondelete/RevDelItem.php
@@ -36,6 +36,8 @@ abstract class RevDelItem extends RevisionItemBase {
 
 	/**
 	 * Get the current deletion bitfield value
+	 *
+	 * @return integer
 	 */
 	abstract public function getBits();
 
diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index 1ce96914f3..837557cb53 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -78,7 +78,7 @@ abstract class RevDelList extends RevisionListBase {
 	 * transactions are done here.
 	 *
 	 * @param array $params Associative array of parameters. Members are:
-	 *     value:         The integer value to set the visibility to
+	 *     value:         ExtractBitParams() bitfield array
 	 *     comment:       The log comment.
 	 *     perItemStatus: Set if you want per-item status reports
 	 * @return Status
@@ -109,6 +109,7 @@ abstract class RevDelList extends RevisionListBase {
 		// @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
 		for ( $this->reset(); $this->current(); $this->next() ) {
 			// @codingStandardsIgnoreEnd
+			/** @var $item RevDelItem */
 			$item = $this->current();
 			unset( $missing[$item->getId()] );
 
@@ -200,6 +201,7 @@ abstract class RevDelList extends RevisionListBase {
 		}
 
 		// Log it
+		// @FIXME: $newBits/$oldBits set in for loop, makes IDE warnings too
 		$this->updateLog( array(
 			'title' => $this->title,
 			'count' => $successCount,
diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php
index 5c831072fe..65b0309742 100644
--- a/includes/revisiondelete/RevDelLogItem.php
+++ b/includes/revisiondelete/RevDelLogItem.php
@@ -48,7 +48,7 @@ class RevDelLogItem extends RevDelItem {
 	}
 
 	public function getBits() {
-		return $this->row->log_deleted;
+		return (int)$this->row->log_deleted;
 	}
 
 	public function setBits( $bits ) {
diff --git a/includes/revisiondelete/RevisionDeleter.php b/includes/revisiondelete/RevisionDeleter.php
index ba1f0f69fd..db2bc6a4db 100644
--- a/includes/revisiondelete/RevisionDeleter.php
+++ b/includes/revisiondelete/RevisionDeleter.php
@@ -233,9 +233,9 @@ class RevisionDeleter {
 	 * @since 1.22
 	 * @param array $bitPars ExtractBitParams() params
 	 * @param int $oldfield Current bitfield
-	 * @return array
+	 * @return integer
 	 */
-	public static function extractBitfield( $bitPars, $oldfield ) {
+	public static function extractBitfield( array $bitPars, $oldfield ) {
 		// Build the actual new rev_deleted bitfield
 		$newBits = 0;
 		foreach ( $bitPars as $const => $val ) {
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 21867b5089..5bd3a29509 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -585,7 +585,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
 			throw new PermissionsError( 'suppressrevision' );
 		}
 		# If the save went through, go to success message...
-		$status = $this->save( $bitParams, $comment, $this->targetObj );
+		$status = $this->save( $bitParams, $comment );
 		if ( $status->isGood() ) {
 			$this->success();
 
@@ -651,14 +651,13 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
 
 	/**
 	 * Do the write operations. Simple wrapper for RevDel*List::setVisibility().
-	 * @param int $bitfield
+	 * @param array $bitPars ExtractBitParams() bitfield array
 	 * @param string $reason
-	 * @param Title $title
 	 * @return Status
 	 */
-	protected function save( $bitfield, $reason, $title ) {
+	protected function save( array $bitPars, $reason ) {
 		return $this->getList()->setVisibility(
-			array( 'value' => $bitfield, 'comment' => $reason )
+			array( 'value' => $bitPars, 'comment' => $reason )
 		);
 	}