From f3903bda7461aa0180e7e18420e3732c47c6c238 Mon Sep 17 00:00:00 2001 From: rejaulalomkhan Date: Thu, 29 Oct 2026 20:31:39 +0600 Subject: [PATCH] Tests: Make data providers in tests/phpunit/tests/blocks/ public and static. Declares data provider methods as \public static\ across \editor.php\, \ egister.php\, \ ender.php\, \supportedStyles.php\, \wpBlock.php\, \wpBlockParser.php\, and \wpBlockType.php\. See #66211. --- tests/phpunit/tests/blocks/editor.php | 4 ++-- tests/phpunit/tests/blocks/register.php | 10 +++++----- tests/phpunit/tests/blocks/render.php | 10 +++++----- tests/phpunit/tests/blocks/supportedStyles.php | 2 +- tests/phpunit/tests/blocks/wpBlock.php | 4 ++-- tests/phpunit/tests/blocks/wpBlockParser.php | 10 +++++----- tests/phpunit/tests/blocks/wpBlockType.php | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/phpunit/tests/blocks/editor.php b/tests/phpunit/tests/blocks/editor.php index c5755ff434b82..5055aab4d999e 100644 --- a/tests/phpunit/tests/blocks/editor.php +++ b/tests/phpunit/tests/blocks/editor.php @@ -375,7 +375,7 @@ public function test_get_default_block_editor_settings_auto_attach_media_enabled * * @return array[] */ - public function data_get_default_block_editor_settings_auto_attach_media_enabled() { + public static function data_get_default_block_editor_settings_auto_attach_media_enabled() { return array( 'attachment pages disabled' => array( 0, true ), 'attachment pages enabled' => array( 1, false ), @@ -831,7 +831,7 @@ public function test_get_classic_theme_supports_block_editor_settings() { * * @return array */ - public function data_block_editor_rest_api_preload_adds_missing_leading_slash() { + public static function data_block_editor_rest_api_preload_adds_missing_leading_slash() { return array( 'a string without a slash' => array( 'preload_paths' => array( 'wp/v2/blocks' ), diff --git a/tests/phpunit/tests/blocks/register.php b/tests/phpunit/tests/blocks/register.php index 548be49271c40..1ffc91a486fa0 100644 --- a/tests/phpunit/tests/blocks/register.php +++ b/tests/phpunit/tests/blocks/register.php @@ -754,7 +754,7 @@ public function test_register_block_style_handle_uses_correct_core_stylesheet( $ } } - public function data_register_block_style_handle_uses_correct_core_stylesheet() { + public static function data_register_block_style_handle_uses_correct_core_stylesheet() { return array( 'block with style' => array( WPINC . '/blocks/archives/block.json', @@ -1078,7 +1078,7 @@ public function test_block_registers_with_args_override_returns_false_when_name_ * * @return array[] */ - public function data_register_block_registers_with_args_override_returns_false_when_name_is_missing() { + public static function data_register_block_registers_with_args_override_returns_false_when_name_is_missing() { return array( 'no block.json file and no name argument' => array( 'file' => '', // No block.json file. @@ -1350,7 +1350,7 @@ public function test_register_block_type_accepts_editor_script_array( $editor_sc * * @return array */ - public function data_register_block_type_accepts_editor_script_array() { + public static function data_register_block_type_accepts_editor_script_array() { return array( 'an empty array' => array( 'editor_script' => array(), @@ -1416,7 +1416,7 @@ public function test_register_block_type_throws_doing_it_wrong( $editor_script, * * @return array */ - public function data_register_block_type_throws_doing_it_wrong() { + public static function data_register_block_type_throws_doing_it_wrong() { return array( 'a non-string array' => array( 'editor_script' => array( null, false, true, -1, 0, 1, -1.0, 0.0, 1.0, INF, NAN, new stdClass() ), @@ -1607,7 +1607,7 @@ public function test_register_block_style_name_contains_spaces( array $block_sty * * @return array */ - public function data_register_block_style_name_contains_spaces() { + public static function data_register_block_style_name_contains_spaces() { return array( 'multiple spaces' => array( array( diff --git a/tests/phpunit/tests/blocks/render.php b/tests/phpunit/tests/blocks/render.php index 7b20dac147601..7791c7d7c94e7 100644 --- a/tests/phpunit/tests/blocks/render.php +++ b/tests/phpunit/tests/blocks/render.php @@ -183,7 +183,7 @@ public function test_blocks_arent_autopeed() { /** * @ticket 45109 */ - public function data_do_block_test_filenames() { + public static function data_do_block_test_filenames() { self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures'; $fixture_filenames = array_merge( @@ -194,14 +194,14 @@ public function data_do_block_test_filenames() { $fixture_filenames = array_values( array_unique( array_map( - array( $this, 'clean_fixture_filename' ), + array( __CLASS__, 'clean_fixture_filename' ), $fixture_filenames ) ) ); return array_map( - array( $this, 'pass_parser_fixture_filenames' ), + array( __CLASS__, 'pass_parser_fixture_filenames' ), $fixture_filenames ); } @@ -476,7 +476,7 @@ public function test_dynamic_block_gets_rendered_inner_dynamic_blocks() { * @param string $filename The filename to clean. * @return string The cleaned fixture name. */ - protected function clean_fixture_filename( $filename ) { + protected static function clean_fixture_filename( $filename ) { $filename = wp_basename( $filename ); $filename = preg_replace( '/\..+$/', '', $filename ); return $filename; @@ -490,7 +490,7 @@ protected function clean_fixture_filename( $filename ) { * @param string $filename The cleaned fixture name. * @return array The input and expected output filenames for that fixture. */ - protected function pass_parser_fixture_filenames( $filename ) { + protected static function pass_parser_fixture_filenames( $filename ) { return array( "$filename.html", "$filename.server.html", diff --git a/tests/phpunit/tests/blocks/supportedStyles.php b/tests/phpunit/tests/blocks/supportedStyles.php index a6fd8b598a28f..6f7d11bdc015a 100644 --- a/tests/phpunit/tests/blocks/supportedStyles.php +++ b/tests/phpunit/tests/blocks/supportedStyles.php @@ -800,7 +800,7 @@ public function test_get_block_wrapper_attributes_merge_and_override( array $blo * expected_attribute: string * }> Array of test cases. */ - public function data_get_block_wrapper_attributes_merge_or_override(): array { + public static function data_get_block_wrapper_attributes_merge_or_override(): array { return array( 'extra style attributes are merged with block values' => array( 'block_type_settings' => array( diff --git a/tests/phpunit/tests/blocks/wpBlock.php b/tests/phpunit/tests/blocks/wpBlock.php index ab75616a7ec3a..3095400b9262c 100644 --- a/tests/phpunit/tests/blocks/wpBlock.php +++ b/tests/phpunit/tests/blocks/wpBlock.php @@ -365,7 +365,7 @@ public function test_render_applies_dynamic_render_block_filter() { * * @return array */ - public function data_provider_test_render_enqueues_scripts_and_styles(): array { + public static function data_provider_test_render_enqueues_scripts_and_styles(): array { $block_markup = <<<'HTML'
@@ -1508,7 +1508,7 @@ public function test_block_has_support_string( $block_data, $support, $expected, /** * Data provider for test_block_has_support_string */ - public function data_block_has_support_string() { + public static function data_block_has_support_string() { return array( array( array(), diff --git a/tests/phpunit/tests/blocks/wpBlockParser.php b/tests/phpunit/tests/blocks/wpBlockParser.php index e1c315c1694e8..635dbf6090088 100644 --- a/tests/phpunit/tests/blocks/wpBlockParser.php +++ b/tests/phpunit/tests/blocks/wpBlockParser.php @@ -74,7 +74,7 @@ public function test_default_parser_output( $html_filename, $parsed_json_filenam /** * @ticket 45109 */ - public function data_parsing_test_filenames() { + public static function data_parsing_test_filenames() { self::$fixtures_dir = DIR_TESTDATA . '/blocks/fixtures'; $fixture_filenames = array_merge( @@ -85,14 +85,14 @@ public function data_parsing_test_filenames() { $fixture_filenames = array_values( array_unique( array_map( - array( $this, 'clean_fixture_filename' ), + array( __CLASS__, 'clean_fixture_filename' ), $fixture_filenames ) ) ); return array_map( - array( $this, 'pass_parser_fixture_filenames' ), + array( __CLASS__, 'pass_parser_fixture_filenames' ), $fixture_filenames ); } @@ -105,7 +105,7 @@ public function data_parsing_test_filenames() { * @param string $filename The filename to clean. * @return string The cleaned fixture name. */ - protected function clean_fixture_filename( $filename ) { + protected static function clean_fixture_filename( $filename ) { $filename = wp_basename( $filename ); $filename = preg_replace( '/\..+$/', '', $filename ); return $filename; @@ -119,7 +119,7 @@ protected function clean_fixture_filename( $filename ) { * @param string $filename The cleaned fixture name. * @return array The input and expected output filenames for that fixture. */ - protected function pass_parser_fixture_filenames( $filename ) { + protected static function pass_parser_fixture_filenames( $filename ) { return array( "$filename.html", "$filename.parsed.json", diff --git a/tests/phpunit/tests/blocks/wpBlockType.php b/tests/phpunit/tests/blocks/wpBlockType.php index 95e6ddbb51a33..a87c5973d13e3 100644 --- a/tests/phpunit/tests/blocks/wpBlockType.php +++ b/tests/phpunit/tests/blocks/wpBlockType.php @@ -444,7 +444,7 @@ public function test_block_version( $content, $expected ) { * } * } */ - public function data_block_version() { + public static function data_block_version() { return array( // Null. array( null, 0 ),