Changeset 54040

Timestamp:

08/31/2022 04:02:05 PM (2 years ago)

Author:

SergeyBiryukov

Message:

Tests: Correctly back up and restore theme directories in Tests_Theme.

In the set_up() method, a copy would be made of the original value of the global $wp_theme_directories variable, with the intention to restore that original value in the tear_down() method after running each test. Unfortunately, this was not implemented correctly.

• The backup is made to a function local variable in set_up() and not stored somewhere where it is accessible from the tear_down() method.
• The restoring then references a non-existent property to restore, which would effectively set the $wp_theme_directories global to null.

Fixed by declaring and using a private property to store the original $wp_theme_directories value.

This bug was discovered while fixing (removing) the magic methods in the WP_UnitTestCase_Base class in an effort to improve compatibility with PHP 8.2.

Follow-up to [38907].

Props jrf, costdev, johnbillion, swissspidy.
See #55652.

File:

• trunk/tests/phpunit/tests/theme.php (modified) (3 diffs)

trunk/tests/phpunit/tests/theme.php

@@ -24 +24 @@
     );
 
+    /**
+     * Original theme directory.
+     *
+     * @var string[]
+     */
+    private $orig_theme_dir;
+
     public function set_up() {
         global $wp_theme_directories;
@@ -29 +36 @@
         parent::set_up();
 
-        $backup_wp_theme_directories = $wp_theme_directories;
-        $wp_theme_directories        = array( WP_CONTENT_DIR . '/themes' );
+        $this->orig_theme_dir = $wp_theme_directories;
+        $wp_theme_directories = array( WP_CONTENT_DIR . '/themes' );
 
         add_filter( 'extra_theme_headers', array( $this, 'theme_data_extra_headers' ) );
@@ -40 +47 @@
         global $wp_theme_directories;
 
-        $wp_theme_directories = $this->wp_theme_directories;
+        $wp_theme_directories = $this->orig_theme_dir;
 
         remove_filter( 'extra_theme_headers', array( $this, 'theme_data_extra_headers' ) );