Skip to content

Commit 19c1410

Browse files
swissspidyswissspidy
authored
Merge pull request #477 from wp-cli/copilot/add-theme-type-field
2 parents 528c7fe + 4aebd14 commit 19c1410

File tree

4 files changed

+62
-12
lines changed

4 files changed

+62
-12
lines changed

‎features/theme.feature‎

Lines changed: 38 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ Feature: Manage WordPress themes
8787

8888
When I run `wp theme list`
8989
Then STDOUT should be a table containing rows:
90-
| name | status | update | version | update_version | auto_update |
91-
| twentytwelve | inactive | available | 1.4 | {UPDATE_VERSION} | off |
90+
| name | status | update | version | update_version | auto_update | type |
91+
| twentytwelve | inactive | available | 1.4 | {UPDATE_VERSION} | off | classic |
9292

9393
When I run `wp theme activate twentytwelve`
9494
Then STDOUT should not be empty
@@ -105,8 +105,8 @@ Feature: Manage WordPress themes
105105

106106
When I run `wp theme list`
107107
Then STDOUT should be a table containing rows:
108-
| name | status | update | version | update_version | auto_update |
109-
| twentytwelve | active | available | 1.5 | {UPDATE_VERSION} | off |
108+
| name | status | update | version | update_version | auto_update | type |
109+
| twentytwelve | active | available | 1.5 | {UPDATE_VERSION} | off | classic |
110110

111111
When I try `wp theme update`
112112
Then STDERR should be:
@@ -722,8 +722,8 @@ Feature: Manage WordPress themes
722722

723723
When I run `wp theme list`
724724
Then STDOUT should be a table containing rows:
725-
| name | status | update | version | update_version | auto_update | requires | requires_php |
726-
| example | inactive | unavailable | 1.0.0 | 2.0.0 | off | 100 | 5.6 |
725+
| name | status | update | version | update_version | auto_update | type | requires | requires_php |
726+
| example | inactive | unavailable | 1.0.0 | 2.0.0 | off | classic | 100 | 5.6 |
727727

728728
When I try `wp theme update example`
729729
Then STDERR should contain:
@@ -765,11 +765,41 @@ Feature: Manage WordPress themes
765765

766766
When I run `wp theme list`
767767
Then STDOUT should be a table containing rows:
768-
| name | status | update | version | update_version | auto_update | requires | requires_php |
769-
| example | inactive | unavailable | 1.0.0 | 2.0.0 | off | 3.7 | 100 |
768+
| name | status | update | version | update_version | auto_update | type | requires | requires_php |
769+
| example | inactive | unavailable | 1.0.0 | 2.0.0 | off | classic | 3.7 | 100 |
770770

771771
When I try `wp theme update example`
772772
Then STDERR should contain:
773773
"""
774774
Warning: example: This update requires PHP version 100
775775
"""
776+
777+
@require-wp-5.9
778+
Scenario: Check theme type field for block themes
779+
Given a WP install
780+
781+
When I run `wp theme list --fields=name,type`
782+
Then STDOUT should be a table containing rows:
783+
| name | type |
784+
| twentytwentyfour | block |
785+
786+
When I run `wp theme get twentytwentyfour --field=type`
787+
Then STDOUT should be:
788+
"""
789+
block
790+
"""
791+
792+
Scenario: Check theme type field for classic themes
793+
Given a WP install
794+
795+
When I run `wp theme install twentytwelve --force`
796+
And I run `wp theme list --fields=name,type --name=twentytwelve`
797+
Then STDOUT should be a table containing rows:
798+
| name | type |
799+
| twentytwelve | classic |
800+
801+
When I run `wp theme get twentytwelve --field=type`
802+
Then STDOUT should be:
803+
"""
804+
classic
805+
"""

‎features/upgradables.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ Feature: Manage WordPress themes and plugins
5858
Then STDOUT should not be empty
5959
And save STDOUT as {UPDATE_VERSION}
6060

