Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 14 insertions, 8 deletions

diff --git a/maintenance/parse.php b/maintenance/parse.php
index 3ac7a281..638d7c5b 100644
--- a/maintenance/parse.php
+++ b/maintenance/parse.php
@@ -62,7 +62,12 @@ class CLIParser extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "Parse a given wikitext";
-		$this->addOption( 'title', 'Title name for the given wikitext (Default: \'CLIParser\')', false, true );
+		$this->addOption(
+			'title',
+			'Title name for the given wikitext (Default: \'CLIParser\')',
+			false,
+			true
+		);
 		$this->addArg( 'file', 'File containing wikitext (Default: stdin)', false );
 	}
 
@@ -90,7 +95,8 @@ class CLIParser extends Maintenance {
 
 		if ( $input_file === $php_stdin ) {
 			$ctrl = wfIsWindows() ? 'CTRL+Z' : 'CTRL+D';
-			$this->error( basename( __FILE__ ) . ": warning: reading wikitext from STDIN. Press $ctrl to parse.\n" );
+			$this->error( basename( __FILE__ )
+				. ": warning: reading wikitext from STDIN. Press $ctrl to parse.\n" );
 		}
 
 		return file_get_contents( $input_file );
@@ -107,13 +113,13 @@ class CLIParser extends Maintenance {
 	 * Default title is 'CLIParser', it can be overriden with the option
 	 * --title <Your:Title>
 	 *
-	 * @return Title object
+	 * @return Title
 	 */
 	protected function getTitle() {
-		$title =
-			$this->getOption( 'title' )
+		$title = $this->getOption( 'title' )
 			? $this->getOption( 'title' )
 			: 'CLIParser';
+
 		return Title::newFromText( $title );
 	}
 
@@ -123,9 +129,9 @@ class CLIParser extends Maintenance {
 	 */
 	protected function parse( $wikitext ) {
 		return $this->parser->parse(
-			$wikitext
-			, $this->getTitle()
-			, new ParserOptions()
+			$wikitext,
+			$this->getTitle(),
+			new ParserOptions()
 		);
 	}
 }