vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 22:30:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Code Modernization: Remove dynamic properties in theme tests.

Browse Source 
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.

git-svn-id: https://develop.svn.wordpress.org/trunk@53916 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov
2022-08-21 16:55:18 +00:00
parent 1648e71a9f
commit e119438d26
6 changed files with 115 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/phpunit/tests/admin/includesTheme.php
View File

@@ -4,12 +4,25 @@
*/
class Tests_Admin_IncludesTheme 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'];
$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' ) );
add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
@@ -33,7 +46,7 @@ class Tests_Admin_IncludesTheme extends WP_UnitTestCase {
// 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;
}
/**

16
tests/phpunit/tests/block-supports/layout.php
View File

@@ -17,6 +17,21 @@
* @covers ::wp_restore_image_outer_container
*/
class Test_Block_Supports_Layout extends WP_UnitTestCase {
/**
* Theme root directory.
*
* @var string
*/
private $theme_root;
/**
* Original theme directory.
*
* @var string
*/
private $orig_theme_dir;
function set_up() {
parent::set_up();
$this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );
@@ -30,7 +45,6 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase {
add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
$this->queries = array();
// Clear caches.
wp_clean_themes_cache();
unset( $GLOBALS['wp_themes'] );

57
tests/phpunit/tests/theme/themeDir.php
View File

@@ -7,14 +7,27 @@
*/
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' ) );
add_filter( 'stylesheet_root', array( $this, 'filter_theme_root' ) );
@@ -33,7 +46,7 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
// 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;
}
/**
@@ -57,12 +70,12 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
$this->assertSame( 'default', $theme['Template'] );
$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->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( $this->theme_root . '/default', $theme['Template Dir'] );
$this->assertSame( $this->theme_root . '/default', $theme['Stylesheet Dir'] );
$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'] );
}
@@ -88,15 +101,15 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
$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( self::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', $theme['Template Dir'] );
$this->assertSame( self::THEME_ROOT . '/sandbox', $theme['Stylesheet Dir'] );
$this->assertSame( 'publish', $theme['Status'] );
$this->assertSame( '', $theme['Parent Theme'] );
@@ -122,13 +135,13 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
$this->assertSame( '1.0', $theme['Version'] );
$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( self::THEME_ROOT . '/sandbox/functions.php', $theme['Template Files'] );
$this->assertContains( self::THEME_ROOT . '/sandbox/index.php', $theme['Template Files'] );
$this->assertContains( $this->theme_root . '/stylesheetonly/style.css', $theme['Stylesheet Files'] );
$this->assertContains( self::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->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'] );
@@ -142,7 +155,7 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
// 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 ] );
}
}
@@ -198,7 +211,7 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
}
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() );
}
@@ -212,7 +225,7 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
$this->assertNotEmpty( $theme );
$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 );
}
/**
@@ -238,7 +251,7 @@ class Tests_Theme_ThemeDir extends WP_UnitTestCase {
* @expectedDeprecated get_theme_data
*/
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'] );
$this->assertSame( 'http://example.org/', $theme_data['URI'] );

14
tests/phpunit/tests/theme/wpGetGlobalStylesheet.php
View File

@@ -7,6 +7,20 @@
*/
class Tests_Theme_wpGetGlobalStylesheet extends WP_UnitTestCase {
/**
* Theme root directory.
*
* @var string
*/
private $theme_root;
/**
* Original theme directory.
*
* @var string
*/
private $orig_theme_dir;
public function set_up() {
parent::set_up();

14
tests/phpunit/tests/theme/wpTheme.php
View File

@@ -10,6 +10,20 @@
*/
class Tests_Theme_wpTheme extends WP_UnitTestCase {
/**
* Theme root directory.
*
* @var string
*/
private $theme_root;
/**
* Original theme directory.
*
* @var string
*/
private $orig_theme_dir;
public function set_up() {
parent::set_up();
$this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );

21
tests/phpunit/tests/theme/wpThemeJsonResolver.php
View File

@@ -12,6 +12,27 @@
*/
class Tests_Theme_wpThemeJsonResolver extends WP_UnitTestCase {
/**
* Theme root directory.
*
* @var string
*/
private $theme_root;
/**
* Original theme directory.
*
* @var string
*/
private $orig_theme_dir;
/**
* Queries.
*
* @var array
*/
private $queries = array();
public function set_up() {
parent::set_up();
$this->theme_root = realpath( DIR_TESTDATA . '/themedir1' );