Merge pull request #763 from Automattic/fix/588-variableanalysis-improve-config

Author: GaryJones

WordPress-VIP-Go/ruleset.xml

@@ -239,14 +239,6 @@
 		<severity>0</severity>
 	</rule>
 
-	<!-- Do not report on undefined variables before require nor in file scope. -->
-	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
-		<properties>
-			<property name="allowUnusedVariablesBeforeRequire" value="true"/>
-			<property name="allowUndefinedVariablesInFileScope" value="true"/>
-		</properties>
-	</rule>
-
 	<rule ref="WordPress.DB.SlowDBQuery.slow_db_query_meta_key">
 		<!-- We are silencing this one because VIP Go has a combined index on meta_key, meta_value-->
 		<severity>0</severity>

WordPressVIPMinimum/ruleset.xml

@@ -145,6 +145,13 @@
 
 	<!-- Include VariableAnalysis checks -->
 	<rule ref="VariableAnalysis"/>
+	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
+		<properties>
+			<!-- Do not report on unused variables before require nor usused or undefined variables in file scope. -->
+			<property name="allowUnusedVariablesBeforeRequire" value="true"/>
+			<property name="allowUndefinedVariablesInFileScope" value="true"/>
+		</properties>
+	</rule>
 
 	<!-- Prevent deprecation notice when the sniff is not explicitly included. -->
 	<rule ref="WordPressVIPMinimum.Variables.VariableAnalysis.DeprecatedSniff">