From 2e8ec52154ad33680f92c3bf49d3b35ed5a33153 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <siebrand@kitano.nl>
Date: Sat, 10 May 2014 10:21:22 +0200
Subject: [PATCH] Pass phpcs-strict on includes/revisiondelete/

Change-Id: I0622c0156925c938b10cc1eccb4b26988452f57d
---
 includes/revisiondelete/RevisionDelete.php    | 39 ++++++++++++-------
 .../RevisionDeleteAbstracts.php               |  2 +
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index fbfe325a7f..7e0e45d9f7 100644
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -31,7 +31,8 @@
  * See RevDelRevisionItem and RevDelArchivedRevisionItem for items.
  */
 class RevDelRevisionList extends RevDelList {
-	var $currentRevId;
+	/** @var int */
+	protected $currentRevId;
 
 	public function getType() {
 		return 'revision';
@@ -147,7 +148,7 @@ class RevDelRevisionList extends RevDelList {
  * Item class for a live revision table row
  */
 class RevDelRevisionItem extends RevDelItem {
-	var $revision;
+	protected $revision;
 
 	public function __construct( $list, $row ) {
 		parent::__construct( $list, $row );
@@ -470,6 +471,15 @@ class RevDelArchivedRevisionItem extends RevDelArchiveItem {
  * List for oldimage table items
  */
 class RevDelFileList extends RevDelList {
+	/** @var array */
+	protected $storeBatch;
+
+	/** @var array */
+	protected $deleteBatch;
+
+	/** @var array */
+	protected $cleanupBatch;
+
 	public function getType() {
 		return 'oldimage';
 	}
@@ -486,8 +496,6 @@ class RevDelFileList extends RevDelList {
 		return File::DELETED_FILE;
 	}
 
-	var $storeBatch, $deleteBatch, $cleanupBatch;
-
 	/**
 	 * @param DatabaseBase $db
 	 * @return mixed
@@ -569,11 +577,8 @@ class RevDelFileList extends RevDelList {
  * Item class for an oldimage table row
  */
 class RevDelFileItem extends RevDelItem {
-
-	/**
-	 * @var File
-	 */
-	var $file;
+	/** @var File */
+	protected $file;
 
 	public function __construct( $list, $row ) {
 		parent::__construct( $list, $row );
@@ -1037,7 +1042,9 @@ class RevDelLogItem extends RevDelItem {
 		// User links and action text
 		$action = $formatter->getActionText();
 		// Comment
-		$comment = $this->list->getLanguage()->getDirMark() . Linker::commentBlock( $this->row->log_comment );
+		$comment = $this->list->getLanguage()->getDirMark()
+			. Linker::commentBlock( $this->row->log_comment );
+
 		if ( LogEventsList::isDeleted( $this->row, LogPage::DELETED_COMMENT ) ) {
 			$comment = '<span class="history-deleted">' . $comment . '</span>';
 		}
@@ -1053,9 +1060,15 @@ class RevDelLogItem extends RevDelItem {
 			'type' => $logEntry->getType(),
 			'action' => $logEntry->getSubtype(),
 		);
-		$ret += $logEntry->isDeleted( LogPage::DELETED_USER ) ? array( 'userhidden' => '' ) : array();
-		$ret += $logEntry->isDeleted( LogPage::DELETED_COMMENT ) ? array( 'commenthidden' => '' ) : array();
-		$ret += $logEntry->isDeleted( LogPage::DELETED_ACTION ) ? array( 'actionhidden' => '' ) : array();
+		$ret += $logEntry->isDeleted( LogPage::DELETED_USER )
+			? array( 'userhidden' => '' )
+			: array();
+		$ret += $logEntry->isDeleted( LogPage::DELETED_COMMENT )
+			? array( 'commenthidden' => '' )
+			: array();
+		$ret += $logEntry->isDeleted( LogPage::DELETED_ACTION )
+			? array( 'actionhidden' => '' )
+			: array();
 
 		if ( LogEventsList::userCan( $this->row, LogPage::DELETED_ACTION, $user ) ) {
 			ApiQueryLogEvents::addLogParams(
diff --git a/includes/revisiondelete/RevisionDeleteAbstracts.php b/includes/revisiondelete/RevisionDeleteAbstracts.php
index 4dc93883b3..086db3a721 100644
--- a/includes/revisiondelete/RevisionDeleteAbstracts.php
+++ b/includes/revisiondelete/RevisionDeleteAbstracts.php
@@ -105,7 +105,9 @@ abstract class RevDelList extends RevisionListBase {
 			$status->itemStatuses = array();
 		}
 
+		// @codingStandardsIgnoreStart Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed
 		for ( $this->reset(); $this->current(); $this->next() ) {
+			// @codingStandardsIgnoreEnd
 			$item = $this->current();
 			unset( $missing[$item->getId()] );
 
-- 
2.20.1