Revert "Pass phpcs-strict on includes/revisiondelete/"

Causes fatal when using revdeleting an old image

This reverts commit 2e8ec52154ad33680f92c3bf49d3b35ed5a33153.

Bug: 65733
Change-Id: I948cbf0f9a60929020d8cd92f4264bee7a11104e

diff --git a/includes/revisiondelete/RevisionDelete.php b/includes/revisiondelete/RevisionDelete.php
index 7e0e45d..fbfe325 100644 (file)
--- a/includes/revisiondelete/RevisionDelete.php
+++ b/includes/revisiondelete/RevisionDelete.php
@@ -31,8 +31,7 @@
  * See RevDelRevisionItem and RevDelArchivedRevisionItem for items.
  */
 class RevDelRevisionList extends RevDelList {
-       /** @var int */
-       protected $currentRevId;
+       var $currentRevId;
 
        public function getType() {
                return 'revision';
@@ -148,7 +147,7 @@ class RevDelRevisionList extends RevDelList {
  * Item class for a live revision table row
  */
 class RevDelRevisionItem extends RevDelItem {
-       protected $revision;
+       var $revision;
 
        public function __construct( $list, $row ) {
                parent::__construct( $list, $row );
@@ -471,15 +470,6 @@ 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';
        }
@@ -496,6 +486,8 @@ class RevDelFileList extends RevDelList {
                return File::DELETED_FILE;
        }
 
+       var $storeBatch, $deleteBatch, $cleanupBatch;
+
        /**
         * @param DatabaseBase $db
         * @return mixed
@@ -577,8 +569,11 @@ class RevDelFileList extends RevDelList {
  * Item class for an oldimage table row
  */
 class RevDelFileItem extends RevDelItem {
-       /** @var File */
-       protected $file;
+
+       /**
+        * @var File
+        */
+       var $file;
 
        public function __construct( $list, $row ) {
                parent::__construct( $list, $row );
@@ -1042,9 +1037,7 @@ 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>';
                }
@@ -1060,15 +1053,9 @@ 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 086db3a..4dc9388 100644 (file)
--- a/includes/revisiondelete/RevisionDeleteAbstracts.php
+++ b/includes/revisiondelete/RevisionDeleteAbstracts.php
@@ -105,9 +105,7 @@ 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()] );