Changeset 53417 for branches/6.0/tests/phpunit/tests/theme/wpTheme.php

Timestamp:

05/20/2022 12:59:55 AM (4 years ago)

Author:

peterwilsoncc

Message:

Themes: Accept valid block themes.

Updates theme validation to accept block themes. This replaces the requirement for an index.php with a requirement for either an index.php, /templates/index.html or the deprecated /block-templates/index.html.

Validation is updated for theme uploads, within WP_Theme::__construct and validate_current_theme().

A block theme using the deprecated file structure is now included in the unit tests.

Props peterwilsoncc, sergeybiryukov, hellofromtonya, costdev, azaozz, gziolo, FlorianBrinkmann, Boniu91, aristath, poena, audrasjb.
Merges [53416] to the 6.0 branch.
Fixes #55682.

Location:

branches/6.0

Files:

• . (modified) (1 prop)
• tests/phpunit/tests/theme/wpTheme.php (modified) (2 diffs)

branches/6.0/tests/phpunit/tests/theme/wpTheme.php

@@ -310 +310 @@
                                 'expected'  => true,
                         ),
+                        'deprecated block theme'    => array(
+                                'theme_dir' => 'block-theme-deprecated-path',
+                                'expected'  => true,
+                        ),
                 );
         }
@@ -336 +340 @@
         public function data_get_file_path() {
                 return array(
-                        'no theme: no file given'           => array(
+                        'no theme: no file given'              => array(
                                 'theme_dir' => 'nonexistent',
                                 'file'      => '',
                                 'expected'  => '/nonexistent',
                         ),
-                        'parent theme: no file given'       => array(
+                        'parent theme: no file given'          => array(
                                 'theme_dir' => 'block-theme',
                                 'file'      => '',
                                 'expected'  => '/block-theme',
                         ),
-                        'child theme: no file given'        => array(
+                        'child theme: no file given'           => array(
                                 'theme_dir' => 'block-theme-child',
                                 'file'      => '',
                                 'expected'  => '/block-theme-child',
                         ),
-                        'nonexistent theme: file given'     => array(
+                        'nonexistent theme: file given'        => array(
                                 'theme_dir' => 'nonexistent',
                                 'file'      => '/templates/page.html',
                                 'expected'  => '/nonexistent/templates/page.html',
                         ),
-                        'parent theme: file exists'         => array(
+                        'parent theme: file exists'            => array(
                                 'theme_dir' => 'block-theme',
                                 'file'      => '/templates/page-home.html',
                                 'expected'  => '/block-theme/templates/page-home.html',
                         ),
-                        'parent theme: file does not exist' => array(
+                        'parent theme: deprecated file exists' => array(
+                                'theme_dir' => 'block-theme-deprecated-path',
+                                'file'      => '/block-templates/page-home.html',
+                                'expected'  => '/block-theme-deprecated-path/block-templates/page-home.html',
+                        ),
+                        'parent theme: file does not exist'    => array(
                                 'theme_dir' => 'block-theme',
                                 'file'      => '/templates/nonexistent.html',
                                 'expected'  => '/block-theme/templates/nonexistent.html',
                         ),
-                        'child theme: file exists'          => array(
+                        'child theme: file exists'             => array(
                                 'theme_dir' => 'block-theme-child',
                                 'file'      => '/templates/page-1.html',
                                 'expected'  => '/block-theme-child/templates/page-1.html',
                         ),
-                        'child theme: file does not exist'  => array(
+                        'child theme: file does not exist'     => array(
                                 'theme_dir' => 'block-theme-child',
                                 'file'      => '/templates/nonexistent.html',