From: Reedy <reedy@wikimedia.org>
Date: Sat, 26 Sep 2015 14:51:52 +0000 (+0100)
Subject: Re-enable MediaWiki.VariableAnalysis.UnusedGlobalVariables
X-Git-Tag: 1.31.0-rc.0~9806^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=ca4c29008261413b23beeebf2913dd16659ccc96;p=lhc%2Fweb%2Fwiklou.git

Re-enable MediaWiki.VariableAnalysis.UnusedGlobalVariables

Globals are used in included file, so ignore warning in this case

Change-Id: I50315425827cc49eac3ca943a5a8952d0292ce23
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 72e11dbb7e..d98ca797ea 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -538,9 +538,11 @@ abstract class Installer {
 		global $wgAutoloadClasses;
 		$wgAutoloadClasses = array();
 
+		// @codingStandardsIgnoreStart
 		// LocalSettings.php should not call functions, except wfLoadSkin/wfLoadExtensions
 		// Define the required globals here, to ensure, the functions can do it work correctly.
 		global $wgExtensionDirectory, $wgStyleDirectory;
+		// @codingStandardsIgnoreEnd
 
 		MediaWiki\suppressWarnings();
 		$_lsExists = file_exists( "$IP/LocalSettings.php" );
diff --git a/phpcs.xml b/phpcs.xml
index f34b274edb..f5156b3b6e 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -9,7 +9,6 @@
 		<exclude name="MediaWiki.WhiteSpace.SpaceyParenthesis.SingleSpaceAfterOpenParenthesis"/>
 		<exclude name="Squiz.Classes.ValidClassName.NotCamelCaps"/>
 		<exclude name="Generic.CodeAnalysis.ForLoopWithTestFunctionCall.NotAllowed"/>
-		<exclude name="MediaWiki.VariableAnalysis.UnusedGlobalVariables"/>
 		<exclude name="MediaWiki.WhiteSpace.SpaceAfterControlStructure.Incorrect"/>
 		<exclude name="PSR2.Namespaces.NamespaceDeclaration.BlankLineAfter"/>
 		<exclude name="PSR2.Methods.MethodDeclaration.AbstractAfterVisibility"/>