Merged branch 'master' into dev

morags · morags · commit 81bffed3b716 · 2018-08-06T16:22:48.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
 .vscode/
 node_modules/
 dev/
-composer.lock
+vendor/
+composer.lock
+tests/phan/issues
diff --git a/.phpcs.xml b/.phpcs.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset>
+	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="Generic.Files.LineLength.TooLong" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+		<exclude name="Squiz.Scope.MethodScope.Missing" />
+	</rule>
+	<file>.</file>
+	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="encoding" value="UTF-8"/>
+</ruleset>
diff --git a/composer.json b/composer.json
@@ -1,16 +1,20 @@
 {
 	"require-dev": {
-		"jakub-onderka/php-parallel-lint": "0.9.2",
+		"jakub-onderka/php-parallel-lint": "1.0.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2",
-		"mediawiki/minus-x": "0.2.1"
+		"mediawiki/minus-x": "0.3.1",
+		"mediawiki/mediawiki-phan-config": "0.3.0",
+		"mediawiki/mediawiki-codesniffer": "21.0.0"
 	},
 	"scripts": {
 		"fix": [
-			"minus-x fix ."
+			"minus-x fix .",
+			"phpcbf"
 		],
 		"test": [
 			"parallel-lint . --exclude vendor --exclude node_modules",
-			"minus-x check ."
+			"minus-x check .",
+			"phpcs -sp"
 		]
 	}
 }
diff --git a/includes/2018.skin.php b/includes/2018.skin.php
@@ -5,8 +5,9 @@
  * @ingroup Skins
  */
 class Skin2018 extends SkinTemplate {
-	public $skinname = '2018', $stylename = '2018',
-		$template = 'Skin2018Template', $useHeadElement = true;
+	public $skinname = '2018';
+	public $stylename = '2018';
+	public $template = 'Skin2018Template';
 
 	/**
 	 * Add CSS via ResourceLoader
diff --git a/includes/2018Template.php b/includes/2018Template.php
@@ -24,7 +24,8 @@ public function execute() {
 		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
@@ -18,7 +18,6 @@
     "ResourceModules": {
         "skins.2018": {
             "class": "ResourceLoaderSkinModule",
-            "position": "top",
             "styles": {
                 "resources/less/styles.less": {
                     "media": "screen"
@@ -29,7 +28,6 @@
             }
         },
         "skins.2018.js": {
-            "position": "bottom",
             "scripts": [
                 "node_modules/uikit/dist/js/uikit.js",
                 "node_modules/uikit/dist/js/uikit-icons.js",
@@ -46,8 +44,8 @@
         "remoteSkinPath": "2018"
     },
     "AutoloadClasses": {
-        "Skin2018": "2018.skin.php",
-        "Skin2018Template": "2018Template.php"
+        "Skin2018": "includes/2018.skin.php",
+        "Skin2018Template": "includes/2018Template.php"
     },
     "manifest_version": 1
-}
+}
diff --git a/tests/phan/config.php b/tests/phan/config.php
@@ -0,0 +1,3 @@
+<?php
+
+return require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+<?php`
	`2`	`+`
	`3`	`+return require __DIR__ . '/../../vendor/mediawiki/mediawiki-phan-config/src/config.php';`