From 53469f5f82c53a02a8992913c029a3710d09c3b7 Mon Sep 17 00:00:00 2001
From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com>
Date: Mon, 18 Jan 2021 14:51:34 -0700
Subject: [PATCH 1/2] Exclude
 VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable due to noise

---
 WordPress-VIP-Go/ruleset.xml    | 3 ---
 WordPressVIPMinimum/ruleset.xml | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 311f308a..2fa908c8 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -234,9 +234,6 @@
 	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable">
 		<severity>3</severity>
 	</rule>
-	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable">
-		<severity>1</severity>
-	</rule>
 	<rule ref="WordPressVIPMinimum.UserExperience.AdminBarRemoval">
 		<severity>3</severity>
 	</rule>
diff --git a/WordPressVIPMinimum/ruleset.xml b/WordPressVIPMinimum/ruleset.xml
index 2ce2511c..8dfa7a50 100644
--- a/WordPressVIPMinimum/ruleset.xml
+++ b/WordPressVIPMinimum/ruleset.xml
@@ -144,7 +144,9 @@
 	</rule>
 
 	<!-- Include VariableAnalysis checks -->
-	<rule ref="VariableAnalysis"/>
+	<rule ref="VariableAnalysis">
+		<exclude name="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable"/>
+	</rule>
 
 	<!-- Prevent deprecation notice when the sniff is not explicitly included. -->
 	<rule ref="WordPressVIPMinimum.Variables.VariableAnalysis.DeprecatedSniff">

From 288159abf5681c35ff8c4e26154f6578851b6aa4 Mon Sep 17 00:00:00 2001
From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com>
Date: Fri, 22 Jan 2021 11:55:04 -0700
Subject: [PATCH 2/2] Silence rather than exclude for more user customization

---
 WordPress-VIP-Go/ruleset.xml    | 3 +++
 WordPressVIPMinimum/ruleset.xml | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 2fa908c8..9cca8ee8 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -257,6 +257,9 @@
 	</rule>
 
 	<!-- Silence is golden, these don't affect us on VIP Go -->
+	<rule ref="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable">	
+		<severity>0</severity>	
+	</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>
diff --git a/WordPressVIPMinimum/ruleset.xml b/WordPressVIPMinimum/ruleset.xml
index 8dfa7a50..2ce2511c 100644
--- a/WordPressVIPMinimum/ruleset.xml
+++ b/WordPressVIPMinimum/ruleset.xml
@@ -144,9 +144,7 @@
 	</rule>
 
 	<!-- Include VariableAnalysis checks -->
-	<rule ref="VariableAnalysis">
-		<exclude name="VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable"/>
-	</rule>
+	<rule ref="VariableAnalysis"/>
 
 	<!-- Prevent deprecation notice when the sniff is not explicitly included. -->
 	<rule ref="WordPressVIPMinimum.Variables.VariableAnalysis.DeprecatedSniff">