Changeset 53916 for trunk/tests/phpunit/tests/theme/themeDir.php

Timestamp:

08/21/2022 04:55:18 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Remove dynamic properties in theme tests.

Dynamic (non-explicitly declared) properties are deprecated as of PHP 8.2 and are expected to become a fatal error in PHP 9.0.

In this particular group of test files, the test classes contain a set_up() method which sets a few dynamic (not explicitly declared) properties.

For those properties which were set using a function call or variable access, the property has been explicitly declared on the class now.

For those properties which were set using a constant scalar expression and for which the value is not changed by any of the tests, the property setting has been removed in favor of declaring a class constant.

Includes removing one unused dynamic property declaration: $this->queries in Test_Block_Supports_Layout, which appears to be a copy/paste from Tests_Theme_wpThemeJsonResolver.

Follow-up to [40/tests], [260/tests], [598/tests], [50960], [52675], [53085], [53557], [53558], [53850], [53851], [53852], [53853], [53854], [53856].

Props jrf.
See #56033.

File:

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

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -8 +8 @@
 class Tests_Theme_ThemeDir extends WP_UnitTestCase {
 
+        /**
+         * Theme root directory.
+         *
+         * @var string
+         */
+        const THEME_ROOT = DIR_TESTDATA . '/themedir1';
+
+        /**
+         * Original theme directory.
+         *
+         * @var string
+         */
+        private $orig_theme_dir;
+
         public function set_up() {
                 parent::set_up();
-                $this->theme_root = DIR_TESTDATA . '/themedir1';
 
                 $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
 
                 // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
-                $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
+                $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', self::THEME_ROOT );
 
                 add_filter( 'theme_root', array( $this, 'filter_theme_root' ) );
@@ -34 +47 @@
         // Replace the normal theme root directory with our premade test directory.
         public function filter_theme_root( $dir ) {
-                return $this->theme_root;
+                return self::THEME_ROOT;
         }
 
@@ -58 +71 @@
                 $this->assertSame( 'default', $theme['Stylesheet'] );
 
-                $this->assertContains( $this->theme_root . '/default/functions.php', $theme['Template Files'] );
-                $this->assertContains( $this->theme_root . '/default/index.php', $theme['Template Files'] );
-                $this->assertContains( $this->theme_root . '/default/style.css', $theme['Stylesheet Files'] );
-
-                $this->assertSame( $this->theme_root . '/default', $theme['Template Dir'] );
-                $this->assertSame( $this->theme_root . '/default', $theme['Stylesheet Dir'] );
+                $this->assertContains( self::THEME_ROOT . '/default/functions.php', $theme['Template Files'] );
+                $this->assertContains( self::THEME_ROOT . '/default/index.php', $theme['Template Files'] );
+                $this->assertContains( self::THEME_ROOT . '/default/style.css', $theme['Stylesheet Files'] );
+
+                $this->assertSame( self::THEME_ROOT . '/default', $theme['Template Dir'] );
+                $this->assertSame( self::THEME_ROOT . '/default', $theme['Stylesheet Dir'] );
                 $this->assertSame( 'publish', $theme['Status'] );
                 $this->assertSame( '', $theme['Parent Theme'] );
@@ -89 +102 @@
                 $template_files = $theme['Template Files'];
 
-                $this->assertSame( $this->theme_root . '/sandbox/functions.php', reset( $template_files ) );
-                $this->assertSame( $this->theme_root . '/sandbox/index.php', next( $template_files ) );
+                $this->assertSame( self::THEME_ROOT . '/sandbox/functions.php', reset( $template_files ) );
+                $this->assertSame( self::THEME_ROOT . '/sandbox/index.php', next( $template_files ) );
 
                 $stylesheet_files = $theme['Stylesheet Files'];
 
-                $this->assertSame( $this->theme_root . '/sandbox/style.css', reset( $stylesheet_files ) );
-
-                $this->assertSame( $this->theme_root . '/sandbox', $theme['Template Dir'] );
-                $this->assertSame( $this->theme_root . '/sandbox', $theme['Stylesheet Dir'] );
+                $this->assertSame( self::THEME_ROOT . '/sandbox/style.css', reset( $stylesheet_files ) );
+
+                $this->assertSame( self::THEME_ROOT . '/sandbox', $theme['Template Dir'] );
+                $this->assertSame( self::THEME_ROOT . '/sandbox', $theme['Stylesheet Dir'] );
                 $this->assertSame( 'publish', $theme['Status'] );
                 $this->assertSame( '', $theme['Parent Theme'] );
@@ -123 +136 @@
                 $this->assertSame( 'sandbox', $theme['Template'] );
                 $this->assertSame( 'stylesheetonly', $theme['Stylesheet'] );
-                $this->assertContains( $this->theme_root . '/sandbox/functions.php', $theme['Template Files'] );
-                $this->assertContains( $this->theme_root . '/sandbox/index.php', $theme['Template Files'] );
-
-                $this->assertContains( $this->theme_root . '/stylesheetonly/style.css', $theme['Stylesheet Files'] );
-
-                $this->assertSame( $this->theme_root . '/sandbox', $theme['Template Dir'] );
-                $this->assertSame( $this->theme_root . '/stylesheetonly', $theme['Stylesheet Dir'] );
+                $this->assertContains( self::THEME_ROOT . '/sandbox/functions.php', $theme['Template Files'] );
+                $this->assertContains( self::THEME_ROOT . '/sandbox/index.php', $theme['Template Files'] );
+
+                $this->assertContains( self::THEME_ROOT . '/stylesheetonly/style.css', $theme['Stylesheet Files'] );
+
+                $this->assertSame( self::THEME_ROOT . '/sandbox', $theme['Template Dir'] );
+                $this->assertSame( self::THEME_ROOT . '/stylesheetonly', $theme['Stylesheet Dir'] );
                 $this->assertSame( 'publish', $theme['Status'] );
                 $this->assertSame( 'Sandbox', $theme['Parent Theme'] );
@@ -143 +156 @@
                 // Ignore themes in the default /themes directory.
                 foreach ( $themes as $theme_name => $theme ) {
-                        if ( $theme->get_theme_root() !== $this->theme_root ) {
+                        if ( $theme->get_theme_root() !== self::THEME_ROOT ) {
                                 unset( $themes[ $theme_name ] );
                         }
@@ -199 +212 @@
 
         public function test_wp_get_theme_with_non_default_theme_root() {
-                $this->assertFalse( wp_get_theme( 'sandbox', $this->theme_root )->errors() );
+                $this->assertFalse( wp_get_theme( 'sandbox', self::THEME_ROOT )->errors() );
                 $this->assertFalse( wp_get_theme( 'sandbox' )->errors() );
         }
@@ -213 +226 @@
 
                 $templates = $theme['Template Files'];
-                $this->assertContains( $this->theme_root . '/page-templates/template-top-level.php', $templates );
+                $this->assertContains( self::THEME_ROOT . '/page-templates/template-top-level.php', $templates );
         }
 
@@ -239 +252 @@
          */
         public function test_get_theme_data_subdir() {
-                $theme_data = get_theme_data( $this->theme_root . '/subdir/theme2/style.css' );
+                $theme_data = get_theme_data( self::THEME_ROOT . '/subdir/theme2/style.css' );
 
                 $this->assertSame( 'My Subdir Theme', $theme_data['Name'] );