Skip to content

Commit 35f3305

Browse files
authored
Merge pull request #647 from Automattic/remove_get_super_admin
RestrictedFunctionsSniff: Remove get_super_admins group
2 parents 71e109b + 164d67f commit 35f3305

File tree

6 files changed

+3
-15
lines changed

6 files changed

+3
-15
lines changed

WordPress-VIP-Go/ruleset.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@
276276
<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta">
277277
<severity>0</severity>
278278
</rule>
279-
<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_super_admins_get_super_admins">
280-
<severity>0</severity>
281-
</rule>
282279
<rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
283280
<severity>0</severity>
284281
</rule>

WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ public function getGroups() {
4343
'opcache_get_configuration',
4444
],
4545
],
46-
'get_super_admins' => [
47-
'type' => 'error',
48-
'message' => '`%s` is prohibited on the WordPress.com VIP platform.',
49-
'functions' => [
50-
'get_super_admins',
51-
],
52-
],
5346
'internal' => [
5447
'type' => 'error',
5548
'message' => '`%1$s()` is for internal use only.',

WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ opcache_get_status(); // Error.
3333
opcache_get_status( false ); // Error.
3434
opcache_get_configuration(); // Error.
3535

36-
get_super_admin(); // Ok - similarly-named function to get_super_admins().
37-
get_super_admins(); // Error.
36+
37+
3838

3939
vip_irc(); // Ok - similarly-named function to wpcom_vip_irc().
4040
wpcom_vip_irc(); // Error.

WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ public function getErrorList() {
3333
32 => 1,
3434
33 => 1,
3535
34 => 1,
36-
37 => 1,
3736
40 => 1,
3837
43 => 1,
3938
46 => 1,

WordPressVIPMinimum/ruleset-test.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ opcache_compile_file( $var ); // Error.
315315
opcache_is_script_cached( 'test_script.php' ); // Error.
316316
opcache_get_status(); // Error.
317317
opcache_get_configuration(); // Error.
318-
get_super_admins(); // Error.
318+
319319
wpcom_vip_irc(); // Error.
320320
flush_rewrite_rules(); // Error.
321321
$wp_rewrite->flush_rules(); // Error.

WordPressVIPMinimum/ruleset-test.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
315 => 1,
8989
316 => 1,
9090
317 => 1,
91-
318 => 1,
9291
319 => 1,
9392
320 => 1,
9493
321 => 1,

0 commit comments

Comments
 (0)