Merge branch 'trunk' into 929-wp-uninstall-plugin-constant-check-uninstall-php

Author: ernilambar

includes/Checker/Checks/Abstract_File_Check.php

@@ -281,15 +281,18 @@ private static function get_files( Check_Context $plugin ) {
 			self::$file_list_cache[ $location ][] = $location;
 		} else {
 			$iterator = new RecursiveIteratorIterator( new RecursiveDirectoryIterator( $location ) );
+
+			$directories_to_ignore = Plugin_Request_Utility::get_directories_to_ignore();
+
+			$files_to_ignore = Plugin_Request_Utility::get_files_to_ignore();
+
 			foreach ( $iterator as $file ) {
 				if ( ! $file->isFile() ) {
 					continue;
 				}
 
 				$file_path = wp_normalize_path( $file->getPathname() );
 
-				$directories_to_ignore = Plugin_Request_Utility::get_directories_to_ignore();
-
 				// Flag to check if the file should be included or not.
 				$include_file = true;
 
@@ -301,8 +304,6 @@ private static function get_files( Check_Context $plugin ) {
 					}
 				}
 
-				$files_to_ignore = Plugin_Request_Utility::get_files_to_ignore();
-
 				foreach ( $files_to_ignore as $ignore_file ) {
 					if ( str_ends_with( $file_path, "/$ignore_file" ) ) {
 						$include_file = false;

includes/Traits/License_Utils.php

@@ -83,7 +83,7 @@ protected function is_license_valid_identifier( $license ) {
 	 * @return bool true if the license is GPL compatible, otherwise false.
 	 */
 	protected function is_license_gpl_compatible( $license ) {
-		$match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache2|MPL20|ISC/im', $license );
+		$match = preg_match( '/GPL|GNU|MIT|FreeBSD|New BSD|BSD-3-Clause|BSD 3 Clause|OpenLDAP|Expat|Apache2|MPL20|ISC|CC0/im', $license );
 
 		return ( false === $match || 0 === $match ) ? false : true;
 	}

package-lock.json

@@ -10,8 +10,8 @@
     "npm": ">=10.2.3"
   },
   "devDependencies": {
-    "@wordpress/env": "^10.24.0",
-    "@wordpress/scripts": "^30.17.0",
+    "@wordpress/env": "^10.25.0",
+    "@wordpress/scripts": "^30.18.0",
     "gherkin-lint": "^4.2.4",
     "patch-package": "^8.0.0"
   },

package.json

@@ -163,11 +163,6 @@
 		<severity>7</severity>
 	</rule>
 
-	<!-- Call-time pass-by-reference has been deprecated since PHP 5.3 and should not be used. -->
-	<rule ref="Generic.Functions.CallTimePassByReference">
-		<severity>7</severity>
-	</rule>
-
 	<!-- Check for missing required function parameters. -->
 	<rule ref="PluginCheck.CodeAnalysis.RequiredFunctionParameters">
 		<severity>7</severity>

phpcs-rulesets/plugin-review.xml

@@ -35,8 +35,6 @@
 
 $encoded_value = json_encode( array( 'key' => 'value' ) );
 
-custom_function(&$myvar);
-
 file_get_contents( $url );
 file_put_contents();
 

tests/phpunit/testdata/plugins/test-plugin-review-phpcs-errors/load.php

@@ -45,23 +45,20 @@ public function test_run_with_errors() {
 		// Check for PluginCheck.CodeAnalysis.RequiredFunctionParameters.parse_str_resultMissing error on Line no 34 and column no at 1.
 		$this->assertSame( 'PluginCheck.CodeAnalysis.RequiredFunctionParameters.parse_str_resultMissing', $errors['load.php'][34][1][0]['code'] );
 
-		// Check for Generic.Functions.CallTimePassByReference.NotAllowed error on Line no 38 and column no 16.
-		$this->assertSame( 'Generic.Functions.CallTimePassByReference.NotAllowed', $errors['load.php'][38][16][0]['code'] );
-
 		// Check for Generic.Files.ByteOrderMark.Found error on Line no 1 and column no 1.
 		$this->assertSame( 'Generic.Files.ByteOrderMark.Found', $errors['file-with-bom.php'][1][1][0]['code'] );
 
 		// There should not be WordPress.WP.AlternativeFunctions.json_encode_json_encode error on Line no 36 and column no at 18.
 		$this->assertCount( 0, wp_list_filter( $errors['load.php'][36][18], array( 'code' => 'WordPress.WP.AlternativeFunctions.json_encode_json_encode' ) ) );
 
-		// There should not be WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents error on Line no 40 and column no 1.
-		$this->assertCount( 0, wp_list_filter( $errors['load.php'][40][1], array( 'code' => 'WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents' ) ) );
+		// There should not be WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents error on Line no 38 and column no 1.
+		$this->assertCount( 0, wp_list_filter( $errors['load.php'][38][1], array( 'code' => 'WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents' ) ) );
 
-		// There should not be WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents error on Line no 41 and column no 1.
-		$this->assertCount( 0, wp_list_filter( $errors['load.php'][41][1], array( 'code' => 'WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents' ) ) );
+		// There should not be WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents error on Line no 39 and column no 1.
+		$this->assertCount( 0, wp_list_filter( $errors['load.php'][39][1], array( 'code' => 'WordPress.WP.AlternativeFunctions.file_system_operations_file_put_contents' ) ) );
 
-		// Check for PluginCheck.CodeAnalysis.DiscouragedFunctions.load_plugin_textdomainFound error on Line no 43 and column no at 1.
-		$this->assertSame( 'PluginCheck.CodeAnalysis.DiscouragedFunctions.load_plugin_textdomainFound', $errors['load.php'][43][1][0]['code'] );
+		// Check for PluginCheck.CodeAnalysis.DiscouragedFunctions.load_plugin_textdomainFound error on Line no 41 and column no at 1.
+		$this->assertSame( 'PluginCheck.CodeAnalysis.DiscouragedFunctions.load_plugin_textdomainFound', $errors['load.php'][41][1][0]['code'] );
 
 		// Check for WordPress.Security.ValidatedSanitizedInput warnings on Line no 15 and column no at 27.
 		$this->assertCount( 1, wp_list_filter( $warnings['load.php'][15][27], array( 'code' => 'WordPress.Security.ValidatedSanitizedInput.InputNotValidated' ) ) );

tests/phpunit/tests/Checker/Checks/Plugin_Review_PHPCS_Check_Tests.php

@@ -112,6 +112,9 @@ public function data_license_gpl_compatibility() {
 			array( 'OpenLDAP', true ),
 			array( 'Expat', true ),
 			array( 'ISC', true ),
+			array( 'CC0', true ),
+			array( 'CC0-1.0', true ),
+			array( 'CC0 1.0 Universal', true ),
 
 			array( 'EPL', false ),
 			array( 'EUPL', false ),