Merge pull request #630 from WordPress/improve-required-plugins-header

Co-authored-by: ernilambar <[email protected]> Co-authored-by: davidperezgar <[email protected]> Co-authored-by: swissspidy <[email protected]>
WordPress · Sep 13, 2024 · 7b3bfa4 · 7b3bfa4
2 parents 4964dfc + a5b65ed
commit 7b3bfa4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/includes/Checker/Checks/Plugin_Repo/Plugin_Header_Fields_Check.php b/includes/Checker/Checks/Plugin_Repo/Plugin_Header_Fields_Check.php
@@ -211,7 +211,7 @@ public function run( Check_Result $result ) {
 		}
 
 		if ( ! empty( $plugin_header['RequiresPlugins'] ) ) {
-			if ( ! preg_match( '/^[a-z0-9-]+(?:,[a-z0-9-]+)*$/', $plugin_header['RequiresPlugins'] ) ) {
+			if ( ! preg_match( '/^[a-z0-9-]+(?:,\s*[a-z0-9-]+)*$/', $plugin_header['RequiresPlugins'] ) ) {
 				$this->add_result_warning_for_file(
 					$result,
 					sprintf(

diff --git a/tests/phpunit/testdata/plugins/test-plugin-unfiltered-uploads-with-errors/load.php b/tests/phpunit/testdata/plugins/test-plugin-unfiltered-uploads-with-errors/load.php
@@ -11,6 +11,7 @@
  * License: GPLv2 or later
  * License URI: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  * Text Domain: test-plugin-unfiltered-uploads-errors
+ * Requires Plugins: woocommerce, contact-form-7
  *
  * @package test-plugin-unfiltered-uploads-errors
  */

diff --git a/tests/phpunit/tests/Checker/Checks/Plugin_Header_Fields_Check_Tests.php b/tests/phpunit/tests/Checker/Checks/Plugin_Header_Fields_Check_Tests.php
@@ -34,4 +34,23 @@ public function test_run_with_errors() {
 			$this->assertCount( 1, wp_list_filter( $warnings['load.php'][0][0], array( 'code' => 'plugin_header_invalid_requires_plugins' ) ) );
 		}
 	}
+
+	public function test_run_with_valid_requires_plugins_header() {
+		/*
+		 * Test plugin has following valid header.
+		 * Requires Plugins: woocommerce, contact-form-7
+		 */
+
+		$check         = new Plugin_Header_Fields_Check();
+		$check_context = new Check_Context( UNIT_TESTS_PLUGIN_DIR . 'test-plugin-unfiltered-uploads-with-errors/load.php' );
+		$check_result  = new Check_Result( $check_context );
+
+		$check->run( $check_result );
+
+		$warnings = $check_result->get_warnings();
+
+		if ( is_wp_version_compatible( '6.5' ) ) {
+			$this->assertCount( 0, wp_list_filter( $warnings['load.php'][0][0], array( 'code' => 'plugin_header_invalid_requires_plugins' ) ) );
+		}
+	}
 }