From 86fe1da236fabc9c4e254d18dd2edce57961ddd2 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Tue, 3 Dec 2013 15:58:51 +0100 Subject: [PATCH] Break long lines in logging related classes Also: * Take function call out of for loop test part. * Suppress CodeSniffer warnings for unavoidable long lines. Change-Id: I14044f14b30d494d910541a1dac50921254a7398 --- includes/logging/DeleteLogFormatter.php | 17 ++++++---- includes/logging/LogEventsList.php | 45 +++++++++++++++++++------ includes/logging/LogFormatter.php | 14 ++++++-- includes/logging/LogPage.php | 12 ++++--- 4 files changed, 64 insertions(+), 24 deletions(-) diff --git a/includes/logging/DeleteLogFormatter.php b/includes/logging/DeleteLogFormatter.php index 461119273e..d761a8720f 100644 --- a/includes/logging/DeleteLogFormatter.php +++ b/includes/logging/DeleteLogFormatter.php @@ -48,11 +48,14 @@ class DeleteLogFormatter extends LogFormatter { $params = parent::getMessageParameters(); $subtype = $this->entry->getSubtype(); if ( in_array( $subtype, array( 'event', 'revision' ) ) ) { - // $params[3] here is 'revision' for page revisions, 'oldimage' for file versions, or a comma-separated list of log_ids for log entries. - // $subtype here is 'revision' for page revisions and file versions, or 'event' for log entries. - if ( - ( $subtype === 'event' && count( $params ) === 6 ) || - ( $subtype === 'revision' && isset( $params[3] ) && ( $params[3] === 'revision' || $params[3] === 'oldimage' ) ) + // $params[3] here is 'revision' for page revisions, 'oldimage' for + // file versions, or a comma-separated list of log_ids for log + // entries. $subtype here is 'revision' for page revisions and file + // versions, or 'event' for log entries. + if ( ( $subtype === 'event' && count( $params ) === 6 ) + || ( $subtype === 'revision' && isset( $params[3] ) + && ( $params[3] === 'revision' || $params[3] === 'oldimage' ) + ) ) { $paramStart = $subtype === 'revision' ? 4 : 3; @@ -98,7 +101,9 @@ class DeleteLogFormatter extends LogFormatter { public function getActionLinks() { $user = $this->context->getUser(); - if ( !$user->isAllowed( 'deletedhistory' ) || $this->entry->isDeleted( LogPage::DELETED_ACTION ) ) { + if ( !$user->isAllowed( 'deletedhistory' ) + || $this->entry->isDeleted( LogPage::DELETED_ACTION ) + ) { return ''; } diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php index fc10a96f5c..fabe153b20 100644 --- a/includes/logging/LogEventsList.php +++ b/includes/logging/LogEventsList.php @@ -245,9 +245,15 @@ class LogEventsList extends ContextSource { * @return String: Formatted HTML */ private function getUserInput( $user ) { - return '' . - Xml::inputLabel( $this->msg( 'specialloguserlabel' )->text(), 'user', 'mw-log-user', 15, $user ) . - ''; + $label = Xml::inputLabel( + $this->msg( 'specialloguserlabel' )->text(), + 'user', + 'mw-log-user', + 15, + $user + ); + + return '' . $label . ''; } /** @@ -255,9 +261,15 @@ class LogEventsList extends ContextSource { * @return String: Formatted HTML */ private function getTitleInput( $title ) { - return '' . - Xml::inputLabel( $this->msg( 'speciallogtitlelabel' )->text(), 'page', 'mw-log-page', 20, $title ) . - ''; + $label = Xml::inputLabel( + $this->msg( 'speciallogtitlelabel' )->text(), + 'page', + 'mw-log-page', + 20, + $title + ); + + return '' . $label . ''; } /** @@ -360,14 +372,21 @@ class LogEventsList extends ContextSource { if ( $user->isAllowed( 'deletedhistory' ) ) { $canHide = $user->isAllowed( 'deletelogentry' ); if ( $row->log_deleted || $canHide ) { - if ( $canHide && $this->flags & self::USE_REVDEL_CHECKBOXES ) { // Show checkboxes instead of links. - if ( !self::userCan( $row, LogPage::DELETED_RESTRICTED, $user ) ) { // If event was hidden from sysops + // Show checkboxes instead of links. + if ( $canHide && $this->flags & self::USE_REVDEL_CHECKBOXES ) { + // If event was hidden from sysops + if ( !self::userCan( $row, LogPage::DELETED_RESTRICTED, $user ) ) { $del = Xml::check( 'deleterevisions', false, array( 'disabled' => 'disabled' ) ); } else { - $del = Xml::check( 'showhiderevisions', false, array( 'name' => 'ids[' . $row->log_id . ']' ) ); + $del = Xml::check( + 'showhiderevisions', + false, + array( 'name' => 'ids[' . $row->log_id . ']' ) + ); } } else { - if ( !self::userCan( $row, LogPage::DELETED_RESTRICTED, $user ) ) { // If event was hidden from sysops + // If event was hidden from sysops + if ( !self::userCan( $row, LogPage::DELETED_RESTRICTED, $user ) ) { $del = Linker::revDeleteLinkDisabled( $canHide ); } else { $query = array( @@ -375,7 +394,11 @@ class LogEventsList extends ContextSource { 'type' => 'logging', 'ids' => $row->log_id, ); - $del = Linker::revDeleteLink( $query, self::isDeleted( $row, LogPage::DELETED_RESTRICTED ), $canHide ); + $del = Linker::revDeleteLink( + $query, + self::isDeleted( $row, LogPage::DELETED_RESTRICTED ), + $canHide + ); } } } diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php index 6e31242350..ab6e35ec67 100644 --- a/includes/logging/LogFormatter.php +++ b/includes/logging/LogFormatter.php @@ -225,15 +225,19 @@ class LogFormatter { $text = wfMessage( 'undeletedarticle' ) ->rawParams( $target )->inContentLanguage()->escaped(); break; + // @codingStandardsIgnoreStart Long line //case 'revision': // Revision deletion //case 'event': // Log deletion // see https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/LogPage.php?&pathrev=97044&r1=97043&r2=97044 //default: + // @codingStandardsIgnoreEnd } break; case 'patrol': + // @codingStandardsIgnoreStart Long line // https://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/PatrolLog.php?&pathrev=97495&r1=97494&r2=97495 + // @codingStandardsIgnoreEnd // Create a diff link to the patrolled revision if ( $entry->getSubtype() === 'patrol' ) { $diffLink = htmlspecialchars( @@ -317,7 +321,7 @@ class LogFormatter { break; } break; - // case 'suppress' --private log -- aaron (sign your messages so we know who to blame in a few years :-D) + // case 'suppress' --private log -- aaron (so we know who to blame in a few years :-D) // default: } if ( is_null( $text ) ) { @@ -742,7 +746,9 @@ class LegacyLogFormatter extends LogFormatter { $subtype = $this->entry->getSubtype(); // Show unblock/change block link - if ( ( $type == 'block' || $type == 'suppress' ) && ( $subtype == 'block' || $subtype == 'reblock' ) ) { + if ( ( $type == 'block' || $type == 'suppress' ) + && ( $subtype == 'block' || $subtype == 'reblock' ) + ) { if ( !$this->context->getUser()->isAllowed( 'block' ) ) { return ''; } @@ -761,7 +767,9 @@ class LegacyLogFormatter extends LogFormatter { return $this->msg( 'parentheses' )->rawParams( $this->context->getLanguage()->pipeList( $links ) )->escaped(); // Show change protection link - } elseif ( $type == 'protect' && ( $subtype == 'protect' || $subtype == 'modify' || $subtype == 'unprotect' ) ) { + } elseif ( $type == 'protect' + && ( $subtype == 'protect' || $subtype == 'modify' || $subtype == 'unprotect' ) + ) { $links = array( Linker::link( $title, $this->msg( 'hist' )->escaped(), diff --git a/includes/logging/LogPage.php b/includes/logging/LogPage.php index 7f87dc24fc..51c41a8fe1 100644 --- a/includes/logging/LogPage.php +++ b/includes/logging/LogPage.php @@ -257,7 +257,8 @@ class LogPage { $titleLink = self::getTitleLink( $type, $langObjOrNull, $title, $params ); if ( count( $params ) == 0 ) { - $rv = wfMessage( $wgLogActions[$key] )->rawParams( $titleLink )->inLanguage( $langObj )->escaped(); + $rv = wfMessage( $wgLogActions[$key] )->rawParams( $titleLink ) + ->inLanguage( $langObj )->escaped(); } else { $details = ''; array_unshift( $params, $titleLink ); @@ -297,7 +298,8 @@ class LogPage { } } - $rv = wfMessage( $wgLogActions[$key] )->rawParams( $params )->inLanguage( $langObj )->escaped() . $details; + $rv = wfMessage( $wgLogActions[$key] )->rawParams( $params ) + ->inLanguage( $langObj )->escaped() . $details; } } } else { @@ -414,7 +416,8 @@ class LogPage { /** * Add a log entry * - * @param string $action one of '', 'block', 'protect', 'rights', 'delete', 'upload', 'move', 'move_redir' + * @param string $action one of '', 'block', 'protect', 'rights', 'delete', + * 'upload', 'move', 'move_redir' * @param $target Title object * @param string $comment description associated * @param array $params parameters passed later to wfMessage function @@ -535,8 +538,9 @@ class LogPage { return ''; //nothing to do } $flags = explode( ',', $flags ); + $flagsCount = count( $flags ); - for ( $i = 0; $i < count( $flags ); $i++ ) { + for ( $i = 0; $i < $flagsCount; $i++ ) { $flags[$i] = self::formatBlockFlag( $flags[$i], $lang ); } -- 2.20.1