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

swissspidy · swissspidy · commit 3fa117ffcb1e · 2026-01-20T22:41:44.000+01:00
diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml
@@ -17,17 +17,17 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v6
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
 
       - name: Check existence of composer.json file
         id: check_composer_file
-        uses: andstor/file-existence-action@v3
+        uses: andstor/file-existence-action@076e0072799f4942c8bc574a82233e1e4d13e9d6 # v3
         with:
           files: "composer.json"
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@v2
+        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -38,7 +38,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@v3
+        uses: ramsey/composer-install@3cf229dc2919194e9e36783941438d17239e8520 # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:
diff --git a/.github/workflows/issue-triage.yml b/.github/workflows/issue-triage.yml
@@ -13,6 +13,13 @@ name: Issue and PR Triage
         required: false
         type: string
 
+permissions:
+  issues: write
+  pull-requests: write
+  actions: write
+  contents: read
+  models: read
+
 jobs:
   issue-triage:
     uses: wp-cli/.github/.github/workflows/reusable-issue-triage.yml@main
diff --git a/.github/workflows/regenerate-readme.yml b/.github/workflows/regenerate-readme.yml
@@ -10,6 +10,10 @@ on:
       - "features/**"
       - "README.md"
 
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
   regenerate-readme:
     uses: wp-cli/.github/.github/workflows/reusable-regenerate-readme.yml@main
diff --git a/.github/workflows/welcome-new-contributors.yml b/.github/workflows/welcome-new-contributors.yml
@@ -7,6 +7,9 @@ on:
       - main
       - master
 
+permissions:
+  pull-requests: write
+
 jobs:
   welcome:
     uses: wp-cli/.github/.github/workflows/reusable-welcome-new-contributors.yml@main
