Merge branch 'main' into fix/96-theme-mod-get-format

Author: swissspidy

.gitattributes

@@ -0,0 +1,14 @@
+/.actrc export-ignore
+/.distignore export-ignore
+/.editorconfig export-ignore
+/.github export-ignore
+/.gitignore export-ignore
+/.typos.toml export-ignore
+/AGENTS.md export-ignore
+/behat.yml export-ignore
+/features export-ignore
+/phpcs.xml.dist export-ignore
+/phpstan.neon.dist export-ignore
+/phpunit.xml.dist export-ignore
+/tests export-ignore
+/wp-cli.yml export-ignore

.github/workflows/copilot-setup-steps.yml

@@ -25,7 +25,7 @@ jobs:
 
       - name: Set up PHP environment
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: shivammathur/setup-php@44454db4f0199b8b9685a5d763dc37cbf79108e1 # v2
+        uses: shivammathur/setup-php@accd6127cb78bee3e8082180cb391013d204ef9f # v2
         with:
           php-version: 'latest'
           ini-values: zend.assertions=1, error_reporting=-1, display_errors=On
@@ -36,7 +36,7 @@ jobs:
 
       - name: Install Composer dependencies & cache dependencies
         if: steps.check_composer_file.outputs.files_exists == 'true'
-        uses: ramsey/composer-install@a35c6ebd3d08125aaf8852dff361e686a1a67947 # v3
+        uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # v3
         env:
           COMPOSER_ROOT_VERSION: dev-${{ github.event.repository.default_branch }}
         with:

README.md

