Skip to content

Commit 4a09071

Browse files
swissspidyswissspidy
authored
Merge branch 'main' into copilot/add-plugin-theme-language-update-check
2 parents 6ec045c + de4f128 commit 4a09071

10 files changed

Lines changed: 217 additions & 23 deletions

‎.github/workflows/check-branch-alias.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: Check Branch Alias
2+
3+
on:
4+
release:
5+
types: [released]
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
12+
jobs:
13+
check-branch-alias:
14+
uses: wp-cli/.github/.github/workflows/reusable-check-branch-alias.yml@main

‎.github/workflows/issue-triage.yml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: Issue and PR Triage
3+
4+
'on':
5+
issues:
6+
types: [opened]
7+
pull_request_target:
8+
types: [opened]
9+
workflow_dispatch:
10+
inputs:
11+
issue_number:
12+
description: 'Issue/PR number to triage (leave empty to process all)'
13+
required: false
14+
type: string
15+
16+
jobs:
17+
issue-triage:
18+
uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main
19+
with:
20+
issue_number: >-
21+
${{
22+
(github.event_name == 'workflow_dispatch' && inputs.issue_number) ||
23+
(github.event_name == 'pull_request_target' && github.event.pull_request.number) ||
24+
(github.event_name == 'issues' && github.event.issue.number) ||
25+
''
26+
}}

‎.github/workflows/welcome-new-contributors.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Welcome New Contributors
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
branches:
7+
- main
8+
- master
9+
10+
jobs:
11+
welcome:
12+
uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