diff --git a/README.md b/README.md
@@ -245,7 +245,7 @@ wp plugin install <plugin|zip|url>... [--version=<version>] [--force] [--ignore-
 **OPTIONS**
 
 	<plugin|zip|url>...
-		One or more plugins to install. Accepts a plugin slug, the path to a local zip file, or a URL to a remote zip file.
+		One or more plugins to install. Accepts a plugin slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org plugin directory.
 
 	[--version=<version>]
 		If set, get that particular version from wordpress.org, instead of the
@@ -325,6 +325,16 @@ wp plugin install <plugin|zip|url>... [--version=<version>] [--force] [--ignore-
     Plugin updated successfully
     Success: Installed 1 of 1 plugins.
 
+    # Install from a WordPress.org plugin directory URL
+    $ wp plugin install https://wordpress.org/plugins/akismet/
+    Detected WordPress.org plugins directory URL, using slug: akismet
+    Installing Akismet Anti-spam: Spam Protection (3.1.11)
+    Downloading install package from https://downloads.wordpress.org/plugin/akismet.3.1.11.zip...
+    Unpacking the package...
+    Installing the plugin...
+    Plugin installed successfully.
+    Success: Installed 1 of 1 plugins.
+
 
 
 ### wp plugin is-active
@@ -1036,7 +1046,7 @@ wp theme install <theme|zip|url>... [--version=<version>] [--force] [--ignore-re
 **OPTIONS**
 
 	<theme|zip|url>...
-		One or more themes to install. Accepts a theme slug, the path to a local zip file, or a URL to a remote zip file.
+		One or more themes to install. Accepts a theme slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org theme directory.
 
 	[--version=<version>]
 		If set, get that particular version from wordpress.org, instead of the
@@ -1075,6 +1085,16 @@ wp theme install <theme|zip|url>... [--version=<version>] [--force] [--ignore-re
     # Install from a remote zip file
     $ wp theme install http://s3.amazonaws.com/bucketname/my-theme.zip?AWSAccessKeyId=123&Expires=456&Signature=abcdef
 
+    # Install from a WordPress.org theme directory URL
+    $ wp theme install https://wordpress.org/themes/twentysixteen/
+    Detected WordPress.org themes directory URL, using slug: twentysixteen
+    Installing Twenty Sixteen (1.2)
+    Downloading install package from http://downloads.wordpress.org/theme/twentysixteen.1.2.zip...
+    Unpacking the package...
+    Installing the theme...
+    Theme installed successfully.
+    Success: Installed 1 of 1 themes.
+
 
 
 ### wp theme is-active
@@ -1178,6 +1198,7 @@ These fields will be displayed by default for each theme:
 * version
 * update_version
 * auto_update
+* type
 
 These fields are optionally available:
 
@@ -1190,9 +1211,9 @@ These fields are optionally available:
 
     # 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
 
 
 
diff --git a/features/plugin-activate.feature b/features/plugin-activate.feature
@@ -154,3 +154,26 @@ Feature: Activate WordPress plugins
       Success:
       """
     And the return code should be 0
+
+  Scenario: Activating a plugin that generates unexpected output shows the output in debug mode
+    Given a wp-content/plugins/output-plugin.php file:
+      """
+      <?php
+      /**
+       * Plugin Name: Output Plugin
+       * Description: This plugin generates unexpected output during activation
+       * Author: WP-CLI tests
+       */
+      echo "Unexpected output from plugin activation";
+      """
+
+    When I try `wp plugin activate output-plugin --debug`
+    Then STDERR should contain:
+      """
+      Warning: Failed to activate plugin. The plugin generated unexpected output.
+      """
+    And STDERR should contain:
+      """
+      Debug (plugin): Unexpected output: Unexpected output from plugin activation
+      """
+    And the return code should be 1
diff --git a/features/plugin-install.feature b/features/plugin-install.feature
@@ -273,3 +273,35 @@ Feature: Install WordPress plugins
       """
       Error: No plugins installed.
       """
+
+  Scenario: Install plugin using WordPress.org directory URL
+    Given a WP install
+
+    When I run `wp plugin install https://wordpress.org/plugins/hello-dolly/`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org plugins directory URL, using slug: hello-dolly
+      """
+    And the return code should be 0
+
+    When I run `wp plugin list --name=hello-dolly --field=status`
+    Then STDOUT should be:
+      """
+      inactive
+      """
+
+  Scenario: Install and activate plugin using WordPress.org directory URL
+    Given a WP install
+
+    When I run `wp plugin install https://wordpress.org/plugins/hello-dolly/ --activate`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org plugins directory URL, using slug: hello-dolly
+      """
+    And the return code should be 0
+
+    When I run `wp plugin list --name=hello-dolly --field=status`
+    Then STDOUT should be:
+      """
+      active
+      """
diff --git a/features/theme-install.feature b/features/theme-install.feature
@@ -158,3 +158,31 @@ Feature: Install WordPress themes
       """
       Error: No themes installed.
       """
+
+  Scenario: Install theme using WordPress.org directory URL
+    When I run `wp theme install https://wordpress.org/themes/twentytwelve/`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org themes directory URL, using slug: twentytwelve
+      """
+    And the return code should be 0
+
+    When I run `wp theme list --name=twentytwelve --field=status`
+    Then STDOUT should be:
+      """
+      inactive
+      """
+
+  Scenario: Install and activate theme using WordPress.org directory URL
+    When I run `wp theme install https://wordpress.org/themes/twentyeleven/ --activate`
+    Then STDOUT should contain:
+      """
+      Detected WordPress.org themes directory URL, using slug: twentyeleven
+      """
+    And the return code should be 0
+
+    When I run `wp theme list --name=twentyeleven --field=status`
+    Then STDOUT should be:
+      """
+      active
+      """
diff --git a/src/Plugin_Command.php b/src/Plugin_Command.php
@@ -401,6 +401,16 @@ public function activate( $args, $assoc_args = [] ) {
 				$message = wp_strip_all_tags( $message );
 				$message = str_replace( 'Error: ', '', $message );
 				WP_CLI::warning( "Failed to activate plugin. {$message}" );
+				// If the error is due to unexpected output, display it for debugging
+				if ( 'unexpected_output' === $result->get_error_code() ) {
+					/**
+					 * @var string $output
+					 */
+					$output = $result->get_error_data();
+					if ( ! empty( $output ) ) {
+						WP_CLI::debug( "Unexpected output: {$output}", 'plugin' );
+					}
+				}
 				++$errors;
 			} else {
 				$this->active_output( $plugin->name, $plugin->file, $network_wide, 'activate' );
@@ -631,7 +641,7 @@ protected function install_from_repo( $slug, $assoc_args ) {
 			}
 
 			if ( ! $compatible_php ) {
-				return new WP_Error( 'requirements_not_met', "This plugin does not work with your version of PHP. Minimum PHP required is $compatible_php" );
+				return new WP_Error( 'requirements_not_met', "This plugin does not work with your version of PHP. Minimum PHP required is $requires_php" );
 			}
 		}
 
@@ -994,7 +1004,7 @@ protected function filter_item_list( $items, $args ) {
 	 * ## OPTIONS
 	 *
 	 * <plugin|zip|url>...
-	 * : One or more plugins to install. Accepts a plugin slug, the path to a local zip file, or a URL to a remote zip file.
+	 * : One or more plugins to install. Accepts a plugin slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org plugin directory.
 	 *
 	 * [--version=<version>]
 	 * : If set, get that particular version from wordpress.org, instead of the
@@ -1086,6 +1096,16 @@ protected function filter_item_list( $items, $args ) {
 	 *     Installing My Plugin (3.5.0)
 	 *     Plugin installed successfully.
 	 *     Success: Installed 3 of 3 plugins.
+	 *
+	 *     # Install from a WordPress.org plugin directory URL
+	 *     $ wp plugin install https://wordpress.org/plugins/akismet/
+	 *     Detected WordPress.org plugins directory URL, using slug: akismet
+	 *     Installing Akismet Anti-spam: Spam Protection (3.1.11)
+	 *     Downloading install package from https://downloads.wordpress.org/plugin/akismet.3.1.11.zip...
+	 *     Unpacking the package...
+	 *     Installing the plugin...
+	 *     Plugin installed successfully.
+	 *     Success: Installed 1 of 1 plugins.
 	 */
 	public function install( $args, $assoc_args ) {
 
diff --git a/src/Theme_Command.php b/src/Theme_Command.php
@@ -497,7 +497,7 @@ protected function filter_item_list( $items, $args ) {
 	 * ## OPTIONS
 	 *
 	 * <theme|zip|url>...
-	 * : One or more themes to install. Accepts a theme slug, the path to a local zip file, or a URL to a remote zip file.
+	 * : One or more themes to install. Accepts a theme slug, the path to a local zip file, a URL to a remote zip file, or a URL to a WordPress.org theme directory.
 	 *
 	 * [--version=<version>]
 	 * : If set, get that particular version from wordpress.org, instead of the
@@ -535,6 +535,16 @@ protected function filter_item_list( $items, $args ) {
 	 *
 	 *     # Install from a remote zip file
 	 *     $ wp theme install http://s3.amazonaws.com/bucketname/my-theme.zip?AWSAccessKeyId=123&Expires=456&Signature=abcdef
+	 *
+	 *     # Install from a WordPress.org theme directory URL
+	 *     $ wp theme install https://wordpress.org/themes/twentysixteen/
+	 *     Detected WordPress.org themes directory URL, using slug: twentysixteen
+	 *     Installing Twenty Sixteen (1.2)
+	 *     Downloading install package from http://downloads.wordpress.org/theme/twentysixteen.1.2.zip...
+	 *     Unpacking the package...
+	 *     Installing the theme...
+	 *     Theme installed successfully.
+	 *     Success: Installed 1 of 1 themes.
 	 */
 	public function install( $args, $assoc_args ) {
 		if ( count( $args ) > 1 && Utils\get_flag_value( $assoc_args, 'activate', false ) ) {
diff --git a/src/WP_CLI/CommandWithUpgrade.php b/src/WP_CLI/CommandWithUpgrade.php
@@ -212,6 +212,17 @@ public function install( $args, $assoc_args ) {
 
 					WP_CLI::log( 'Latest release resolved to ' . $version['name'] );
 				}
+
+				// Check if this is a WordPress.org plugin/theme directory URL.
+				// If so, extract the slug and treat it as a repository installation.
+				// Pattern matches: https://wordpress.org/plugins/plugin-slug/ or https://wordpress.org/themes/theme-slug/
+				// Capture group 1: type (plugins|themes)
+				// Capture group 2: slug (the plugin or theme slug name)
+				if ( preg_match( '~^https?://wordpress\.org/(plugins|themes)/([^/]+)/?$~', $slug, $matches ) ) {
+					$slug      = $matches[2]; // Extract the slug.
+					$is_remote = false;
+					WP_CLI::log( sprintf( 'Detected WordPress.org %s directory URL, using slug: %s', $matches[1], $slug ) );
+				}
 			}
 
 			// Check if a URL to a remote or local zip has been specified.
