Merge pull request #652 from Automattic/fix/614-remove-user-meta-related-errors

RestrictedFunctions/RestrictedVariables: remove usermeta related errors

Author: rebeccahum

WordPress-VIP-Go/ruleset-test.inc

@@ -284,20 +284,20 @@ if ( isset( $_GET['migSource'] ) && wp_verify_nonce( sanitize_text_field( $_GET[
 	$test = sanitize_text_field( $_GET['migSource'] ); // Ok.
 }
 
-// WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_add_user_meta
-add_user_meta( 123, $foo, $bar ); // Ok.
 
-// WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_delete_user_meta
-delete_user_meta( $foo, $bar, '123' ); // Ok.
 
-// WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_get_user_meta
-get_user_meta(); // Ok.
 
-// WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_update_user_meta
-update_user_meta( $bar, '123', $foo ); // Ok.
 
-// WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta
-$query = "SELECT * FROM $wpdb->usermeta"; // Ok.
+
+
+
+
+
+
+
+
+
+
 
 // WordPressVIPMinimum.Functions.RestrictedFunctions.site_option_delete_site_option
 delete_site_option( $foo ); // Ok.

WordPress-VIP-Go/ruleset.xml

@@ -261,21 +261,6 @@
 		<!-- We are silencing this one because VIP Go does not use Batcache-->
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_add_user_meta">
-		<severity>0</severity>
-	</rule>
-	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_delete_user_meta">
-		<severity>0</severity>
-	</rule>
-	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_get_user_meta">
-		<severity>0</severity>
-	</rule>
-	<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.user_meta_update_user_meta">
-		<severity>0</severity>
-	</rule>
-	<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta">
-		<severity>0</severity>
-	</rule>
 	<rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
 		<severity>0</severity>
 	</rule>

WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php

@@ -111,16 +111,6 @@ public function getGroups() {
 					'add_role',
 				],
 			],
-			'user_meta' => [
-				'type'      => 'error',
-				'message'   => '%s() usage is highly discouraged on WordPress.com VIP due to it being a multisite, please see https://lobby.vip.wordpress.com/wordpress-com-documentation/code-review-what-we-look-for/#wp_users-and-user_meta.',
-				'functions' => [
-					'get_user_meta',
-					'update_user_meta',
-					'delete_user_meta',
-					'add_user_meta',
-				],
-			],
 			'term_exists' => [
 				'type'      => 'error',
 				'message'   => '%s() is highly discouraged due to not being cached; please use wpcom_vip_term_exists() instead.',

WordPressVIPMinimum/Sniffs/Variables/RestrictedVariablesSniff.php

@@ -39,10 +39,9 @@ public function getGroups() {
 		return [
 			'user_meta' => [
 				'type'        => 'error',
-				'message'     => 'Usage of users/usermeta tables is highly discouraged in VIP context, For storing user additional user metadata, you should look at User Attributes.',
+				'message'     => 'Usage of users tables is highly discouraged in VIP context',
 				'object_vars' => [
 					'$wpdb->users',
-					'$wpdb->usermeta',
 				],
 			],
 			'session' => [

WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc

@@ -75,14 +75,14 @@ $y = Bar::add_role(); // Ok - calling static function of another class and not a
 add_role( 'test' ); // Error.
 \add_role(); // Error.
 
-get_post_meta( 123, 'test' ); // Ok - not using get_user_meta().
-update_post_meta( 1234, 'test', $test ); // Ok - not using update_user_meta().
-delete_post_meta( $int, $test ); // Ok - not using delete_user_meta().
-add_post_meta( $int, $test, $test ); // Ok - not using add_user_meta().
-get_user_meta(); // Error.
-update_user_meta(); // Error.
-delete_user_meta(); // Error.
-add_user_meta(); // Error.
+
+
+
+
+
+
+
+
 
 wpcom_vip_term_exists(); // Ok - VIP recommended version of term_exists().
 term_exists(); // Error.

WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php

@@ -43,10 +43,6 @@ public function getErrorList() {
 			62  => 1,
 			75  => 1,
 			76  => 1,
-			82  => 1,
-			83  => 1,
-			84  => 1,
-			85  => 1,
 			88  => 1,
 			91  => 1,
 			94  => 1,

WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.inc

@@ -4,9 +4,9 @@ $query = "SELECT * FROM $wpdb->users"; // Error.
 
 $wp_db->update( $wpdb->users, array( 'displayname' => 'Kanobe!' ), array( 'ID' => 1 ) ); // Error.
 
-$query = "SELECT * FROM $wpdb->usermeta"; // Error.
 
-$wp_db->update( $wpdb->usermeta, array( 'meta_value' => 'bar!' ), array( 'user_id' => 1, 'meta_key' => 'foo' ) ); // Error.
+
+
 
 $query = "SELECT * FROM $wpdb->posts"; // Ok.
 
@@ -20,7 +20,7 @@ $y = $_SERVER['REQUEST_URI']; // Ok.
 
 // Error.
 $query = <<<EOD
-SELECT * FROM $wpdb->usermeta
+SELECT * FROM $wpdb->users
 EOD;
 
 // Warning
@@ -29,7 +29,7 @@ Your user-agent is {$_SERVER['HTTP_USER_AGENT']}
 EOD;
 
 // phpcs:set WordPressVIPMinimum.Variables.RestrictedVariables exclude[] user_meta
-$query = "SELECT * FROM $wpdb->usermeta"; // Ok, excluded.
+$query = "SELECT * FROM $wpdb->users"; // Ok, excluded.
 
 // phpcs:set WordPressVIPMinimum.Functions.RestrictedFunctions exclude[]
 

WordPressVIPMinimum/Tests/Variables/RestrictedVariablesUnitTest.php

@@ -30,8 +30,6 @@ public function getErrorList() {
 		return [
 			3  => 1,
 			5  => 1,
-			7  => 1,
-			9  => 1,
 			23 => 1,
 			36 => 1,
 			37 => 1,

WordPressVIPMinimum/ruleset-test.inc

@@ -325,10 +325,10 @@ switch_to_blog( $blogid ); // Error.
 get_page_by_title( $page_title ); // Error.
 url_to_postid( $url ); // Error.
 \add_role(); // Error.
-get_user_meta(); // Error.
-update_user_meta(); // Error.
-delete_user_meta(); // Error.
-add_user_meta(); // Error.
+
+
+
+
 term_exists(); // Error.
 count_user_posts(); // Error.
 wp_old_slug_redirect(); // Error.

WordPressVIPMinimum/ruleset-test.php

@@ -97,10 +97,6 @@
 		325 => 1,
 		326 => 1,
 		327 => 1,
-		328 => 1,
-		329 => 1,
-		330 => 1,
-		331 => 1,
 		332 => 1,
 		333 => 1,
 		334 => 1,