Revised php to conform with MediaWiki style requirements

morags · morags · commit 1c51b86ff02a · 2018-08-09T00:08:48.000+03:00
diff --git a/includes/Skin2018.php b/includes/Skin2018.php
@@ -15,19 +15,18 @@ class Skin2018 extends SkinTemplate {
 	 * @param $out OutputPage
 	 */
 	public function initPage( OutputPage $out ) {
-
 		$out->addMeta( 'viewport', 'width=device-width, initial-scale=1.0' );
 
-		$out->addModuleStyles( array(
+		$out->addModuleStyles( [
 			// 'mediawiki.skinning.elements',
 			// 'mediawiki.skinning.content',
 			// 'mediawiki.skinning.interface',
 			'mediawiki.skinning.content.externallinks',
 			'skins.2018'
-		) );
-		$out->addModules( array(
+		 ] );
+		$out->addModules( [
 			'skins.2018.js'
-		) );
+		 ] );
 	}
 
 	/**
diff --git a/includes/Skin2018Template.php b/includes/Skin2018Template.php
@@ -9,9 +9,8 @@ class Skin2018Template extends BaseTemplate {
 	 * Outputs the content of the page
 	 */
 	public function execute() {
-
 		// Rearrange parts of $this->data for easier handling in the template
-		unset($this->data['nav_urls']['mainpage']);
+		unset( $this->data['nav_urls']['mainpage'] );
 		if ( isset( $this->data['content_navigation']['actions']['watch'] ) ) {
 			$this->data['watch_indicator']['watch'] = $this->data['content_navigation']['actions']['watch'];
 			unset( $this->data['content_navigation']['actions']['watch'] );
@@ -22,9 +21,9 @@ public function execute() {
 
 		// Output <head>
 		echo $this->get( 'headelement' );
-		
+
 		// Output <body> using Mustache
-        $templateParser = new TemplateParser(  __DIR__ . '/../resources/templates' );
+		$templateParser = new TemplateParser( __DIR__ . '/../resources/templates' );
 
 		echo $templateParser->processTemplate(
 			'main', $this->data
diff --git a/skin.json b/skin.json
@@ -44,8 +44,8 @@
         "remoteSkinPath": "2018"
     },
     "AutoloadClasses": {
-        "Skin2018": "includes/2018.skin.php",
-        "Skin2018Template": "includes/2018Template.php"
+        "Skin2018": "includes/Skin2018.php",
+        "Skin2018Template": "includes/Skin2018Template.php"
     },
     "manifest_version": 1
 }
