From 6ea188fee569cfa4de2a54aeb230f9c126bc5c52 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Thu, 14 Nov 2013 12:18:26 +0100
Subject: [PATCH] Update formatting

Change-Id: I3cbe1f5e48730fbbe57e4b20a0c202edddc93c95
---
 includes/actions/CachedAction.php        |  1 -
 includes/actions/CreditsAction.php       |  3 ++
 includes/actions/DeleteAction.php        |  2 --
 includes/actions/EditAction.php          |  3 --
 includes/actions/HistoryAction.php       | 35 +++++++++++++++---------
 includes/actions/InfoAction.php          |  5 +++-
 includes/actions/MarkpatrolledAction.php |  1 +
 includes/actions/ProtectAction.php       |  4 ---
 includes/actions/RawAction.php           |  2 ++
 includes/actions/RenderAction.php        |  2 --
 includes/actions/RevertAction.php        |  9 ++++--
 includes/actions/ViewAction.php          |  1 -
 includes/actions/WatchAction.php         |  5 ++++
 13 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/includes/actions/CachedAction.php b/includes/actions/CachedAction.php
index bfdda7b939..f3ce25b365 100644
--- a/includes/actions/CachedAction.php
+++ b/includes/actions/CachedAction.php
@@ -184,5 +184,4 @@ abstract class CachedAction extends FormlessAction implements ICacheHelper {
 			$this->getOutput()->setSubtitle( $this->cacheHelper->getCachedNotice( $this->getContext() ) );
 		}
 	}
-
 }
diff --git a/includes/actions/CreditsAction.php b/includes/actions/CreditsAction.php
index 0a2bf30686..cd7eb458ee 100644
--- a/includes/actions/CreditsAction.php
+++ b/includes/actions/CreditsAction.php
@@ -74,6 +74,7 @@ class CreditsAction extends FormlessAction {
 		}
 
 		wfProfileOut( __METHOD__ );
+
 		return $s;
 	}
 
@@ -94,6 +95,7 @@ class CreditsAction extends FormlessAction {
 			$d = '';
 			$t = '';
 		}
+
 		return $this->msg( 'lastmodifiedatby', $d, $t )->rawParams(
 			$this->userLink( $user ) )->params( $user->getName() )->escaped();
 	}
@@ -175,6 +177,7 @@ class CreditsAction extends FormlessAction {
 		}
 
 		$count = count( $fulllist );
+
 		# "Based on work by ..."
 		return $count
 			? $this->msg( 'othercontribs' )->rawParams(
diff --git a/includes/actions/DeleteAction.php b/includes/actions/DeleteAction.php
index db7123dbb2..069d570063 100644
--- a/includes/actions/DeleteAction.php
+++ b/includes/actions/DeleteAction.php
@@ -43,7 +43,5 @@ class DeleteAction extends FormlessAction {
 	public function show() {
 
 		$this->page->delete();
-
 	}
-
 }
diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index 3dd4c4831c..72210a920a 100644
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -49,9 +49,7 @@ class EditAction extends FormlessAction {
 			$editor = new EditPage( $page );
 			$editor->edit();
 		}
-
 	}
