Changeset 53253

Timestamp:

04/25/2022 09:45:00 AM (4 years ago)

Author:

audrasjb

Message:

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

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.

Location:

trunk

Files:

• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• tests/phpunit/tests/theme/wpTheme.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-theme.php

@@ -1211 +1211 @@
                 }
 
-                return $files;
+                return array_filter( $files );
         }
 

trunk/tests/phpunit/tests/theme/wpTheme.php

@@ -263 +263 @@
 
         /**
+         * 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.
          *