Merge branch 'main' into copilot/add-plugin-dependencies-support

Author: swissspidy

.github/workflows/issue-triage.yml

@@ -1,18 +1,26 @@
 ---
-name: Issue Triage
+name: Issue and PR Triage
 
 'on':
   issues:
     types: [opened]
+  pull_request_target:
+    types: [opened]
   workflow_dispatch:
     inputs:
       issue_number:
-        description: 'Issue number to triage (leave empty to process all)'
+        description: 'Issue/PR number to triage (leave empty to process all)'
         required: false
         type: string
 
 jobs:
   issue-triage:
     uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main
     with:
-      issue_number: ${{ github.event_name == 'workflow_dispatch' && inputs.issue_number || github.event.issue.number }}
+      issue_number: >-
+        ${{
+          (github.event_name == 'workflow_dispatch' && inputs.issue_number) ||
+          (github.event_name == 'pull_request_target' && github.event.pull_request.number) ||
+          (github.event_name == 'issues' && github.event.issue.number) ||
+          ''
+        }}

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

@@ -0,0 +1,12 @@
+name: Welcome New Contributors
+
+on:
+  pull_request_target:
+    types: [opened]
+    branches:
+      - main
+      - master
+
+jobs:
+  welcome:
+    uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main

README.md

@@ -327,6 +327,33 @@ wp plugin install <plugin|zip|url>... [--version=<version>] [--force] [--ignore-
 
 
 
+### wp plugin is-active
+
+Checks if a given plugin is active.
+
+~~~
+wp plugin is-active <plugin> [--network]
+~~~
+
+Returns exit code 0 when active, 1 when not active.
+
+**OPTIONS**
+
+	<plugin>
+		The plugin to check.
+
+	[--network]
+		If set, check if plugin is network-activated.
+
+**EXAMPLES**
+
+    # Check whether plugin is Active; exit status 0 if active, otherwise 1
+    $ wp plugin is-active hello
+    $ echo $?
+    1
+
+
+
 ### wp plugin is-installed
 
 Checks if a given plugin is installed.
@@ -701,6 +728,8 @@ Updates one or more plugins.
 wp plugin update [<plugin>...] [--all] [--exclude=<name>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure]
 ~~~
 
+**Alias:** `upgrade`
+
 **OPTIONS**
 
 	[<plugin>...]
@@ -857,6 +886,8 @@ Deletes one or more themes.
 wp theme delete [<theme>...] [--all] [--force]
 ~~~
 
+**Alias:** `uninstall`
+
 Removes the theme or themes from the filesystem.
 
 **OPTIONS**
@@ -1046,6 +1077,30 @@ wp theme install <theme|zip|url>... [--version=<version>] [--force] [--ignore-re
 
 
 
+### wp theme is-active
+
+Checks if a given theme is active.
+
+~~~
+wp theme is-active <theme>
+~~~
+
+Returns exit code 0 when active, 1 when not active.
+
+**OPTIONS**
+
+	<theme>
+		The theme to check.
+
+**EXAMPLES**
+
+    # Check whether theme is Active; exit status 0 if active, otherwise 1
+    $ wp theme is-active twentyfifteen
+    $ echo $?
+    1
+
+
+
 ### wp theme is-installed
 
 Checks if a given theme is installed.
@@ -1417,6 +1472,8 @@ Updates one or more themes.
 wp theme update [<theme>...] [--all] [--exclude=<theme-names>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure]
 ~~~
 
+**Alias:** `upgrade`
+
 **OPTIONS**
 
 	[<theme>...]

composer.json

@@ -50,6 +50,7 @@
             "plugin get",
             "plugin install",
             "plugin install-dependencies",
+            "plugin is-active",
             "plugin is-installed",
             "plugin list",
             "plugin path",
@@ -65,6 +66,7 @@
             "theme enable",
             "theme get",
             "theme install",
+            "theme is-active",
             "theme is-installed",
             "theme list",
             "theme mod",

features/theme-update.feature

@@ -3,12 +3,9 @@ Feature: Update WordPress themes
   Scenario: Updating a theme with no version in the WordPress.org directory shouldn't delete the original theme
     Given a WP install
 
-    When I run `wp scaffold underscores wpclitesttheme`
-    Then STDOUT should contain:
-      """
-      Success: Created theme
-      """
-    And the wp-content/themes/wpclitesttheme directory should exist
+    When I run `wp theme install twentytwelve --force`
+    And I run `wp scaffold child-theme wpclitesttheme --parent_theme=twentytwelve`
+    Then the wp-content/themes/wpclitesttheme directory should exist
 
     When I try `wp theme update wpclitesttheme --version=100.0.0`
     Then STDERR should contain:

features/theme.feature

@@ -87,8 +87,8 @@ Feature: Manage WordPress themes
 
     When I run `wp theme list`
     Then STDOUT should be a table containing rows:
-      | name            | status   | update    | version | update_version   | auto_update |
-      | twentytwelve    | inactive | available | 1.4     | {UPDATE_VERSION} | off         |
+      | name            | status   | update    | version | update_version   | auto_update | type    |
+      | twentytwelve    | inactive | available | 1.4     | {UPDATE_VERSION} | off         | classic |
 
     When I run `wp theme activate twentytwelve`
     Then STDOUT should not be empty
@@ -105,8 +105,8 @@ Feature: Manage WordPress themes
 
     When I run `wp theme list`
     Then STDOUT should be a table containing rows:
-      | name            | status   | update    | version | update_version   | auto_update |
-      | twentytwelve    | active   | available | 1.5     | {UPDATE_VERSION} | off         |
+      | name            | status   | update    | version | update_version   | auto_update | type    |
+      | twentytwelve    | active   | available | 1.5     | {UPDATE_VERSION} | off         | classic |
 
     When I try `wp theme update`
     Then STDERR should be:
@@ -722,8 +722,8 @@ Feature: Manage WordPress themes
 
     When I run `wp theme list`
     Then STDOUT should be a table containing rows:
-      | name            | status   | update       | version  | update_version   | auto_update | requires   | requires_php   |
-      | example         | inactive | unavailable  | 1.0.0    | 2.0.0            | off         | 100        | 5.6            |
+      | name            | status   | update       | version  | update_version   | auto_update | type    | requires | requires_php   |
+      | example         | inactive | unavailable  | 1.0.0    | 2.0.0            | off         | classic | 100      | 5.6            |
 
     When I try `wp theme update example`
     Then STDERR should contain:
@@ -765,11 +765,41 @@ Feature: Manage WordPress themes
 
     When I run `wp theme list`
     Then STDOUT should be a table containing rows:
-      | name            | status   | update       | version  | update_version   | auto_update | requires   | requires_php   |
-      | example         | inactive | unavailable  | 1.0.0    | 2.0.0            | off         | 3.7        | 100            |
+      | name            | status   | update       | version  | update_version   | auto_update | type    | requires | requires_php   |
+      | example         | inactive | unavailable  | 1.0.0    | 2.0.0            | off         | classic | 3.7     | 100            |
 
     When I try `wp theme update example`
     Then STDERR should contain:
       """
       Warning: example: This update requires PHP version 100
       """
+
+  @require-wp-5.9
+  Scenario: Check theme type field for block themes
+    Given a WP install
+
+    When I run `wp theme list --fields=name,type`
+    Then STDOUT should be a table containing rows:
+      | name              | type    |
+      | twentytwentyfour  | block   |
+
+    When I run `wp theme get twentytwentyfour --field=type`
+    Then STDOUT should be:
+      """
+      block
+      """
+
+  Scenario: Check theme type field for classic themes
+    Given a WP install
+
+    When I run `wp theme install twentytwelve --force`
+    And I run `wp theme list --fields=name,type --name=twentytwelve`
+    Then STDOUT should be a table containing rows:
+      | name         | type    |
+      | twentytwelve | classic |
+
+    When I run `wp theme get twentytwelve --field=type`
+    Then STDOUT should be:
+      """
+      classic
+      """

features/upgradables.feature

@@ -58,7 +58,7 @@ Feature: Manage WordPress themes and plugins
     Then STDOUT should not be empty
     And save STDOUT as {UPDATE_VERSION}
 
-    When I run `wp <type> list`
+    When I run `wp <type> list --fields=name,status,update,version,update_version,auto_update`
     Then STDOUT should be a table containing rows:
       | name   | status   | update    | version   | update_version   | auto_update |
       | <item> | inactive | available | <version> | {UPDATE_VERSION} | off         |

src/Theme_Command.php

@@ -63,6 +63,7 @@ class Theme_Command extends CommandWithUpgrade {
 		'version',
 		'update_version',
 		'auto_update',
+		'type',
 	];
 
 	public function __construct() {
@@ -587,6 +588,9 @@ public function install( $args, $assoc_args ) {
 	 *     +---------+----------------+
 	 */
 	public function get( $args, $assoc_args ) {
+		/**
+		 * @var \WP_Theme $theme
+		 */
 		$theme = $this->fetcher->get_check( $args[0] );
 
 		$errors = $theme->errors();
@@ -612,15 +616,23 @@ public function get( $args, $assoc_args ) {
 			'tags',
 			'theme_root',
 			'theme_root_uri',
+			'type',
 		];
 		$theme_obj  = new stdClass();
 		foreach ( $theme_vars as $var ) {
+			// @phpstan-ignore-next-line
 			$theme_obj->$var = $theme->$var;
 		}
 
 		$theme_obj->status      = $this->get_status( $theme );
 		$theme_obj->description = wordwrap( $theme_obj->description );
 
+		// Determine theme type (block or classic). is_block_theme() was added in WP 5.9.
+		$theme_obj->type = 'classic';
+		if ( method_exists( $theme, 'is_block_theme' ) && $theme->is_block_theme() ) {
+			$theme_obj->type = 'block';
+		}
+
 		if ( empty( $assoc_args['fields'] ) ) {
 			$assoc_args['fields'] = $theme_vars;
 		}
@@ -775,7 +787,7 @@ public function is_installed( $args, $assoc_args ) {
 	 * ## OPTIONS
 	 *
 	 * <theme>
-	 * : The plugin to check.
+	 * : The theme to check.
 	 *
 	 * ## EXAMPLES
 	 *
@@ -915,6 +927,7 @@ public function delete( $args, $assoc_args ) {
 	 * * version
 	 * * update_version
 	 * * auto_update
+	 * * type
 	 *
 	 * These fields are optionally available:
 	 *
@@ -927,9 +940,9 @@ public function delete( $args, $assoc_args ) {
 	 *
 	 *     # List inactive themes.
 	 *     $ wp theme list --status=inactive --format=csv
-	 *     name,status,update,version,update_version,auto_update
-	 *     twentyfourteen,inactive,none,3.8,,off
-	 *     twentysixteen,inactive,available,3.0,3.1,off
+	 *     name,status,update,version,update_version,auto_update,type
+	 *     twentyfourteen,inactive,none,3.8,,off,classic
+	 *     twentysixteen,inactive,available,3.0,3.1,off,classic
 	 *
 	 * @subcommand list
 	 */

src/WP_CLI/ParseThemeNameInput.php

@@ -131,6 +131,12 @@ private function get_all_themes() {
 				$requires_php = ! empty( $theme->get( 'RequiresPHP' ) ) ? $theme->get( 'RequiresPHP' ) : '';
 			}
 
+			// Determine theme type (block or classic). is_block_theme() was added in WP 5.9.
+			$theme_type = 'classic';
+			if ( method_exists( $theme, 'is_block_theme' ) && $theme->is_block_theme() ) {
+				$theme_type = 'block';
+			}
+
 			$items[ $stylesheet ] = [
 				'name'                      => $key,
 				'status'                    => $this->get_status( $theme ),
@@ -146,6 +152,7 @@ private function get_all_themes() {
 				'requires'                  => $requires,
 				'requires_php'              => $requires_php,
 				'update_unavailable_reason' => isset( $update_unavailable_reason ) ? $update_unavailable_reason : '',
+				'type'                      => $theme_type,
 			];
 
 			// Compare version and update information in theme list.