Skip to content

Build/Test Tools: Avoid passing an object when invoking static methods via Reflection #15422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
desrosj wants to merge 1 commit into from
Closed

Build/Test Tools: Avoid passing an object when invoking static methods via Reflection #15422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tests/phpunit/tests/admin/plugin-dependencies/base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ protected function call_method( $method, ...$args ) {
if ( PHP_VERSION_ID < 80100 ) {
self::$reflected_members[ $method ]->setAccessible( true );
}
$value = self::$reflected_members[ $method ]->invokeArgs( self::$instance, $args );
$object = self::$reflected_members[ $method ]->isStatic() ? null : self::$instance;
$value = self::$reflected_members[ $method ]->invokeArgs( $object, $args );
if ( PHP_VERSION_ID < 80100 ) {
self::$reflected_members[ $method ]->setAccessible( false );
}
Expand Down
13 changes: 1 addition & 12 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8515,18 +8515,7 @@ public static function data_custom_css_for_user_caps() {
* @param string $expected Expected results.
*/
public function test_process_blocks_custom_css( $input, $expected ) {
$theme_json = new WP_Theme_JSON(
array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(),
)
);
$reflection = new ReflectionMethod( $theme_json, 'process_blocks_custom_css' );
if ( PHP_VERSION_ID < 80100 ) {
$reflection->setAccessible( true );
}

$this->assertSame( $expected, $reflection->invoke( $theme_json, $input['css'], $input['selector'] ) );
$this->assertSame( $expected, WP_Theme_JSON::process_blocks_custom_css( $input['css'], $input['selector'] ) );
}

/**
Expand Down
Loading