diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index 989d6478..b2015b65 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -247,7 +247,7 @@ class UniversalLanguageSelectorHooks {
 				$user->setOption( 'language', $languageToSave );
 				$code = $languageToSave;
 				// Promise to sync the DB on post-send
-				DeferredUpdates::addCallableUpdate( function() use ( $user ) {
+				DeferredUpdates::addCallableUpdate( function () use ( $user ) {
 					$user->saveSettings();
 				} );
 			}
diff --git a/composer.json b/composer.json
index 13227d60..7ba18503 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
-		"mediawiki/mediawiki-codesniffer": "0.7.2",
+		"mediawiki/mediawiki-codesniffer": "0.9.0",
 		"jakub-onderka/php-console-highlighter": "0.3.2"
 	},
 	"scripts": {
diff --git a/includes/ULSJsonMessageLoader.php b/includes/ULSJsonMessageLoader.php
index 2f4cee7f..da21a6b5 100644
--- a/includes/ULSJsonMessageLoader.php
+++ b/includes/ULSJsonMessageLoader.php
@@ -44,7 +44,7 @@ class ULSJsonMessageLoader {
 			$filenames[] = __DIR__ . "/../i18n/$language.json";
 		}
 
-		$filenames = array_filter( $filenames, function( $filename ) {
+		$filenames = array_filter( $filenames, function ( $filename ) {
 			return file_exists( $filename );
 		} );
 
diff --git a/maintenance/ULSCompactLinksDisablePref.php b/maintenance/ULSCompactLinksDisablePref.php
index f53d15df..68dd2396 100644
--- a/maintenance/ULSCompactLinksDisablePref.php
+++ b/maintenance/ULSCompactLinksDisablePref.php
@@ -13,9 +13,9 @@
  * @ingroup Maintenance
  */
 
-require_once ( getenv( 'MW_INSTALL_PATH' ) !== false
+require_once getenv( 'MW_INSTALL_PATH' ) !== false
 	? getenv( 'MW_INSTALL_PATH' ) . '/maintenance/Maintenance.php'
-	: __DIR__ . '/../../../maintenance/Maintenance.php' );
+	: __DIR__ . '/../../../maintenance/Maintenance.php';
 
 class ULSCompactLinksDisablePref extends Maintenance {
 	public function __construct() {
diff --git a/phpcs.xml b/phpcs.xml
index d81a2927..c28efe8c 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,8 +1,16 @@
 <?xml version="1.0"?>
 <ruleset>
-	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki"/>
+	<rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamName" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingParamTag" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.MissingReturn" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.ParamNameNoMatch" />
+		<exclude name="MediaWiki.Commenting.FunctionComment.WrongStyle" />
+		<exclude name="MediaWiki.FunctionComment.Missing.Public" />
+	</rule>
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc"/>
-	<arg name="encoding" value="utf8"/>
+	<arg name="extensions" value="php,php5,inc" />
+	<arg name="encoding" value="UTF-8" />
 	<exclude-pattern>vendor</exclude-pattern>
 </ruleset>