Merge "Update mediawiki-codesniffer and parallel-lint settings"

composer.json

@@ -1,12 +1,12 @@
 {
 	"require-dev": {
-		"jakub-onderka/php-parallel-lint": "0.9.*",
-		"mediawiki/mediawiki-codesniffer": "0.3.0"
+		"jakub-onderka/php-parallel-lint": "0.9",
+		"mediawiki/mediawiki-codesniffer": "0.4.0"
 	},
 	"scripts": {
 		"test": [
 			"parallel-lint . --exclude vendor",
-			"phpcs -p"
+			"phpcs -p -s"
 		]
 	}
 }

modules/ext.math.css

@@ -1,9 +1,8 @@
 /*
-   Document   : ext.math
-   Created on : 23.09.2013, 13:55:00
-   Author     : Physikerwelt (Moritz Schubotz)
-   Description:
-       Shows browser-dependent math output.
+ * Document   : ext.math
+ * Created on : 23.09.2013, 13:55:00
+ * Author     : Physikerwelt (Moritz Schubotz)
+ * Description: Shows browser-dependent math output.
  */
 @namespace m url('http://www.w3.org/1998/Math/MathML');
 
@@ -36,13 +35,14 @@ m|math {
 .mwe-math-fallback-source-inline { display: inline; vertical-align: middle; }
 .mwe-math-fallback-source-display { display: block; margin-left: auto; margin-right: auto; }
 
-/******************************************************************************/
-/* Browser-specific hacks are bad but let's use that for now...
-   See http://browserhacks.com/ */
-
+/**
+ * Browser-specific hacks are bad but let's use that for now...
+ * See http://browserhacks.com/
+ */
 @-moz-document url-prefix() {
 	/* For Gecko browsers, hide the SVG fallback and show the MathML instead.
-       We override the style for SVG and MathML above */
+	 * We override the style for SVG and MathML above
+	 */
 	.mwe-math-mathml-a11y {
 		clip: auto;
 		overflow: visible;

modules/ext.math.desktop.css

@@ -1,14 +1,15 @@
 /*
-   Document   : ext.math.
-   Created on : 20.10.2014, 22:00:00
-   Author     : fredw (Frédéric Wang)
-   Description:
-       Additional style, to load only on desktop.
+ * Document   : ext.math.
+ * Created on : 20.10.2014, 22:00:00
+ * Author     : fredw (Frédéric Wang)
+ * Description:
+ *     Additional style, to load only on desktop.
  */
 
 @font-face {
 	/* WOFF version of Latin Modern Math.
-       See https://github.com/fred-wang/MathFonts */
+	 * See https://github.com/fred-wang/MathFonts
+	 */
 	font-family: LatinModernMathWOFF;
 	src: url(./LatinModern/latinmodern-math.woff);
 }

modules/ve-math/ve.ce.MWMathNode.css

@@ -8,4 +8,3 @@
 		display: none !important;
 	}
 }
-

phpcs.xml

@@ -2,6 +2,7 @@
 <ruleset>
 	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
 	<file>.</file>
-	<arg name="extensions" value="php"/>
+	<arg name="extensions" value="php,php5,inc"/>
+	<arg name="encoding" value="utf8"/>
 	<exclude-pattern>vendor</exclude-pattern>
 </ruleset>