From 7587f5786d49d515d39c4b82daf84c71207c25a5 Mon Sep 17 00:00:00 2001
From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com>
Date: Tue, 9 Mar 2021 08:27:40 -0700
Subject: [PATCH] WordPress-VIP-Go: Remove
 WordPress.WP.GlobalVariablesOverride.Prohibited

---
 WordPress-VIP-Go/ruleset-test.inc | 10 +++++-----
 WordPress-VIP-Go/ruleset-test.php |  2 --
 WordPress-VIP-Go/ruleset.xml      |  4 ----
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/WordPress-VIP-Go/ruleset-test.inc b/WordPress-VIP-Go/ruleset-test.inc
index a41c38e8..e3c4f98c 100644
--- a/WordPress-VIP-Go/ruleset-test.inc
+++ b/WordPress-VIP-Go/ruleset-test.inc
@@ -182,10 +182,10 @@ _ex( $some_nasty_var, 'context' ); // Error.
 echo esc_html_x( 'Something', 'context' ); // Ok.
 echo esc_html_x( $some_nasty_var, 'context' ); // Ok.
 
-// WordPress.WP.GlobalVariablesOverride.OverrideProhibited
-global $wpdb;
-$wpdb = 'test'; // Error.
-$GLOBALS['domain']['subkey'] = 'something else'; // Error.
+
+
+
+
 
 // WordPress.WP.EnqueuedResources.NonEnqueuedScript
 echo wp_kses( '<script src="' . esc_url( $url ) . '">', [ 'script' => [ 'src' => [], ], ] ); // Warning + Message.
@@ -297,7 +297,7 @@ get_user_meta(); // Ok.
 update_user_meta( $bar, '123', $foo ); // Ok.
 
 // WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta
-$query = "SELECT * FROM $wpdb->usermeta"; // Ok.
+$query = "SELECT * FROM $wpdb->usermeta"; // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis
 
 // WordPressVIPMinimum.Functions.RestrictedFunctions.site_option_delete_site_option
 delete_site_option( $foo ); // Ok.
diff --git a/WordPress-VIP-Go/ruleset-test.php b/WordPress-VIP-Go/ruleset-test.php
index 12128b66..f65f5f39 100644
--- a/WordPress-VIP-Go/ruleset-test.php
+++ b/WordPress-VIP-Go/ruleset-test.php
@@ -23,8 +23,6 @@
 		165 => 1,
 		180 => 1,
 		181 => 1,
-		187 => 1,
-		188 => 1,
 		252 => 1,
 		255 => 1,
 		256 => 1,
diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
index 05aa4e35..8faa91f0 100644
--- a/WordPress-VIP-Go/ruleset.xml
+++ b/WordPress-VIP-Go/ruleset.xml
@@ -210,10 +210,6 @@
 		<!-- We trust that translations are safe on VIP Go -->
 		<severity>1</severity>
 	</rule>
-	<rule ref="WordPress.WP.GlobalVariablesOverride.Prohibited">
-		<!-- This is often a false positive. Still nice to flag for a check -->
-		<severity>3</severity>
-	</rule>
 	<rule ref="WordPress.WP.EnqueuedResources.NonEnqueuedScript">
 		<type>warning</type>
 		<severity>3</severity>