From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Fri, 14 Mar 2014 21:09:47 +0000 (+0100)
Subject: Put the "else" (or "elseif") on the same line as the previous closing brace
X-Git-Tag: 1.31.0-rc.0~16608^2
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=c29d513debcd148a61123cf34a680ad6f7ce6a07;p=lhc%2Fweb%2Fwiklou.git

Put the "else" (or "elseif") on the same line as the previous closing brace

Per https://www.mediawiki.org/wiki/Manual:Coding_conventions#Indenting_and_alignment

Change-Id: I208981db0a866524156bad18cb687f010afeac2c
---

diff --git a/includes/CacheHelper.php b/includes/CacheHelper.php
index f0ae5a313f..f6cd3a6914 100644
--- a/includes/CacheHelper.php
+++ b/includes/CacheHelper.php
@@ -205,8 +205,7 @@ class CacheHelper implements ICacheHelper {
 				'cachedspecial-viewing-cached-ttl',
 				$context->getLanguage()->formatDuration( $this->cacheExpiry )
 			)->escaped();
-		}
-		else {
+		} else {
 			$message = $context->msg(
 				'cachedspecial-viewing-cached-ts'
 			)->escaped();
@@ -277,25 +276,20 @@ class CacheHelper implements ICacheHelper {
 
 				if ( !is_integer( $itemKey ) ) {
 					wfWarn( "Attempted to get item with non-numeric key while the next item in the queue has a key ($itemKey) in " . __METHOD__ );
-				}
-				elseif ( is_null( $itemKey ) ) {
+				} elseif ( is_null( $itemKey ) ) {
 					wfWarn( "Attempted to get an item while the queue is empty in " . __METHOD__ );
-				}
-				else {
+				} else {
 					$value = array_shift( $this->cachedChunks );
 				}
-			}
-			else {
+			} else {
 				if ( array_key_exists( $key, $this->cachedChunks ) ) {
 					$value = $this->cachedChunks[$key];
 					unset( $this->cachedChunks[$key] );
-				}
-				else {
+				} else {
 					wfWarn( "There is no item with key '$key' in this->cachedChunks in " . __METHOD__ );
 				}
 			}
-		}
-		else {
+		} else {
 			if ( !is_array( $args ) ) {
 				$args = array( $args );
 			}
@@ -305,8 +299,7 @@ class CacheHelper implements ICacheHelper {
 			if ( $this->cacheEnabled ) {
 				if ( is_null( $key ) ) {
 					$this->cachedChunks[] = $value;
-				}
-				else {
+				} else {
 					$this->cachedChunks[$key] = $value;
 				}
 			}
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 9a27d23d21..5f5cb53936 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -772,8 +772,7 @@ class EditPage {
 				$this->sectiontitle = $request->getVal( 'preloadtitle' );
 				// Once wpSummary isn't being use for setting section titles, we should delete this.
 				$this->summary = $request->getVal( 'preloadtitle' );
-			}
-			elseif ( $this->section != 'new' && $request->getVal( 'summary' ) ) {
+			} elseif ( $this->section != 'new' && $request->getVal( 'summary' ) ) {
 				$this->summary = $request->getText( 'summary' );
 				if ( $this->summary !== '' ) {
 					$this->hasPresetSummary = true;
diff --git a/includes/MimeMagic.php b/includes/MimeMagic.php
index f5c28ab006..e3b85777c8 100644
--- a/includes/MimeMagic.php
+++ b/includes/MimeMagic.php
@@ -508,8 +508,7 @@ class MimeMagic {
 				// trust the file extension
 				$mime = $this->guessTypesForExtension( $ext );
 			}
-		}
-		elseif ( $mime === 'application/x-opc+zip' ) {
+		} elseif ( $mime === 'application/x-opc+zip' ) {
 			if ( $this->isMatchingExtension( $ext, $mime ) ) {
 				// A known file extension for an OPC file,
 				// find the proper mime type for that file extension
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 90548fe076..53bb8fbd97 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -631,8 +631,7 @@ class Sanitizer {
 				# Remove the comment, leading and trailing
 				# spaces, and leave only one newline.
 				$text = substr_replace( $text, "\n", $spaceStart, $spaceLen + 1 );
-			}
-			else {
+			} else {
 				# Remove just the comment.
 				$text = substr_replace( $text, '', $start, $end - $start );
 			}
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index fe80929a56..4c2ecba55c 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -262,8 +262,7 @@ class UserMailer {
 				wfDebug( "PEAR Mail_Mime package is not installed. Falling back to text email.\n" );
 				// remove the html body for text email fall back
 				$body = $body['text'];
-			}
-			else {
+			} else {
 				require_once 'Mail/mime.php';
 				if ( wfIsWindows() ) {
 					$body['text'] = str_replace( "\n", "\r\n", $body['text'] );
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index 6b2a874537..0e7d42ab05 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -1144,14 +1144,12 @@ class PPFrame_DOM implements PPFrame {
 						|| ( $flags & PPFrame::STRIP_COMMENTS )
 					) {
 						$out .= '';
-					}
-					# Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result
-					# Not in RECOVER_COMMENTS mode (extractSections) though
-					elseif ( $this->parser->ot['wiki'] && !( $flags & PPFrame::RECOVER_COMMENTS ) ) {
+					} elseif ( $this->parser->ot['wiki'] && !( $flags & PPFrame::RECOVER_COMMENTS ) ) {
+						# Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result
+						# Not in RECOVER_COMMENTS mode (extractSections) though
 						$out .= $this->parser->insertStripItem( $contextNode->textContent );
-					}
-					# Recover the literal comment in RECOVER_COMMENTS and pre+no-remove
-					else {
+					} else {
+						# Recover the literal comment in RECOVER_COMMENTS and pre+no-remove
 						$out .= $contextNode->textContent;
 					}
 				} elseif ( $contextNode->nodeName == 'ignore' ) {
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index c2ab54e00d..53e79d41db 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -440,9 +440,7 @@ class Preprocessor_Hash implements Preprocessor {
 					$extNode->addChild( PPNode_Hash_Tree::newWithText( 'close', $close ) );
 				}
 				$accum->addNode( $extNode );
-			}
-
-			elseif ( $found == 'line-start' ) {
+			} elseif ( $found == 'line-start' ) {
 				// Is this the start of a heading?
 				// Line break belongs before the heading element in any case
 				if ( $fakeLineStart ) {
@@ -1065,14 +1063,12 @@ class PPFrame_Hash implements PPFrame {
 						|| ( $flags & PPFrame::STRIP_COMMENTS )
 					) {
 						$out .= '';
-					}
-					# Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result
-					# Not in RECOVER_COMMENTS mode (extractSections) though
-					elseif ( $this->parser->ot['wiki'] && !( $flags & PPFrame::RECOVER_COMMENTS ) ) {
+					} elseif ( $this->parser->ot['wiki'] && !( $flags & PPFrame::RECOVER_COMMENTS ) ) {
+						# Add a strip marker in PST mode so that pstPass2() can run some old-fashioned regexes on the result
+						# Not in RECOVER_COMMENTS mode (extractSections) though
 						$out .= $this->parser->insertStripItem( $contextNode->firstChild->value );
-					}
-					# Recover the literal comment in RECOVER_COMMENTS and pre+no-remove
-					else {
+					} else {
+						# Recover the literal comment in RECOVER_COMMENTS and pre+no-remove
 						$out .= $contextNode->firstChild->value;
 					}
 				} elseif ( $contextNode->name == 'ignore' ) {
diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index d34fb5c29c..9ae7795560 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -151,24 +151,22 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			// seem to do that, and custom implementations might forget. Coerce it to TS_UNIX
 			$moduleMtime = wfTimestamp( TS_UNIX, $module->getModifiedTime( $context ) );
 			$mtime = max( $moduleMtime, wfTimestamp( TS_UNIX, $wgCacheEpoch ) );
-			// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
-			// mw.loader.register()
+
 			if ( !count( $deps ) && $group === null && $source === 'local' ) {
+				// Modules without dependencies, a group or a foreign source pass two arguments (name, timestamp) to
+				// mw.loader.register()
 				$registrations[] = array( $name, $mtime );
-			}
-			// Modules with dependencies but no group or foreign source pass three arguments
-			// (name, timestamp, dependencies) to mw.loader.register()
-			elseif ( $group === null && $source === 'local' ) {
+			} elseif ( $group === null && $source === 'local' ) {
+				// Modules with dependencies but no group or foreign source pass three arguments
+				// (name, timestamp, dependencies) to mw.loader.register()
 				$registrations[] = array( $name, $mtime, $deps );
-			}
-			// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
-			// to mw.loader.register()
-			elseif ( $source === 'local' ) {
+			} elseif ( $source === 'local' ) {
+				// Modules with a group but no foreign source pass four arguments (name, timestamp, dependencies, group)
+				// to mw.loader.register()
 				$registrations[] = array( $name, $mtime, $deps, $group );
-			}
-			// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
-			// to mw.loader.register()
-			else {
+			} else {
+				// Modules with a foreign source pass five arguments (name, timestamp, dependencies, group, source)
+				// to mw.loader.register()
 				$registrations[] = array( $name, $mtime, $deps, $group, $source );
 			}
 		}