From 164d67f1d69ca4f51d5304759387b1e6c06faecc Mon Sep 17 00:00:00 2001 From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com> Date: Mon, 29 Mar 2021 10:23:15 -0600 Subject: [PATCH] Remove WordPressVIPMinimum.Functions.RestrictedFunctions.get_super_admins_get_super_admins --- WordPress-VIP-Go/ruleset.xml | 3 --- .../Sniffs/Functions/RestrictedFunctionsSniff.php | 7 ------- .../Tests/Functions/RestrictedFunctionsUnitTest.inc | 4 ++-- .../Tests/Functions/RestrictedFunctionsUnitTest.php | 1 - WordPressVIPMinimum/ruleset-test.inc | 2 +- WordPressVIPMinimum/ruleset-test.php | 1 - 6 files changed, 3 insertions(+), 15 deletions(-) diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml index 52ea12db..28fab040 100644 --- a/WordPress-VIP-Go/ruleset.xml +++ b/WordPress-VIP-Go/ruleset.xml @@ -279,9 +279,6 @@ 0 - - 0 - 0 diff --git a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php index d12ec448..f0529acd 100644 --- a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php +++ b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php @@ -50,13 +50,6 @@ public function getGroups() { 'opcache_get_configuration', ], ], - 'get_super_admins' => [ - 'type' => 'error', - 'message' => '`%s` is prohibited on the WordPress.com VIP platform.', - 'functions' => [ - 'get_super_admins', - ], - ], 'internal' => [ 'type' => 'error', 'message' => '`%1$s()` is for internal use only.', diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc index c1b6e6d1..a873f7a0 100644 --- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc +++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc @@ -33,8 +33,8 @@ opcache_get_status(); // Error. opcache_get_status( false ); // Error. opcache_get_configuration(); // Error. -get_super_admin(); // Ok - similarly-named function to get_super_admins(). -get_super_admins(); // Error. + + vip_irc(); // Ok - similarly-named function to wpcom_vip_irc(). wpcom_vip_irc(); // Error. diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php index ab1e3334..e3992e95 100644 --- a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php +++ b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php @@ -34,7 +34,6 @@ public function getErrorList() { 32 => 1, 33 => 1, 34 => 1, - 37 => 1, 40 => 1, 43 => 1, 46 => 1, diff --git a/WordPressVIPMinimum/ruleset-test.inc b/WordPressVIPMinimum/ruleset-test.inc index 9c25a9f9..ae926c49 100644 --- a/WordPressVIPMinimum/ruleset-test.inc +++ b/WordPressVIPMinimum/ruleset-test.inc @@ -315,7 +315,7 @@ opcache_compile_file( $var ); // Error. opcache_is_script_cached( 'test_script.php' ); // Error. opcache_get_status(); // Error. opcache_get_configuration(); // Error. -get_super_admins(); // Error. + wpcom_vip_irc(); // Error. flush_rewrite_rules(); // Error. $wp_rewrite->flush_rules(); // Error. diff --git a/WordPressVIPMinimum/ruleset-test.php b/WordPressVIPMinimum/ruleset-test.php index 6f9b8291..f1527ffe 100644 --- a/WordPressVIPMinimum/ruleset-test.php +++ b/WordPressVIPMinimum/ruleset-test.php @@ -89,7 +89,6 @@ 315 => 1, 316 => 1, 317 => 1, - 318 => 1, 319 => 1, 320 => 1, 321 => 1,