@@ -858,7 +858,7 @@ wp plugin uninstall [<plugin>...] [--deactivate] [--skip-delete] [--all] [--excl
 Updates one or more plugins.
 
 ~~~
-wp plugin update [<plugin>...] [--all] [--exclude=<name>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure] [--auto-update-indicated]
+wp plugin update [<plugin>...] [--all] [--exclude=<name>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure] [--auto-update-indicated] [--include-vcs]
 ~~~
 
 **Alias:** `upgrade`
@@ -903,6 +903,9 @@ wp plugin update [<plugin>...] [--all] [--exclude=<name>] [--minor] [--patch] [-
 	[--auto-update-indicated]
 		Only update plugins where the server response indicates an automatic update. Updates to the version indicated by the server, not necessarily the latest version. Cannot be used with `--version`, `--minor`, or `--patch`.
 
+	[--include-vcs]
+		Include plugins that are version-controlled with a VCS (e.g. git, svn, hg). Skipped by default.
+
 **EXAMPLES**
 
     $ wp plugin update bbpress --version=dev
@@ -1813,7 +1816,7 @@ Lists the available theme updates. Similar to `wp core check-update`.
 Updates one or more themes.
 
 ~~~
-wp theme update [<theme>...] [--all] [--exclude=<theme-names>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure] [--auto-update-indicated]
+wp theme update [<theme>...] [--all] [--exclude=<theme-names>] [--minor] [--patch] [--format=<format>] [--version=<version>] [--dry-run] [--insecure] [--auto-update-indicated] [--include-vcs]
 ~~~
 
 **Alias:** `upgrade`
@@ -1858,6 +1861,9 @@ wp theme update [<theme>...] [--all] [--exclude=<theme-names>] [--minor] [--patc
 	[--auto-update-indicated]
 		Only update themes where the server response indicates an automatic update. Updates to the version indicated by the server, not necessarily the latest version. Cannot be used with `--version`, `--minor`, or `--patch`.
 
+	[--include-vcs]
+		Include themes that are version-controlled with a VCS (e.g. git, svn, hg). Skipped by default.
+
 **EXAMPLES**
 
     # Update multiple themes

features/plugin-update.feature

@@ -377,3 +377,36 @@ Feature: Update WordPress plugins
       """
       Success: Updated 2 of 2 plugins.
       """
+
+  @require-wp-5.2
+  Scenario: Skip plugin update when plugin directory is a VCS checkout
+    Given a WP install
+    And I run `wp plugin install wordpress-importer --version=0.5 --force`
+    And I run `wp plugin path wordpress-importer --dir`
+    And save STDOUT as {PLUGIN_DIR}
+
+    When I run `mkdir {PLUGIN_DIR}/.git`
+    And I try `wp plugin update wordpress-importer`
+    Then STDERR should contain:
+      """
+      Warning: wordpress-importer: Skipped update because a VCS checkout was detected. Use --include-vcs to override.
+      """
+    And STDERR should contain:
+      """
+      Error: No plugins updated.
+      """
+    And the return code should be 1
+
+  @require-wp-5.2
+  Scenario: Update plugin in VCS checkout when --include-vcs is set
+    Given a WP install
+    And I run `wp plugin install wordpress-importer --version=0.5 --force`
+    And I run `wp plugin path wordpress-importer --dir`
+    And save STDOUT as {PLUGIN_DIR}
+
+    When I run `mkdir {PLUGIN_DIR}/.git`
+    And I run `wp plugin update wordpress-importer --include-vcs`
+    Then STDOUT should contain:
+      """
+      Success: Updated 1 of 1 plugins.
+      """

features/theme-update.feature

@@ -257,3 +257,34 @@ Feature: Update WordPress themes
       """
       Success: Updated 2 of 2 themes.
       """
+
+  Scenario: Skip theme update when theme directory is a VCS checkout
+    Given a WP install
+    And I run `wp theme install twentytwelve --version=3.0 --force`
+    And I run `wp theme path twentytwelve --dir`
+    And save STDOUT as {THEME_DIR}
+
+    When I run `mkdir {THEME_DIR}/.git`
+    And I try `wp theme update twentytwelve`
+    Then STDERR should contain:
+      """
+      Warning: twentytwelve: Skipped update because a VCS checkout was detected. Use --include-vcs to override.
+      """
+    And STDERR should contain:
+      """
+      Error: No themes updated.
+      """
+    And the return code should be 1
+
+  Scenario: Update theme in VCS checkout when --include-vcs is set
+    Given a WP install
+    And I run `wp theme install twentytwelve --version=3.0 --force`
+    And I run `wp theme path twentytwelve --dir`
+    And save STDOUT as {THEME_DIR}
+
+    When I run `mkdir {THEME_DIR}/.git`
+    And I run `wp theme update twentytwelve --include-vcs`
+    Then STDOUT should contain:
+      """
+      Success: Updated 1 of 1 themes.
+      """

src/Plugin_AutoUpdates_Command.php

@@ -169,6 +169,8 @@ public function disable( $args, $assoc_args ) {
 			$auto_updates = [];
 		}
 
+		/** @var array<string> $auto_updates */
+
 		$count     = 0;
 		$successes = 0;
 

src/Plugin_Command.php

@@ -840,6 +840,9 @@ protected function install_from_repo( $slug, $assoc_args ) {
 	 * [--auto-update-indicated]
 	 * : Only update plugins where the server response indicates an automatic update. Updates to the version indicated by the server, not necessarily the latest version. Cannot be used with `--version`, `--minor`, or `--patch`.
 	 *
+	 * [--include-vcs]
+	 * : Include plugins that are version-controlled with a VCS (e.g. git, svn, hg). Skipped by default.
+	 *
 	 * ## EXAMPLES
 	 *
 	 *     $ wp plugin update bbpress --version=dev

src/Theme_AutoUpdates_Command.php

@@ -169,6 +169,8 @@ public function disable( $args, $assoc_args ) {
 			$auto_updates = [];
 		}
 
+		/** @var array<string> $auto_updates */
+
 		$count     = 0;
 		$successes = 0;
 

src/Theme_Command.php

@@ -792,6 +792,9 @@ public function get( $args, $assoc_args ) {
 	 * [--auto-update-indicated]
 	 * : Only update themes where the server response indicates an automatic update. Updates to the version indicated by the server, not necessarily the latest version. Cannot be used with `--version`, `--minor`, or `--patch`.
 	 *
+	 * [--include-vcs]
+	 * : Include themes that are version-controlled with a VCS (e.g. git, svn, hg). Skipped by default.
+	 *
 	 * ## EXAMPLES
 	 *
 	 *     # Update multiple themes

src/WP_CLI/CommandWithUpgrade.php

@@ -744,6 +744,30 @@ function ( $item ) {
 			}
 		}
 
+		// Skip VCS-controlled items unless --include-vcs is set.
+		if ( ! Utils\get_flag_value( $assoc_args, 'include-vcs', false ) && in_array( $this->item_type, [ 'plugin', 'theme' ], true ) ) {
+			if ( ! class_exists( 'WP_Automatic_Updater' ) ) {
+				if ( file_exists( ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php' ) ) {
+					require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
+				} else {
+					require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+				}
+			}
+			$automatic_updater = new \WP_Automatic_Updater();
+			foreach ( $items_to_update as $item_key => $item_info ) {
+				if ( 'plugin' === $this->item_type ) {
+					$item_dir = WP_PLUGIN_DIR . '/' . dirname( $item_key );
+				} else {
+					$item_dir = get_theme_root( $item_key ) . '/' . $item_key;
+				}
+				if ( $automatic_updater->is_vcs_checkout( $item_dir ) ) {
+					WP_CLI::warning( "{$item_info['name']}: Skipped update because a VCS checkout was detected. Use --include-vcs to override." );
+					++$skipped;
+					unset( $items_to_update[ $item_key ] );
+				}
+			}
+		}
+
 		if ( Utils\get_flag_value( $assoc_args, 'dry-run' ) ) {
 			if ( empty( $items_to_update ) ) {
 				WP_CLI::log( "No {$this->item_type} updates available." );