From f13a068c13a694f3fc5fac34c9ec8374200a73a8 Mon Sep 17 00:00:00 2001 From: Luis Herranz Date: Sat, 23 Dec 2023 19:48:06 +0100 Subject: [PATCH] Refactor the tests set_up --- tests/phpunit/tests/modules/modules.php | 39 +++++++++---------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/tests/phpunit/tests/modules/modules.php b/tests/phpunit/tests/modules/modules.php index 4ca7128b63003..8f58916b85a44 100644 --- a/tests/phpunit/tests/modules/modules.php +++ b/tests/phpunit/tests/modules/modules.php @@ -9,14 +9,6 @@ * @covers WP_Modules::print_module_preloads */ class Tests_Modules_Functions extends WP_UnitTestCase { - /** - * Stores a reference to the ReflectionProperty instance of the - * WP_Modules::$registered property. - * - * @var ReflectionProperty - */ - protected $registered; - /** * Stores the original value of WP_Modules::$registered to restore it later. * @@ -24,14 +16,6 @@ class Tests_Modules_Functions extends WP_UnitTestCase { */ protected $old_registered; - /** - * Stores a reference to the ReflectionProperty instance of the - * WP_Modules::$enqueued_before_registered property. - * - * @var ReflectionProperty - */ - protected $enqueued_before_registered; - /** * Stores the original value of WP_Modules::$enqueued_before_registered to * restore it later. @@ -43,20 +27,25 @@ class Tests_Modules_Functions extends WP_UnitTestCase { public function set_up() { parent::set_up(); - $wp_modules = new ReflectionClass( 'WP_Modules' ); - - $this->old_registered = $wp_modules->getStaticPropertyValue( 'registered' ); - $this->old_enqueued_before_registered = $wp_modules->getStaticPropertyValue( 'enqueued_before_registered' ); + $registered = new ReflectionProperty( 'WP_Modules', 'registered' ); + $registered->setAccessible( true ); + $this->old_registered = $registered->getValue(); + $registered->setValue( null, array() ); - $wp_modules->setStaticPropertyValue( 'registered', array() ); - $wp_modules->setStaticPropertyValue( 'enqueued_before_registered', array() ); + $enqueued_before_registered = new ReflectionProperty( 'WP_Modules', 'enqueued_before_registered' ); + $enqueued_before_registered->setAccessible( true ); + $this->old_enqueued_before_registered = $enqueued_before_registered->getValue(); + $enqueued_before_registered->setValue( null, array() ); } public function tear_down() { - $wp_modules = new ReflectionClass( 'WP_Modules' ); + $registered = new ReflectionProperty( 'WP_Modules', 'registered' ); + $registered->setAccessible( true ); + $registered->setValue( null, $this->old_registered ); - $wp_modules->setStaticPropertyValue( 'registered', $this->old_registered ); - $wp_modules->setStaticPropertyValue( 'enqueued_before_registered', $this->old_enqueued_before_registered ); + $enqueued_before_registered = new ReflectionProperty( 'WP_Modules', 'enqueued_before_registered' ); + $enqueued_before_registered->setAccessible( true ); + $enqueued_before_registered->setValue( null, $this->old_enqueued_before_registered ); parent::tear_down(); }