Merge branch 'develop' into silence_fclose

Automattic · Apr 6, 2021 · 2f838ff · 2f838ff
2 parents fe0237e + 66bf0a9
commit 2f838ff
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 15 deletions.
diff --git a/WordPress-VIP-Go/ruleset-test.inc b/WordPress-VIP-Go/ruleset-test.inc
@@ -346,7 +346,7 @@ $my_notokay_func = 'extract';
 $my_notokay_func(); // Error.
 
 // WordPressVIPMinimum.Functions.RestrictedFunctions
-wp_cache_get_multi(); // Error.
+
 opcache_reset(); // Error.
 opcache_invalidate( 'test_script.php' ); // Error.
 opcache_compile_file( $var ); // Error.

diff --git a/WordPress-VIP-Go/ruleset-test.php b/WordPress-VIP-Go/ruleset-test.php
@@ -37,7 +37,6 @@
 		341 => 1,
 		342 => 1,
 		346 => 1,
-		349 => 1,
 		350 => 1,
 		351 => 1,
 		352 => 1,

diff --git a/WordPress-VIP-Go/ruleset.xml b/WordPress-VIP-Go/ruleset.xml
@@ -282,7 +282,10 @@
 	<rule ref="Generic.PHP.DisallowShortOpenTag.EchoFound">
 		<severity>0</severity>
 	</rule>
-	<rule ref="WordPress.WP.AlternativeFunctions.file_system_read_fclose">
+	<rule ref="WordPress.WP.AlternativeFunctions.file_system_read_readfile">
+		<severity>0</severity>
+	</rule>
+  <rule ref="WordPress.WP.AlternativeFunctions.file_system_read_fclose">
 		<severity>0</severity>
 	</rule>
 

diff --git a/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php b/WordPressVIPMinimum/Sniffs/Functions/RestrictedFunctionsSniff.php
@@ -25,13 +25,6 @@ class RestrictedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
 	public function getGroups() {
 
 		$groups = [
-			'wp_cache_get_multi' => [
-				'type'      => 'error',
-				'message'   => '`%s` is not supported on the WordPress.com VIP platform.',
-				'functions' => [
-					'wp_cache_get_multi',
-				],
-			],
 			'opcache' => [
 				'type'      => 'error',
 				'message'   => '`%s` is prohibited on the WordPress VIP platform due to memory corruption.',

diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.inc
@@ -15,8 +15,8 @@ $allowed_html = [
 ];
 $url = 'http://www.google.ca';
 
-wp_cache_get_mult(); // Ok - similarly-named function to wp_cache_get_multi().
-wp_cache_get_multi(); // Error.
+
+
 
 opcache_resets(); // Ok - similarly-named custom function to opcache_reset().
 opcach_invalidate ( $test_script ); // Ok - similarly-named custom function to opcache_invalidate().

diff --git a/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php b/WordPressVIPMinimum/Tests/Functions/RestrictedFunctionsUnitTest.php
@@ -25,7 +25,6 @@ class RestrictedFunctionsUnitTest extends AbstractSniffUnitTest {
 	 */
 	public function getErrorList() {
 		return [
-			19  => 1,
 			27  => 1,
 			28  => 1,
 			29  => 1,

diff --git a/WordPressVIPMinimum/ruleset-test.inc b/WordPressVIPMinimum/ruleset-test.inc
@@ -308,7 +308,7 @@ $my_notokay_func = 'extract';
 $my_notokay_func(); // Error.
 
 // WordPressVIPMinimum.Functions.RestrictedFunctions
-wp_cache_get_multi(); // Error.
+
 opcache_reset(); // Error.
 opcache_invalidate( 'test_script.php' ); // Error.
 opcache_compile_file( $var ); // Error.

diff --git a/WordPressVIPMinimum/ruleset-test.php b/WordPressVIPMinimum/ruleset-test.php
@@ -82,7 +82,6 @@
 		303 => 1,
 		304 => 1,
 		308 => 1,
-		311 => 1,
 		312 => 1,
 		313 => 1,
 		314 => 1,
-Original file line number
+Diff line change
@@ Expand Up / @@ -37,7 +37,6 @@ @@
 => 1,
 => 1,
 => 1,
-=> 1,
 => 1,
 => 1,
 => 1,
@@ Expand Down @@