From: Fomafix <fomafix@googlemail.com>
Date: Mon, 1 May 2017 16:35:36 +0000 (+0200)
Subject: Fix indenting and newlines
X-Git-Tag: 1.34.0-rc.0~3537^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=a5a513547f509b282890fa79b0dc355deeda3ac3;p=lhc%2Fweb%2Fwiklou.git

Fix indenting and newlines

Like suggested in https://www.mediawiki.org/wiki/Manual:Coding_conventions#Line_continuation

Change-Id: I86db3c24ffc69737c6917cfc68300ff4695961cd
---

diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index 36f49e0e6b..6ce8f45f3b 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -438,7 +438,7 @@ class MultiHttpClient implements LoggerAwareInterface {
 		if ( !$this->multiHandle ) {
 			if ( !function_exists( 'curl_multi_init' ) ) {
 				throw new Exception( "PHP cURL function curl_multi_init missing. " .
-									 "Check https://www.mediawiki.org/wiki/Manual:CURL" );
+					"Check https://www.mediawiki.org/wiki/Manual:CURL" );
 			}
 			$cmh = curl_multi_init();
 			curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, (int)$this->usePipelining );
diff --git a/includes/media/JpegHandler.php b/includes/media/JpegHandler.php
index 91bed4a82c..f7de5f5a0f 100644
--- a/includes/media/JpegHandler.php
+++ b/includes/media/JpegHandler.php
@@ -232,7 +232,7 @@ class JpegHandler extends ExifBitmapHandler {
 	 * @return bool
 	 */
 	public function swapICCProfile( $filepath, array $colorSpaces,
-									array $oldProfileStrings, $profileFilepath
+		array $oldProfileStrings, $profileFilepath
 	) {
 		global $wgExiftool;
 
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 0ca6f932a0..0fc6e13c41 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -155,7 +155,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 					'activeValue' => false,
 					'default' => $this->getUser()->getBoolOption( 'extendwatchlist' ),
 					'queryCallable' => function ( $specialClassName, $ctx, $dbr, &$tables,
-												  &$fields, &$conds, &$query_options, &$join_conds ) {
+							&$fields, &$conds, &$query_options, &$join_conds ) {
 						$nonRevisionTypes = [ RC_LOG ];
 						Hooks::run( 'SpecialWatchlistGetNonRevisionTypes', [ &$nonRevisionTypes ] );
 						if ( $nonRevisionTypes ) {
@@ -211,7 +211,7 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 			],
 			'default' => ChangesListStringOptionsFilterGroup::NONE,
 			'queryCallable' => function ( $specialPageClassName, $context, $dbr,
-										  &$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) {
+					&$tables, &$fields, &$conds, &$query_options, &$join_conds, $selectedValues ) {
 				if ( $selectedValues === [ 'seen' ] ) {
 					$conds[] = $dbr->makeList( [
 						'wl_notificationtimestamp IS NULL',
diff --git a/languages/classes/LanguageCrh.php b/languages/classes/LanguageCrh.php
index 27af14bdd5..1da3a5446a 100644
--- a/languages/classes/LanguageCrh.php
+++ b/languages/classes/LanguageCrh.php
@@ -64,9 +64,10 @@ class CrhConverter extends LanguageConverter {
 	 * @param array $flags
 	 */
 	function __construct( Language $langobj, $maincode,
-								$variants = [],
-								$variantfallbacks = [],
-								$flags = [] ) {
+		$variants = [],
+		$variantfallbacks = [],
+		$flags = []
+	) {
 		parent::__construct( $langobj, $maincode,
 			$variants, $variantfallbacks, $flags );
 
diff --git a/languages/classes/LanguageGan.php b/languages/classes/LanguageGan.php
index f315473601..170ff9a1f0 100644
--- a/languages/classes/LanguageGan.php
+++ b/languages/classes/LanguageGan.php
@@ -36,14 +36,16 @@ class GanConverter extends LanguageConverter {
 		$variants = [],
 		$variantfallbacks = [],
 		$flags = [],
-		$manualLevel = [] ) {
+		$manualLevel = []
+	) {
 		$this->mDescCodeSep = '：';
 		$this->mDescVarSep = '；';
 		parent::__construct( $langobj, $maincode,
 			$variants,
 			$variantfallbacks,
 			$flags,
-			$manualLevel );
+			$manualLevel
+		);
 		$names = [
 			'gan' => '原文',
 			'gan-hans' => '简体',
@@ -94,7 +96,8 @@ class LanguageGan extends LanguageZh {
 		$this->mConverter = new GanConverter( $this, 'gan',
 			$variants, $variantfallbacks,
 			[],
-			$ml );
+			$ml
+		);
 	}
 
 	/**
diff --git a/languages/classes/LanguageKk.php b/languages/classes/LanguageKk.php
index ea35ac8719..d829eada7d 100644
--- a/languages/classes/LanguageKk.php
+++ b/languages/classes/LanguageKk.php
@@ -45,9 +45,10 @@ class KkConverter extends LanguageConverter {
 	 * @param array $flags
 	 */
 	function __construct( Language $langobj, $maincode,
-								$variants = [],
-								$variantfallbacks = [],
-								$flags = [] ) {
+		$variants = [],
+		$variantfallbacks = [],
+		$flags = []
+	) {
 		parent::__construct( $langobj, $maincode,
 			$variants, $variantfallbacks, $flags );
 
@@ -315,8 +316,8 @@ class KkConverter extends LanguageConverter {
 					// is matched the word to front vowels?
 					// exclude a words matched to е, э, г, к, к, қ,
 					// them should be without hamza
-					if ( preg_match( '/[' . $front . ']/u', $m[0] )
-						&& !preg_match( '/[' . $excludes . ']/u', $m[0] )
+					if ( preg_match( '/[' . $front . ']/u', $m[0] ) &&
+						!preg_match( '/[' . $excludes . ']/u', $m[0] )
 					) {
 						$ret .= preg_replace( '/[' . $letters . ']+/u', H_HAMZA . '$0', $m[0] );
 					} else {
diff --git a/languages/classes/LanguageZh.php b/languages/classes/LanguageZh.php
index 27d6972cd2..455678d208 100644
--- a/languages/classes/LanguageZh.php
+++ b/languages/classes/LanguageZh.php
@@ -34,17 +34,19 @@ class ZhConverter extends LanguageConverter {
 	 * @param array $manualLevel
 	 */
 	function __construct( Language $langobj, $maincode,
-								$variants = [],
-								$variantfallbacks = [],
-								$flags = [],
-								$manualLevel = [] ) {
+		$variants = [],
+		$variantfallbacks = [],
+		$flags = [],
+		$manualLevel = []
+	) {
 		$this->mDescCodeSep = '：';
 		$this->mDescVarSep = '；';
 		parent::__construct( $langobj, $maincode,
-									$variants,
-									$variantfallbacks,
-									$flags,
-									$manualLevel );
+			$variants,
+			$variantfallbacks,
+			$flags,
+			$manualLevel
+		);
 		$names = [
 			'zh' => '原文',
 			'zh-hans' => '简体',
@@ -143,9 +145,10 @@ class LanguageZh extends LanguageZh_hans {
 		];
 
 		$this->mConverter = new ZhConverter( $this, 'zh',
-								$variants, $variantfallbacks,
-								[],
-								$ml );
+			$variants, $variantfallbacks,
+			[],
+			$ml
+		);
 	}
 
 	/**