Skip to content

RestrictedFunctionsSniff: Remove site_option family #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2021
Merged

RestrictedFunctionsSniff: Remove site_option family #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1382862
RestrictedFunctionsSniff - remove site_option family
rebeccahum Mar 26, 2021
b7bf01e
Fix WordPressVIPMinimum ruleset test cases for site_option grouping i…
rebeccahum Mar 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions WordPress-VIP-Go/ruleset.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,15 +279,6 @@
<rule ref="WordPressVIPMinimum.Variables.RestrictedVariables.user_meta__wpdb__usermeta">
<severity>0</severity>
</rule>
<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.site_option_delete_site_option">
<severity>0</severity>
</rule>
<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.site_option_update_site_option">
<severity>0</severity>
</rule>
<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.site_option_add_site_option">
<severity>0</severity>
</rule>
<rule ref="WordPressVIPMinimum.Functions.RestrictedFunctions.get_super_admins_get_super_admins">
<severity>0</severity>
</rule>
Expand Down
9 changes: 0 additions & 9 deletions WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,15 +254,6 @@ public function getGroups() {
'lchown',
],
],
'site_option' => [
'type' => 'error',
'message' => '%s() will overwrite network option values, please use the `*_option()` equivalent instead (e.g. `update_option()`).',
'functions' => [
'add_site_option',
'update_site_option',
'delete_site_option',
],
],
'stats_get_csv' => [
'type' => 'error',
'message' => 'Using `%s` outside of Jetpack context pollutes the stats_cache entry in the wp_options table. We recommend building a custom function instead.',
Expand Down
12 changes: 6 additions & 6 deletions WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,12 +215,12 @@ $c->create_function = 'bar' . ( 1 === 1 ?? 'foo' ); // Ok.
$wp_random_testing = create_function2( '$a, $b', 'return ( $b / $a ); '); // Ok.
$wp_random_testing = create_function3( '$a, $b', 'return ( $b / $a ); '); // Ok.

add_site_option( $foo, 'bar' ); // Warning.
add_option( $foo, 'bar' ); // Ok.
update_site_option( $bar, 'foo' ); // Warning.
update_option( 'foo', $bar ); // Ok.
delete_site_option( $foo ); // Warning.
delete_option( $bar ); // Ok.







wpcom_vip_get_page_by_path(); // Ok - VIP recommended version of get_page_by_path().
get_page_by_path( $page_path ); // Warning.
Expand Down
3 changes: 0 additions & 3 deletions WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,6 @@ public function getErrorList() {
198 => 1,
199 => 1,
200 => 1,
218 => 1,
220 => 1,
222 => 1,
228 => 1,
];
}
Expand Down
6 changes: 3 additions & 3 deletions WordPressVIPMinimum/ruleset-test.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,9 +390,9 @@ chown(); // Error.
chmod(); // Error.
lchgrp(); // Error.
lchown(); // Error.
add_site_option( 'foo', $bar ); // Error.
update_site_option( $bar, $foo, true ); // Error.
delete_site_option( $foo ); // Error.



wp_mail(); // Warning.
mail(); // Warning.
is_multi_author(); // Warning.
Expand Down
3 changes: 0 additions & 3 deletions WordPressVIPMinimum/ruleset-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@
390 => 1,
391 => 1,
392 => 1,
393 => 1,
394 => 1,
395 => 1,
402 => 1,
415 => 1,
425 => 1,
Expand Down