vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Themes: Ensure WP_Theme::get_files() doesn't return unexpected values.

Browse Source 
This change filters out empty entries from `WP_Theme::get_files()` before returning the array of files. This avoid returning an entry with `false` value when the directory of the theme does not exist.

Props dd32, opurockey, Rahmohn, audrasjb.
Fixes #53599.


git-svn-id: https://develop.svn.wordpress.org/trunk@53253 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Jb Audras 2022-04-25 09:45:00 +00:00
parent 94c0fb7628
commit 6189d64f31
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/class-wp-theme.php
View File

@ -1210,7 +1210,7 @@ final class WP_Theme implements ArrayAccess {
$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
}
return $files;
return array_filter( $files );
}
/**

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

@ -261,6 +261,35 @@ class Tests_Theme_wpTheme extends WP_UnitTestCase {
$this->assertSame( $expected, $theme->is_block_theme() );
}
/**
* Test get_files for an existing theme.
*
* @ticket 53599
*/
public function test_get_files_theme() {
$theme = new WP_Theme( 'theme1', $this->theme_root );
$files = $theme->get_files();
$this->assertIsArray( $files );
$this->assertCount( 3, $files );
$this->assertArrayHasKey( 'functions.php', $files );
$this->assertArrayHasKey( 'index.php', $files );
$this->assertArrayHasKey( 'style.css', $files );
}
/**
* Test get_files for a non-existing theme.
*
* @ticket 53599
*/
public function test_get_files_nonexistent_theme() {
$theme = new WP_Theme( 'nonexistent', $this->theme_root );
$files = $theme->get_files();
$this->assertIsArray( $files );
$this->assertEmpty( $files );
}
/**
* Data provider.
*