-
 }
 
 /**
@@ -75,5 +73,4 @@ class SubmitAction extends EditAction {
 
 		parent::show();
 	}
-
 }
diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index e58791eadc..d9eba9ca24 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -122,6 +122,7 @@ class HistoryAction extends FormlessAction {
 		if ( $feedType ) {
 			$this->feed( $feedType );
 			wfProfileOut( __METHOD__ );
+
 			return;
 		}
 
@@ -141,6 +142,7 @@ class HistoryAction extends FormlessAction {
 				)
 			);
 			wfProfileOut( __METHOD__ );
+
 			return;
 		}
 
@@ -162,7 +164,7 @@ class HistoryAction extends FormlessAction {
 		}
 		if ( $this->getUser()->isAllowed( 'deletedhistory' ) ) {
 			$checkDeleted = Xml::checkLabel( $this->msg( 'history-show-deleted' )->text(),
-			'deleted', 'mw-show-deleted-only', $request->getBool( 'deleted' ) ) . "\n";
+				'deleted', 'mw-show-deleted-only', $request->getBool( 'deleted' ) ) . "\n";
 		} else {
 			$checkDeleted = '';
 		}
@@ -316,9 +318,10 @@ class HistoryAction extends FormlessAction {
 				$wgContLang->time( $rev->getTimestamp() ) )->inContentLanguage()->text();
 		} else {
 			$title = $rev->getUserText() .
-			$this->msg( 'colon-separator' )->inContentLanguage()->text() .
-			FeedItem::stripComment( $rev->getComment() );
+				$this->msg( 'colon-separator' )->inContentLanguage()->text() .
+				FeedItem::stripComment( $rev->getComment() );
 		}
+
 		return new FeedItem(
 			$title,
 			$text,
@@ -383,6 +386,7 @@ class HistoryPager extends ReverseChronologicalPager {
 			$this->tagFilter
 		);
 		wfRunHooks( 'PageHistoryPager::getQueryInfo', array( &$this, &$queryInfo ) );
+
 		return $queryInfo;
 	}
 
@@ -401,6 +405,7 @@ class HistoryPager extends ReverseChronologicalPager {
 			$s = '';
 		}
 		$this->lastRow = $row;
+
 		return $s;
 	}
 
@@ -457,13 +462,15 @@ class HistoryPager extends ReverseChronologicalPager {
 
 		$s .= $this->buttons;
 		$s .= '<ul id="pagehistory">' . "\n";
+
 		return $s;
 	}
 
 	private function getRevisionButton( $name, $msg ) {
 		$this->preventClickjacking();
 		# Note bug #20966, <button> is non-standard in IE<8
-		$element = Html::element( 'button',
+		$element = Html::element(
+			'button',
 			array(
 				'type' => 'submit',
 				'name' => $name,
@@ -502,6 +509,7 @@ class HistoryPager extends ReverseChronologicalPager {
 			$s .= $this->buttons;
 		}
 		$s .= '</form>';
+
 		return $s;
 	}
 
@@ -534,8 +542,7 @@ class HistoryPager extends ReverseChronologicalPager {
 	 * @return String: HTML output for the row
 	 */
 	function historyLine( $row, $next, $notificationtimestamp = false,
-		$latest = false, $firstInList = false )
-	{
+		$latest = false, $firstInList = false ) {
 		$rev = new Revision( $row );
 		$rev->setTitle( $this->getTitle() );
 
@@ -550,9 +557,9 @@ class HistoryPager extends ReverseChronologicalPager {
 		$lastlink = $this->lastLink( $rev, $next );
 		$diffButtons = $this->diffButtons( $rev, $firstInList );
 		$histLinks = Html::rawElement(
-				'span',
-				array( 'class' => 'mw-history-histlinks' ),
-				$this->msg( 'parentheses' )->rawParams( $curlink . $this->historyPage->message['pipe-separator'] . $lastlink )->escaped()
+			'span',
+			array( 'class' => 'mw-history-histlinks' ),
+			$this->msg( 'parentheses' )->rawParams( $curlink . $this->historyPage->message['pipe-separator'] . $lastlink )->escaped()
 		);
 		$s = $histLinks . $diffButtons;
 
@@ -635,8 +642,8 @@ class HistoryPager extends ReverseChronologicalPager {
 			}
 
 			if ( !$rev->isDeleted( Revision::DELETED_TEXT )
-				&& !$prevRev->isDeleted( Revision::DELETED_TEXT ) )
-			{
+				&& !$prevRev->isDeleted( Revision::DELETED_TEXT )
+			) {
 				# Create undo tooltip for the first (=latest) line only
 				$undoTooltip = $latest
 					? array( 'title' => $this->msg( 'tooltip-undo' )->text() )
@@ -705,6 +712,7 @@ class HistoryPager extends ReverseChronologicalPager {
 		if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
 			$link = "<span class=\"history-deleted\">$link</span>";
 		}
+
 		return $link;
 	}
 
@@ -758,8 +766,8 @@ class HistoryPager extends ReverseChronologicalPager {
 				)
 			);
 		} elseif ( !$prevRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
-			|| !$nextRev->userCan( Revision::DELETED_TEXT, $this->getUser() ) )
-		{
+			|| !$nextRev->userCan( Revision::DELETED_TEXT, $this->getUser() )
+		) {
 			return $last;
 		} else {
 			return Linker::linkKnown(
@@ -816,6 +824,7 @@ class HistoryPager extends ReverseChronologicalPager {
 				array_merge( $radio, $checkmark, array(
 					'name' => 'diff',
 					'id' => "mw-diff-$id" ) ) );
+
 			return $first . $second;
 		} else {
 			return '';
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 701f6d45a4..c97267bd1a 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -153,6 +153,7 @@ class InfoAction extends FormlessAction {
 	 */
 	protected function makeHeader( $header ) {
 		$spanAttribs = array( 'class' => 'mw-headline', 'id' => Sanitizer::escapeId( $header ) );
+
 		return Html::rawElement( 'h2', array(), Html::element( 'span', $spanAttribs, $header ) );
 	}
 
@@ -306,7 +307,7 @@ class InfoAction extends FormlessAction {
 		if (
 			$user->isAllowed( 'unwatchedpages' ) ||
 			( $wgUnwatchedPageThreshold !== false &&
-			  $pageCounts['watchers'] >= $wgUnwatchedPageThreshold )
+				$pageCounts['watchers'] >= $wgUnwatchedPageThreshold )
 		) {
 			// Number of page watchers
 			$pageInfo['header-basic'][] = array(
@@ -736,6 +737,7 @@ class InfoAction extends FormlessAction {
 		);
 
 		wfProfileOut( __METHOD__ );
+
 		return $result;
 	}
 
@@ -803,6 +805,7 @@ class InfoAction extends FormlessAction {
 		}
 
 		$count = count( $fulllist );
+
 		# "Based on work by ..."
 		return $count
 			? $this->msg( 'othercontribs' )->rawParams(
diff --git a/includes/actions/MarkpatrolledAction.php b/includes/actions/MarkpatrolledAction.php
index ff6cf13a70..4016f6728b 100644
--- a/includes/actions/MarkpatrolledAction.php
+++ b/includes/actions/MarkpatrolledAction.php
@@ -70,6 +70,7 @@ class MarkpatrolledAction extends FormlessAction {
 			$this->getOutput()->setPageTitle( $this->msg( 'markedaspatrollederror' ) );
 			$this->getOutput()->addWikiMsg( 'markedaspatrollederror-noautopatrol' );
 			$this->getOutput()->returnToMain( null, $return );
+
 			return;
 		}
 
diff --git a/includes/actions/ProtectAction.php b/includes/actions/ProtectAction.php
index ec6648e2e7..8b2bfaa983 100644
--- a/includes/actions/ProtectAction.php
+++ b/includes/actions/ProtectAction.php
@@ -43,9 +43,7 @@ class ProtectAction extends FormlessAction {
 	public function show() {
 
 		$this->page->protect();
-
 	}
-
 }
 
 /**
@@ -64,7 +62,5 @@ class UnprotectAction extends ProtectAction {
 	public function show() {
 
 		$this->page->unprotect();
-
 	}
-
 }
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index 32751e4512..1213bfb949 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -212,6 +212,7 @@ class RawAction extends FormlessAction {
 				$oldid = 0;
 				break;
 		}
+
 		return $oldid;
 	}
 
@@ -273,6 +274,7 @@ class RawPage extends RawAction {
 		if ( $this->mOldId !== null ) {
 			return $this->mOldId;
 		}
+
 		return parent::getOldId();
 	}
 }
diff --git a/includes/actions/RenderAction.php b/includes/actions/RenderAction.php
index 3d244fb3f3..c9b3f8fe48 100644
--- a/includes/actions/RenderAction.php
+++ b/includes/actions/RenderAction.php
@@ -43,7 +43,5 @@ class RenderAction extends FormlessAction {
 	public function show() {
 
 		$this->page->render();
-
 	}
-
 }
diff --git a/includes/actions/RevertAction.php b/includes/actions/RevertAction.php
index a5fc4e1734..0a7ef9ff78 100644
--- a/includes/actions/RevertAction.php
+++ b/includes/actions/RevertAction.php
@@ -38,7 +38,8 @@ class RevertAction extends Action {
 		$this->getOutput()->showErrorPage( 'nosuchaction', 'nosuchactiontext' );
 	}
 
-	public function execute() {}
+	public function execute() {
+	}
 }
 
 /**
@@ -63,8 +64,8 @@ class RevertFileAction extends FormAction {
 		$oldimage = $this->getRequest()->getText( 'oldimage' );
 		if ( strlen( $oldimage ) < 16
 			|| strpos( $oldimage, '/' ) !== false
-			|| strpos( $oldimage, '\\' ) !== false )
-		{
+			|| strpos( $oldimage, '\\' ) !== false
+		) {
 			throw new ErrorPageError( 'internalerror', 'unexpected', array( 'oldimage', $oldimage ) );
 		}
 
@@ -114,6 +115,7 @@ class RevertFileAction extends FormAction {
 	public function onSubmit( $data ) {
 		$source = $this->page->getFile()->getArchiveVirtualUrl( $this->getRequest()->getText( 'oldimage' ) );
 		$comment = $data['comment'];
+
 		// TODO: Preserve file properties from database instead of reloading from file
 		return $this->page->getFile()->upload( $source, $comment, $comment, 0, false, false, $this->getUser() );
 	}
@@ -139,6 +141,7 @@ class RevertFileAction extends FormAction {
 
 	protected function getDescription() {
 		$this->getOutput()->addBacklinkSubtitle( $this->getTitle() );
+
 		return '';
 	}
 }
diff --git a/includes/actions/ViewAction.php b/includes/actions/ViewAction.php
index e227197d25..3a24565c35 100644
--- a/includes/actions/ViewAction.php
+++ b/includes/actions/ViewAction.php
@@ -43,5 +43,4 @@ class ViewAction extends FormlessAction {
 	public function show() {
 		$this->page->view();
 	}
-
 }
diff --git a/includes/actions/WatchAction.php b/includes/actions/WatchAction.php
index 929c1b5f12..054d6154fd 100644
--- a/includes/actions/WatchAction.php
+++ b/includes/actions/WatchAction.php
@@ -51,6 +51,7 @@ class WatchAction extends FormAction {
 		wfProfileIn( __METHOD__ );
 		self::doWatch( $this->getTitle(), $this->getUser() );
 		wfProfileOut( __METHOD__ );
+
 		return true;
 	}
 
@@ -105,6 +106,7 @@ class WatchAction extends FormAction {
 				return self::doUnwatch( $title, $user );
 			}
 		}
+
 		return Status::newGood();
 	}
 
@@ -129,6 +131,7 @@ class WatchAction extends FormAction {
 			$user->addWatch( $title, $checkRights );
 			wfRunHooks( 'WatchArticleComplete', array( &$user, &$page ) );
 		}
+
 		return $status;
 	}
 
@@ -152,6 +155,7 @@ class WatchAction extends FormAction {
 			$user->removeWatch( $title );
 			wfRunHooks( 'UnwatchArticleComplete', array( &$user, &$page ) );
 		}
+
 		return $status;
 	}
 
@@ -220,6 +224,7 @@ class UnwatchAction extends WatchAction {
 		wfProfileIn( __METHOD__ );
 		self::doUnwatch( $this->getTitle(), $this->getUser() );
 		wfProfileOut( __METHOD__ );
+
 		return true;
 	}
 
-- 
2.20.1