‎README.md‎

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,33 @@ wp plugin install <plugin|zip|url>... [--version=<version>] [--force] [--ignore-
327327

328328

329329

330+
### wp plugin is-active
331+
332+
Checks if a given plugin is active.
333+
334+
~~~
335+
wp plugin is-active <plugin> [--network]
336+
~~~
337+
338+
Returns exit code 0 when active, 1 when not active.
339+
340+
**OPTIONS**
341+
342+
<plugin>
343+
The plugin to check.
344+
345+
[--network]
346+
If set, check if plugin is network-activated.
347+
348+
**EXAMPLES**
349+
350+
# Check whether plugin is Active; exit status 0 if active, otherwise 1
351+
$ wp plugin is-active hello
352+
$ echo $?
353+
1
354+
355+
356+
330357
### wp plugin is-installed
331358

332359
Checks if a given plugin is installed.
@@ -701,6 +728,8 @@ Updates one or more plugins.
701728
wp plugin update [<plugin>...] [--all] [--exclude=<name>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure]
702729
~~~
703730

731+
**Alias:** `upgrade`
732+
704733
**OPTIONS**
705734

706735
[<plugin>...]
@@ -857,6 +886,8 @@ Deletes one or more themes.
857886
wp theme delete [<theme>...] [--all] [--force]
858887
~~~
859888

889+
**Alias:** `uninstall`
890+
860891
Removes the theme or themes from the filesystem.
861892

862893
**OPTIONS**
@@ -1046,6 +1077,30 @@ wp theme install <theme|zip|url>... [--version=<version>] [--force] [--ignore-re
10461077

10471078

10481079

1080+
### wp theme is-active
1081+
1082+
Checks if a given theme is active.
1083+
1084+
~~~
1085+
wp theme is-active <theme>
1086+
~~~
1087+
1088+
Returns exit code 0 when active, 1 when not active.
1089+
1090+
**OPTIONS**
1091+
1092+
<theme>
1093+
The theme to check.
1094+
1095+
**EXAMPLES**
1096+
1097+
# Check whether theme is Active; exit status 0 if active, otherwise 1
1098+
$ wp theme is-active twentyfifteen
1099+
$ echo $?
1100+
1
1101+
1102+
1103+
10491104
### wp theme is-installed
10501105

10511106
Checks if a given theme is installed.
@@ -1123,6 +1178,7 @@ These fields will be displayed by default for each theme:
11231178
* version
11241179
* update_version
11251180
* auto_update
1181+
* type
11261182

11271183
These fields are optionally available:
11281184

@@ -1135,9 +1191,9 @@ These fields are optionally available:
11351191

11361192
# List inactive themes.
11371193
$ wp theme list --status=inactive --format=csv
1138-
name,status,update,version,update_version,auto_update
1139-
twentyfourteen,inactive,none,3.8,,off
1140-
twentysixteen,inactive,available,3.0,3.1,off
1194+
name,status,update,version,update_version,auto_update,type
1195+
twentyfourteen,inactive,none,3.8,,off,classic
1196+
twentysixteen,inactive,available,3.0,3.1,off,classic
11411197

11421198

11431199

@@ -1417,6 +1473,8 @@ Updates one or more themes.
14171473
wp theme update [<theme>...] [--all] [--exclude=<theme-names>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure]
14181474
~~~
14191475

1476+
**Alias:** `upgrade`
1477+
14201478
**OPTIONS**
14211479

14221480
[<theme>...]

‎composer.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"plugin delete",
5050
"plugin get",
5151
"plugin install",
52+
"plugin is-active",
5253
"plugin is-installed",
5354
"plugin list",
5455
"plugin path",
@@ -65,6 +66,7 @@
6566
"theme enable",
6667
"theme get",
6768
"theme install",
69+
"theme is-active",
6870
"theme is-installed",
6971
"theme list",
7072
"theme mod",

‎features/theme-update.feature‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ Feature: Update WordPress themes
33
Scenario: Updating a theme with no version in the WordPress.org directory shouldn't delete the original theme
44
Given a WP install
55

6-
When I run `wp scaffold underscores wpclitesttheme`
7-
Then STDOUT should contain:
8-
"""
9-
Success: Created theme
10-
"""
11-
And the wp-content/themes/wpclitesttheme directory should exist
6+
When I run `wp theme install twentytwelve --force`
7+
And I run `wp scaffold child-theme wpclitesttheme --parent_theme=twentytwelve`
8+
Then the wp-content/themes/wpclitesttheme directory should exist
129

1310
When I try `wp theme update wpclitesttheme --version=100.0.0`
1411
Then STDERR should contain:

‎features/theme.feature‎

Lines changed: 73 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:
@@ -435,6 +435,41 @@ Feature: Manage WordPress themes
435435
| moina-blog | active |
436436
| moina | parent |
437437

438+
@require-wp-5.7
439+
Scenario: List broken themes (child theme without parent)
440+
Given a WP install
441+
And I run `wp theme install moina`
442+
And I run `wp theme install moina-blog`
443+
444+
When I run `wp theme list --fields=name,status`
445+
Then STDOUT should be a table containing rows:
446+
| name | status |
447+
| moina-blog | inactive |
448+
| moina | inactive |
449+
450+
When I run `wp theme delete moina`
451+
Then STDOUT should contain:
452+
"""
453+
Deleted 'moina' theme.
454+
"""
455+
456+
When I run `wp theme list --fields=name,status`
457+
Then STDOUT should be a table containing rows:
458+
| name | status |
459+
| moina-blog | inactive |
460+
461+
When I try `wp theme activate moina-blog`
462+
Then STDERR should contain:
463+
"""
464+
Error: The parent theme is missing. Please install the "moina" parent theme.
465+
"""
466+
467+
When I try `wp theme install moina-blog`
468+
Then STDERR should contain:
469+
"""
470+
Warning: moina-blog: Theme already installed.
471+
"""
472+
438473
Scenario: When updating a theme --format should be the same when using --dry-run
439474
Given a WP install
440475
And I run `wp theme delete --all --force`
@@ -687,8 +722,8 @@ Feature: Manage WordPress themes
687722

688723
When I run `wp theme list`
689724
Then STDOUT should be a table containing rows:
690-
| name | status | update | version | update_version | auto_update | requires | requires_php |
691-
| 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 |
692727

693728
When I try `wp theme update example`
694729
Then STDERR should contain:
@@ -730,11 +765,41 @@ Feature: Manage WordPress themes
730765

731766
When I run `wp theme list`
732767
Then STDOUT should be a table containing rows:
733-
| name | status | update | version | update_version | auto_update | requires | requires_php |
734-
| 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 |
735770

736771
When I try `wp theme update example`
737772
Then STDERR should contain:
738773
"""
739774
Warning: example: This update requires PHP version 100
740775
"""
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: 17 additions & 4 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() {
@@ -668,6 +669,9 @@ public function install( $args, $assoc_args ) {
668669
* +---------+----------------+
669670
*/
670671
public function get( $args, $assoc_args ) {
672+
/**
673+
* @var \WP_Theme $theme
674+
*/
671675
$theme = $this->fetcher->get_check( $args[0] );
672676

673677
$errors = $theme->errors();
@@ -693,15 +697,23 @@ public function get( $args, $assoc_args ) {
693697
'tags',
694698
'theme_root',
695699
'theme_root_uri',
700+
'type',
696701
];
697702
$theme_obj = new stdClass();
698703
foreach ( $theme_vars as $var ) {
704+
// @phpstan-ignore-next-line
699705
$theme_obj->$var = $theme->$var;
700706
}
701707

702708
$theme_obj->status = $this->get_status( $theme );
703709
$theme_obj->description = wordwrap( $theme_obj->description );
704710

711+
// Determine theme type (block or classic). is_block_theme() was added in WP 5.9.
712+
$theme_obj->type = 'classic';
713+
if ( method_exists( $theme, 'is_block_theme' ) && $theme->is_block_theme() ) {
714+
$theme_obj->type = 'block';
715+
}
716+
705717
if ( empty( $assoc_args['fields'] ) ) {
706718
$assoc_args['fields'] = $theme_vars;
707719
}
@@ -856,7 +868,7 @@ public function is_installed( $args, $assoc_args ) {
856868
* ## OPTIONS
857869
*
858870
* <theme>
859-
* : The plugin to check.
871+
* : The theme to check.
860872
*
861873
* ## EXAMPLES
862874
*
@@ -996,6 +1008,7 @@ public function delete( $args, $assoc_args ) {
9961008
* * version
9971009
* * update_version
9981010
* * auto_update
1011+
* * type
9991012
*
10001013
* These fields are optionally available:
10011014
*
@@ -1008,9 +1021,9 @@ public function delete( $args, $assoc_args ) {
10081021
*
10091022
* # List inactive themes.
10101023
* $ wp theme list --status=inactive --format=csv
1011-
* name,status,update,version,update_version,auto_update
1012-
* twentyfourteen,inactive,none,3.8,,off
1013-
* twentysixteen,inactive,available,3.0,3.1,off
1024+
* name,status,update,version,update_version,auto_update,type
1025+
* twentyfourteen,inactive,none,3.8,,off,classic
1026+
* twentysixteen,inactive,available,3.0,3.1,off,classic
10141027
*
10151028
* @subcommand list
10161029
*/

0 commit comments

Comments
 (0)