From 330dd4cf6bf630104f6cd6ddefafef8f3367226b Mon Sep 17 00:00:00 2001
From: Gudmundur Haraldsson <gudmundur.haraldsson@automattic.com>
Date: Wed, 16 Jun 2021 13:04:27 +0000
Subject: [PATCH 1/2] Update ruleset.xml to configure VariableAnalysis

---
 WordPress-VIP-Go/ruleset.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index ba9099a2..60e2dc12 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -251,6 +251,16 @@
 	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable">
 		<severity>0</severity>
 	</rule>
+
+	<!-- Do not report on undefined variables before require nor
+	     in file scope. See discussion here: https://github.com/Automattic/vip-go-ci/issues/120 --> 
+	<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>

From 1d378b2c430c55e22479cfa77ab119061eec692d Mon Sep 17 00:00:00 2001
From: Gudmundur Haraldsson <gudmundur.haraldsson@automattic.com>
Date: Wed, 16 Jun 2021 13:24:07 +0000
Subject: [PATCH 2/2] Fix XML linting issue

---
 WordPress-VIP-Go/ruleset.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 60e2dc12..0b144b3f 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -252,8 +252,7 @@
 		<severity>0</severity>
 	</rule>
 
-	<!-- Do not report on undefined variables before require nor
-	     in file scope. See discussion here: https://github.com/Automattic/vip-go-ci/issues/120 --> 
+	<!-- Do not report on undefined variables before require nor in file scope. -->
 	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis">
 		<properties>
 			<property name="allowUnusedVariablesBeforeRequire" value="true"/>