Merge pull request #293 from WordPress/update/build-dev-deps

Update build dev dependency
WordPress · Oct 18, 2023 · 6b28da3 · 6b28da3
2 parents 14104f4 + 2606c97
commit 6b28da3
Show file tree

Hide file tree

Showing 21 changed files with 211 additions and 193 deletions.
diff --git a/build-cs/composer.json b/build-cs/composer.json
@@ -7,7 +7,7 @@
     "phpstan/extension-installer": "^1.2",
     "slevomat/coding-standard": "^8.9",
     "szepeviktor/phpstan-wordpress": "^1.1",
-    "wp-coding-standards/wpcs": "dev-develop#fca9d9e"
+    "wp-coding-standards/wpcs": "^3.0.0"
   },
   "config": {
     "allow-plugins": {

diff --git a/build-cs/composer.lock b/build-cs/composer.lock
diff --git a/includes/CLI/Plugin_Check_Command.php b/includes/CLI/Plugin_Check_Command.php
@@ -334,7 +334,7 @@ private function flatten_file_results( $file_errors, $file_warnings ) {
 
 		usort(
 			$file_results,
-			static function( $a, $b ) {
+			static function ( $a, $b ) {
 				if ( $a['line'] < $b['line'] ) {
 					return -1;
 				}

diff --git a/includes/Checker/Abstract_Check_Runner.php b/includes/Checker/Abstract_Check_Runner.php
@@ -247,7 +247,7 @@ final public function prepare() {
 			return $preparation->prepare();
 		}
 
-		return function() {};
+		return function () {};
 	}
 
 	/**

diff --git a/includes/Checker/Check_Categories.php b/includes/Checker/Check_Categories.php
@@ -41,7 +41,7 @@ public static function get_categories() {
 			$categories = array_values(
 				array_filter(
 					$constants,
-					static function( $key ) {
+					static function ( $key ) {
 						return strpos( $key, 'CATEGORY_' ) === 0;
 					},
 					ARRAY_FILTER_USE_KEY
@@ -64,7 +64,7 @@ static function( $key ) {
 	public static function filter_checks_by_categories( array $checks, array $categories ) {
 		return array_filter(
 			$checks,
-			static function( $check ) use ( $categories ) {
+			static function ( $check ) use ( $categories ) {
 				// Return true if at least one of the check categories is among the filter categories.
 				return (bool) array_intersect( $check->get_categories(), $categories );
 			}

diff --git a/includes/Checker/Checks.php b/includes/Checker/Checks.php
@@ -41,7 +41,7 @@ public function run_checks( Check_Context $context, array $checks ) {
 		// Run the checks.
 		array_walk(
 			$checks,
-			function( Check $check ) use ( $result ) {
+			function ( Check $check ) use ( $result ) {
 				$this->run_check_with_result( $check, $result );
 			}
 		);

diff --git a/includes/Checker/Checks/Abstract_File_Check.php b/includes/Checker/Checks/Abstract_File_Check.php
@@ -95,7 +95,7 @@ final protected static function filter_files_by_extensions( array $files, array
 		return array_values(
 			array_filter(
 				$files,
-				static function( $file ) use ( $lookup ) {
+				static function ( $file ) use ( $lookup ) {
 					return isset( $lookup[ pathinfo( $file, PATHINFO_EXTENSION ) ] );
 				}
 			)

diff --git a/includes/Checker/Checks/Enqueued_Scripts_Size_Check.php b/includes/Checker/Checks/Enqueued_Scripts_Size_Check.php
@@ -22,7 +22,8 @@
  */
 class Enqueued_Scripts_Size_Check extends Abstract_Runtime_Check implements With_Shared_Preparations {
 
-	use URL_Aware, Stable_Check;
+	use URL_Aware;
+	use Stable_Check;
 
 	/**
 	 * Threshold for script size to surface a warning for.
@@ -79,7 +80,7 @@ public function prepare() {
 		// Backup the original values for the global state.
 		$this->backup_globals();
 
-		return function() use ( $orig_scripts ) {
+		return function () use ( $orig_scripts ) {
 			if ( is_null( $orig_scripts ) ) {
 				unset( $GLOBALS['wp_scripts'] );
 			} else {
@@ -100,7 +101,7 @@ public function prepare() {
 	 */
 	public function get_shared_preparations() {
 		$demo_posts = array_map(
-			static function( $post_type ) {
+			static function ( $post_type ) {
 				return array(
 					'post_title'   => "Demo {$post_type} post",
 					'post_content' => 'Test content',

diff --git a/includes/Checker/Checks/Enqueued_Styles_Scope_Check.php b/includes/Checker/Checks/Enqueued_Styles_Scope_Check.php
@@ -22,7 +22,8 @@
  */
 class Enqueued_Styles_Scope_Check extends Abstract_Runtime_Check implements With_Shared_Preparations {
 
-	use URL_Aware, Stable_Check;
+	use URL_Aware;
+	use Stable_Check;
 
 	/**
 	 * List of viewable post types.
@@ -76,7 +77,7 @@ public function prepare() {
 		// Backup the original values for the global state.
 		$this->backup_globals();
 
-		return function() use ( $orig_scripts ) {
+		return function () use ( $orig_scripts ) {
 			if ( is_null( $orig_scripts ) ) {
 				unset( $GLOBALS['wp_styles'] );
 			} else {
@@ -97,7 +98,7 @@ public function prepare() {
 	 */
 	public function get_shared_preparations() {
 		$demo_posts = array_map(
-			static function( $post_type ) {
+			static function ( $post_type ) {
 				return array(
 					'post_title'   => "Demo {$post_type} post",
 					'post_content' => 'Test content',

diff --git a/includes/Checker/Checks/File_Type_Check.php b/includes/Checker/Checks/File_Type_Check.php
@@ -137,13 +137,13 @@ protected function look_for_vcs_directories( Check_Result $result, array $files
 		$vcs_directories = array_filter(
 			array_unique(
 				array_map(
-					function( $file ) {
+					function ( $file ) {
 						return dirname( $file );
 					},
 					$files
 				)
 			),
-			function( $directory ) use ( $directories ) {
+			function ( $directory ) use ( $directories ) {
 				return isset( $directories[ basename( $directory ) ] );
 			}
 		);

diff --git a/includes/Checker/Preparations/Force_Single_Plugin_Preparation.php b/includes/Checker/Preparations/Force_Single_Plugin_Preparation.php
@@ -67,7 +67,7 @@ public function prepare() {
 		add_filter( 'default_option_active_plugins', array( $this, 'filter_active_plugins' ) );
 
 		// Return the cleanup function.
-		return function() {
+		return function () {
 			remove_filter( 'option_active_plugins', array( $this, 'filter_active_plugins' ) );
 			remove_filter( 'default_option_active_plugins', array( $this, 'filter_active_plugins' ) );
 		};

diff --git a/includes/Checker/Preparations/Use_Minimal_Theme_Preparation.php b/includes/Checker/Preparations/Use_Minimal_Theme_Preparation.php
@@ -80,7 +80,7 @@ public function prepare() {
 		}
 
 		// Return the cleanup function.
-		return function() {
+		return function () {
 			global $wp_theme_directories;
 
 			remove_filter( 'template', array( $this, 'get_theme_slug' ) );

diff --git a/includes/Checker/Runtime_Environment_Setup.php b/includes/Checker/Runtime_Environment_Setup.php
@@ -126,7 +126,7 @@ public function can_set_up() {
 		} else {
 			// Get the correct Plugin Check directory when run too early.
 			if ( ! defined( 'WP_PLUGIN_CHECK_PLUGIN_DIR_PATH' ) ) {
-				$object_cache_copy = dirname( dirname( __DIR__ ) ) . '/plugin-check/drop-ins/object-cache.copy.php';
+				$object_cache_copy = dirname( __DIR__, 2 ) . '/plugin-check/drop-ins/object-cache.copy.php';
 			} else {
 				$object_cache_copy = WP_PLUGIN_CHECK_PLUGIN_DIR_PATH . 'drop-ins/object-cache.copy.php';
 			}

diff --git a/includes/Utilities/Plugin_Request_Utility.php b/includes/Utilities/Plugin_Request_Utility.php
@@ -95,7 +95,7 @@ public static function initialize_runner() {
 			if ( $runner->is_plugin_check() ) {
 				add_action(
 					'muplugins_loaded',
-					function() use ( $runner ) {
+					function () use ( $runner ) {
 						static::$cleanup = $runner->prepare();
 						static::$runner  = $runner;
 					}

diff --git a/tests/phpunit/Checker/AJAX_Runner_Tests.php b/tests/phpunit/Checker/AJAX_Runner_Tests.php
@@ -67,7 +67,7 @@ public function test_prepare_with_runtime_check() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'runtime_check' => new Runtime_Check(),
 				);
@@ -104,7 +104,7 @@ public function test_prepare_with_static_check() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'empty_check' => new Empty_Check(),
 				);
@@ -136,7 +136,7 @@ public function test_run() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'empty_check' => new WordPress\Plugin_Check\Test_Data\Empty_Check(),
 				);
@@ -160,7 +160,7 @@ public function test_run_with_errors() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'error_check' => new Error_Check(),
 				);

diff --git a/tests/phpunit/Checker/CLI_Runner_Tests.php b/tests/phpunit/Checker/CLI_Runner_Tests.php
@@ -62,7 +62,7 @@ public function test_prepare_with_runtime_check() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'runtime-check' => new Runtime_Check(),
 				);
@@ -102,7 +102,7 @@ public function test_prepare_with_static_check() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'empty-check' => new Empty_Check(),
 				);
@@ -137,7 +137,7 @@ public function test_run() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'empty-check' => new WordPress\Plugin_Check\Test_Data\Empty_Check(),
 				);
@@ -164,7 +164,7 @@ public function test_run_with_errors() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'error-check' => new Error_Check(),
 				);

diff --git a/tests/phpunit/Checker/Checks_Tests.php b/tests/phpunit/Checker/Checks_Tests.php
@@ -34,7 +34,7 @@ public function test_run_checks() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) use ( $all_checks ) {
+			function ( $checks ) use ( $all_checks ) {
 				return $all_checks;
 			}
 		);
@@ -58,7 +58,7 @@ public function test_run_checks_with_error() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) use ( $all_checks ) {
+			function ( $checks ) use ( $all_checks ) {
 				return $all_checks;
 			}
 		);

diff --git a/tests/phpunit/Utilities/Plugin_Request_Utility_Tests.php b/tests/phpunit/Utilities/Plugin_Request_Utility_Tests.php
@@ -94,7 +94,7 @@ public function test_destroy_runner_with_cli() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'runtime_check' => new Runtime_Check(),
 				);
@@ -138,7 +138,7 @@ public function test_destroy_runner_with_ajax() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'runtime_check' => new Runtime_Check(),
 				);
@@ -227,7 +227,7 @@ public function test_plugin_without_error_for_ignore_directories() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'i18n_usage_check' => new I18n_Usage_Check(),
 				);
@@ -271,7 +271,7 @@ public function test_plugin_with_error_for_ignore_directories() {
 
 		add_filter(
 			'wp_plugin_check_checks',
-			function( $checks ) {
+			function ( $checks ) {
 				return array(
 					'i18n_usage_check' => new I18n_Usage_Check(),
 				);

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
@@ -5,7 +5,7 @@
  * @package plugin-check
  */
 
-define( 'TESTS_PLUGIN_DIR', dirname( dirname( __DIR__ ) ) );
+define( 'TESTS_PLUGIN_DIR', dirname( __DIR__, 2 ) );
 define( 'UNIT_TESTS_PLUGIN_DIR', TESTS_PLUGIN_DIR . '/tests/phpunit/testdata/plugins/' );
 
 if ( file_exists( TESTS_PLUGIN_DIR . '/vendor/autoload.php' ) ) {

diff --git a/tests/phpunit/utils/TestCase/Runtime_Check_UnitTestCase.php b/tests/phpunit/utils/TestCase/Runtime_Check_UnitTestCase.php
@@ -58,7 +58,7 @@ protected function prepare_environment( Check $check, Check_Context $context ) {
 		}
 
 		// Return the cleanup function.
-		return function() use ( $cleanups ) {
+		return function () use ( $cleanups ) {
 			foreach ( $cleanups as $cleanup ) {
 				$cleanup();
 			}

diff --git a/tests/phpunit/utils/Traits/With_Mock_Filesystem.php b/tests/phpunit/utils/Traits/With_Mock_Filesystem.php
@@ -18,13 +18,13 @@ protected function set_up_mock_filesystem() {
 
 		add_filter(
 			'filesystem_method_file',
-			function() {
+			function () {
 				return TESTS_PLUGIN_DIR . '/testdata/Filesystem/WP_Filesystem_MockFilesystem.php';
 			}
 		);
 		add_filter(
 			'filesystem_method',
-			function() {
+			function () {
 				return 'MockFilesystem';
 			}
 		);
@@ -45,13 +45,13 @@ protected function set_up_failing_mock_filesystem() {
 
 		add_filter(
 			'filesystem_method_file',
-			function() {
+			function () {
 				return TESTS_PLUGIN_DIR . '/testdata/Filesystem/WP_Filesystem_FailingMockFilesystem.php';
 			}
 		);
 		add_filter(
 			'filesystem_method',
-			function() {
+			function () {
 				return 'FailingMockFilesystem';
 			}
 		);