From 56f14e2b5d1b1a6fb90dce10c41ab199678dbd62 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 5 Aug 2016 14:52:14 -0700
Subject: [PATCH] Fix inconsistent RevDelFileItem visibilities

Bug: T142228
Change-Id: Ib5a0a1adbea2daf2b035cf6be367841362de03cc
---
 includes/revisiondelete/RevDelArchivedFileItem.php | 6 ++----
 includes/revisiondelete/RevDelFileItem.php         | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php b/includes/revisiondelete/RevDelArchivedFileItem.php
index 39fb8ef6b0..52df2e3e73 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -23,10 +23,8 @@
  * Item class for a filearchive table row
  */
 class RevDelArchivedFileItem extends RevDelFileItem {
-	/** @var RevDelArchivedFileList */
-	protected $list;
-	/** @var ArchivedFile */
-	protected $file;
+	/** @var $list RevDelArchivedFileList */
+	/** @var $file ArchivedFile */
 	/** @var LocalFile */
 	protected $lockFile;
 
diff --git a/includes/revisiondelete/RevDelFileItem.php b/includes/revisiondelete/RevDelFileItem.php
index 3a3b46776a..ff01ceed5e 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -23,10 +23,10 @@
  * Item class for an oldimage table row
  */
 class RevDelFileItem extends RevDelItem {
-	/** @var OldLocalFile */
-	public $file;
 	/** @var RevDelFileList */
 	protected $list;
+	/** @var OldLocalFile */
+	protected $file;
 
 	public function __construct( $list, $row ) {
 		parent::__construct( $list, $row );
-- 
2.20.1