61-
When I run `wp <type> list`
61+
When I run `wp <type> list --fields=name,status,update,version,update_version,auto_update`
6262
Then STDOUT should be a table containing rows:
6363
| name | status | update | version | update_version | auto_update |
6464
| <item> | inactive | available | <version> | {UPDATE_VERSION} | off |

‎src/Theme_Command.php‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ class Theme_Command extends CommandWithUpgrade {
6363
'version',
6464
'update_version',
6565
'auto_update',
66+
'type',
6667
];
6768

6869
public function __construct() {
@@ -587,6 +588,9 @@ public function install( $args, $assoc_args ) {
587588
* +---------+----------------+
588589
*/
589590
public function get( $args, $assoc_args ) {
591+
/**
592+
* @var \WP_Theme $theme
593+
*/
590594
$theme = $this->fetcher->get_check( $args[0] );
591595

592596
$errors = $theme->errors();
@@ -612,15 +616,23 @@ public function get( $args, $assoc_args ) {
612616
'tags',
613617
'theme_root',
614618
'theme_root_uri',
619+
'type',
615620
];
616621
$theme_obj = new stdClass();
617622
foreach ( $theme_vars as $var ) {
623+
// @phpstan-ignore-next-line
618624
$theme_obj->$var = $theme->$var;
619625
}
620626

621627
$theme_obj->status = $this->get_status( $theme );
622628
$theme_obj->description = wordwrap( $theme_obj->description );
623629

630+
// Determine theme type (block or classic). is_block_theme() was added in WP 5.9.
631+
$theme_obj->type = 'classic';
632+
if ( method_exists( $theme, 'is_block_theme' ) && $theme->is_block_theme() ) {
633+
$theme_obj->type = 'block';
634+
}
635+
624636
if ( empty( $assoc_args['fields'] ) ) {
625637
$assoc_args['fields'] = $theme_vars;
626638
}
@@ -915,6 +927,7 @@ public function delete( $args, $assoc_args ) {
915927
* * version
916928
* * update_version
917929
* * auto_update
930+
* * type
918931
*
919932
* These fields are optionally available:
920933
*
@@ -927,9 +940,9 @@ public function delete( $args, $assoc_args ) {
927940
*
928941
* # List inactive themes.
929942
* $ wp theme list --status=inactive --format=csv
930-
* name,status,update,version,update_version,auto_update
931-
* twentyfourteen,inactive,none,3.8,,off
932-
* twentysixteen,inactive,available,3.0,3.1,off
943+
* name,status,update,version,update_version,auto_update,type
944+
* twentyfourteen,inactive,none,3.8,,off,classic
945+
* twentysixteen,inactive,available,3.0,3.1,off,classic
933946
*
934947
* @subcommand list
935948
*/

‎src/WP_CLI/ParseThemeNameInput.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,12 @@ private function get_all_themes() {
131131
$requires_php = ! empty( $theme->get( 'RequiresPHP' ) ) ? $theme->get( 'RequiresPHP' ) : '';
132132
}
133133

134+
// Determine theme type (block or classic). is_block_theme() was added in WP 5.9.
135+
$theme_type = 'classic';
136+
if ( method_exists( $theme, 'is_block_theme' ) && $theme->is_block_theme() ) {
137+
$theme_type = 'block';
138+
}
139+
134140
$items[ $stylesheet ] = [
135141
'name' => $key,
136142
'status' => $this->get_status( $theme ),
@@ -146,6 +152,7 @@ private function get_all_themes() {
146152
'requires' => $requires,
147153
'requires_php' => $requires_php,
148154
'update_unavailable_reason' => isset( $update_unavailable_reason ) ? $update_unavailable_reason : '',
155+
'type' => $theme_type,
149156
];
150157

151158
// Compare version and update information in theme list.

0 commit comments

Comments
 (0)