From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Fri, 4 Oct 2013 05:54:44 +0000 (+0200)
Subject: Declare visibility on class properties
X-Git-Tag: 1.31.0-rc.0~18451
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=ee9d4dca18d399d7a4eb901390d86c1d125ca9b1;p=lhc%2Fweb%2Fwiklou.git

Declare visibility on class properties

As pointed out by phpcs:

 The var keyword must not be used to declare a property
 (PSR2.Classes.PropertyDeclaration.VarUsed)

Set to public, as this is also done for class properties in classes these
ones extend.

Also break some long lines to silence CodeSniffer.

Change-Id: I77dd45eb2bf1d405d429603b97d5cbfb7ea04ad0
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 5d9e554a75..0f910a515e 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -227,7 +227,8 @@ class SpecialContributions extends SpecialPage {
 	 * Generates the subheading with links
 	 * @param $userObj User object for the target
 	 * @return String: appropriately-escaped HTML to be output literally
-	 * @todo FIXME: Almost the same as getSubTitle in SpecialDeletedContributions.php. Could be combined.
+	 * @todo FIXME: Almost the same as getSubTitle in SpecialDeletedContributions.php.
+	 * Could be combined.
 	 */
 	protected function contributionsSub( $userObj ) {
 		if ( $userObj->isAnon() ) {
@@ -594,9 +595,11 @@ class SpecialContributions extends SpecialPage {
  */
 class ContribsPager extends ReverseChronologicalPager {
 	public $mDefaultDirection = true;
-	var $messages, $target;
-	var $namespace = '', $mDb;
-	var $preventClickjacking = false;
+	public $messages;
+	public $target;
+	public $namespace = '';
+	public $mDb;
+	public $preventClickjacking = false;
 
 	/**
 	 * @var array
@@ -679,8 +682,13 @@ class ContribsPager extends ReverseChronologicalPager {
 		 * $limit: see phpdoc above
 		 * $descending: see phpdoc above
 		 */
-		$data = array( $this->mDb->select( $tables, $fields, $conds, $fname, $options, $join_conds ) );
-		wfRunHooks( 'ContribsPager::reallyDoQuery', array( &$data, $pager, $offset, $limit, $descending ) );
+		$data = array( $this->mDb->select(
+			$tables, $fields, $conds, $fname, $options, $join_conds
+		) );
+		wfRunHooks(
+			'ContribsPager::reallyDoQuery',
+			array( &$data, $pager, $offset, $limit, $descending )
+		);
 
 		$result = array();
 
@@ -944,7 +952,11 @@ class ContribsPager extends ReverseChronologicalPager {
 				$chardiff .= Linker::formatRevisionSize( $row->rev_len );
 				$chardiff .= ' <span class="mw-changeslist-separator">. .</span> ';
 			} else {
-				$parentLen = isset( $this->mParentLens[$row->rev_parent_id] ) ? $this->mParentLens[$row->rev_parent_id] : 0;
+				$parentLen = 0;
+				if ( isset( $this->mParentLens[$row->rev_parent_id] ) ) {
+					$this->mParentLens[$row->rev_parent_id];
+				}
+
 				$chardiff = ' <span class="mw-changeslist-separator">. .</span> ';
 				$chardiff .= ChangesList::showCharacterDifference(
 					$parentLen,
@@ -1001,11 +1013,14 @@ class ContribsPager extends ReverseChronologicalPager {
 			$diffHistLinks = $this->msg( 'parentheses' )
 				->rawParams( $difftext . $this->messages['pipe-separator'] . $histlink )
 				->escaped();
-			$ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
+			$ret = "{$del}{$d} {$diffHistLinks}{$chardiff}{$nflag}{$mflag} ";
+			$ret .= "{$link}{$userlink} {$comment} {$topmarktext}";
 
 			# Denote if username is redacted for this edit
 			if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
-				$ret .= " <strong>" . $this->msg( 'rev-deleted-user-contribs' )->escaped() . "</strong>";
+				$ret .= " <strong>" .
+					$this->msg( 'rev-deleted-user-contribs' )->escaped() .
+					"</strong>";
 			}
 
 			# Tags, if any.
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 2cf1730dbe..9b9888adf3 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -27,8 +27,10 @@
  */
 class DeletedContribsPager extends IndexPager {
 	public $mDefaultDirection = true;
-	var $messages, $target;
-	var $namespace = '', $mDb;
+	public $messages;
+	public $target;
+	public $namespace = '';
+	public $mDb;
 
 	/**
 	 * @var string Navigation bar with paging links.
@@ -358,9 +360,9 @@ class DeletedContributionsPage extends SpecialPage {
 		# If there were contributions, and it was a valid user or IP, show
 		# the appropriate "footer" message - WHOIS tools, etc.
 		if ( $target != 'newbies' ) {
-			$message = IP::isIPAddress( $target )
-				? 'sp-contributions-footer-anon'
-				: 'sp-contributions-footer';
+			$message = IP::isIPAddress( $target ) ?
+				'sp-contributions-footer-anon' :
+				'sp-contributions-footer';
 
 			if ( !$this->msg( $message )->isDisabled() ) {
 				$out->wrapWikiMsg(