Merge branch 'main' into fix/plugin-update-unavailable-wp-requires-reason

Author: swissspidy

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

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           persist-credentials: false
 

README.md

@@ -2191,7 +2191,7 @@ This project is licensed under the MIT License. See the [LICENSE](LICENSE) file
 
 ## Support
 
-GitHub issues aren't for general support questions, but there are other venues you can try: https://wp-cli.org/#support
+GitHub issues aren't for general support questions. For support resources and next steps, see the WP-CLI Support page: https://make.wordpress.org/cli/handbook/support/
 
 
 *This README.md is generated dynamically from the project's codebase using `wp scaffold package-readme` ([doc](https://github.com/wp-cli/scaffold-package-command#wp-scaffold-package-readme)). To suggest changes, please submit a pull request against the corresponding part of the codebase.*

features/plugin-status.feature

@@ -8,7 +8,7 @@ Feature: List the status of plugins
       <?php
       """
 
-    When I run `wp plugin status`
+    When I try `wp plugin status`
     Then STDOUT should contain:
       """
       D db-error.php
@@ -17,4 +17,13 @@ Feature: List the status of plugins
       """
       D = Drop-In
       """
-    And STDERR should be empty
+
+  Scenario: Plugin status command is deprecated
+    Given a WP install
+
+    When I try `wp plugin status`
+    Then STDERR should contain:
+      """
+      Warning: The `plugin status` command is deprecated. Use `wp plugin list` or `wp plugin get <plugin>` instead.
+      """
+    And the return code should be 0

features/plugin-uninstall.feature

@@ -160,7 +160,7 @@ Feature: Uninstall a WordPress plugin
   Scenario: Uninstalling a plugin should remove its language pack
     Given a WP install
     And I run `wp plugin install wordpress-importer`
-    And I run `wp core language install fr_FR`
+    And I run `wp language core install fr_FR`
     And I run `wp site switch-language fr_FR`
 
     When I run `wp language plugin install wordpress-importer fr_FR`
@@ -186,7 +186,7 @@ Feature: Uninstall a WordPress plugin
   Scenario: Uninstalling a plugin should remove its update info
     Given a WP install
     And I run `wp plugin install wordpress-importer --version=0.6`
-    And I run `wp plugin status wordpress-importer`
+    And I try `wp plugin status wordpress-importer`
 
     And I run `wp transient get --network update_plugins`
     Then STDOUT should contain:

features/plugin-update.feature

@@ -60,7 +60,7 @@ Feature: Update WordPress plugins
       package from https://downloads.wordpress.org/plugin/wordpress-importer.0.5.zip...
       """
 
-    When I run `wp plugin status wordpress-importer`
+    When I try `wp plugin status wordpress-importer`
     Then STDOUT should contain:
       """
       Update available
@@ -72,7 +72,7 @@ Feature: Update WordPress plugins
       wordpress-importer
       """
 
-    When I run `wp plugin status wordpress-importer`
+    When I try `wp plugin status wordpress-importer`
     Then STDOUT should contain:
       """
       Update available
@@ -240,7 +240,7 @@ Feature: Update WordPress plugins
 
   # Skipped on Windows because of sed usage that would need to be refactored for compatibility.
   @require-wp-5.2 @skip-windows
-  Scenario: Updating all plugins with some of them having an invalid version shouldn't report an error
+  Scenario: Updating all plugins ignores an older no-update version
     Given a WP install
     And I run `wp plugin delete akismet`
 
@@ -254,20 +254,11 @@ Feature: Update WordPress plugins
     Then STDOUT should be empty
     And the return code should be 0
 
-    When I try `wp plugin update --all`
-    Then STDERR should contain:
-      """
-      Warning: health-check: version higher than expected.
-      """
-
-    And STDOUT should not contain:
-      """
-      Error: Only updated 1 of 1 plugins.
-      """
-
+    When I run `wp plugin update --all`
+    Then STDERR should be empty
     And STDOUT should contain:
       """
-      Success: Updated 1 of 1 plugins (1 skipped).
+      Success: Updated 1 of 1 plugins.
       """
 
   # Tests for --auto-update-indicated feature

features/plugin.feature

@@ -5,7 +5,7 @@ Feature: Manage WordPress plugins
     And I run `wp plugin path`
     And save STDOUT as {PLUGIN_DIR}
 
-    When I run `wp plugin scaffold --skip-tests plugin1`
+    When I run `wp scaffold plugin --skip-tests plugin1`
     Then STDOUT should not be empty
     And the {PLUGIN_DIR}/plugin1/plugin1.php file should exist
     And the {PLUGIN_DIR}/zombieland/phpunit.xml.dist file should not exist
@@ -22,7 +22,7 @@ Feature: Manage WordPress plugins
       {PLUGIN_DIR}/plugin1
       """
 
-    When I run `wp plugin scaffold Zombieland`
+    When I run `wp scaffold plugin Zombieland`
     Then STDOUT should not be empty
     And the {PLUGIN_DIR}/Zombieland/Zombieland.php file should exist
     And the {PLUGIN_DIR}/Zombieland/phpunit.xml.dist file should exist
@@ -38,7 +38,7 @@ Feature: Manage WordPress plugins
 
     # Check that the inner-plugin is not picked up
     When I run `mv {PLUGIN_DIR}/plugin1 {PLUGIN_DIR}/Zombieland/`
-    And I run `wp plugin status Zombieland`
+    And I try `wp plugin status Zombieland`
     Then STDOUT should contain:
       """
       Plugin Zombieland details:
@@ -52,13 +52,13 @@ Feature: Manage WordPress plugins
     When I run `wp plugin activate Zombieland`
     Then STDOUT should not be empty
 
-    When I run `wp plugin status Zombieland`
+    When I try `wp plugin status Zombieland`
     Then STDOUT should contain:
       """
           Status: Active
       """
 
-    When I run `wp plugin status`
+    When I try `wp plugin status`
     Then STDOUT should not be empty
 
     When I run `wp plugin list --fields=name,status,update,version,update_version,auto_update`
@@ -198,7 +198,7 @@ Feature: Manage WordPress plugins
       Success: Activated 1 of 1 plugins.
       """
 
-    When I run `wp plugin status network-only`
+    When I try `wp plugin status network-only`
     Then STDOUT should contain:
       """
           Status: Active
@@ -220,7 +220,7 @@ Feature: Manage WordPress plugins
       Success: Activated 1 of 1 plugins.
       """
 
-    When I run `wp plugin status network-only`
+    When I try `wp plugin status network-only`
     Then STDOUT should contain:
       """
           Status: Network Active
@@ -731,56 +731,58 @@ Feature: Manage WordPress plugins
       | db-error.php |       | Custom database error message. | db-error.php |
 
   @require-wp-4.0
-  Scenario: Validate installed plugin's version.
-    Given a WP installation
-    And I run `wp plugin uninstall --all`
-    And I run `wp plugin install hello-dolly --force`
-    And a wp-content/mu-plugins/test-plugin-update.php file:
+  Scenario Outline: Treat an older or empty no-update version as up to date
+    Given a WP install
+    And a wp-content/plugins/example/example.php file:
       """
       <?php
       /**
-       * Plugin Name: Test Plugin Update
-       * Description: Fakes installed plugin's data to verify plugin version mismatch
-       * Author: WP-CLI tests
+       * Plugin Name: Example Plugin
+       * Version: 2.0.0
        */
+      """
+    And that HTTP requests to https://api.wordpress.org/plugins/update-check/1.1/ will respond with:
+      """
+      HTTP/1.1 200 OK
 
-      add_filter( 'site_transient_update_plugins', function( $value ) {
-          if ( ! is_object( $value ) ) {
-              return $value;
+      {
+        "plugins": [],
+        "translations": [],
+        "no_update": {
+          "example/example.php": {
+            "id": "vendor.example/plugins/example",
+            "slug": "example",
+            "plugin": "example/example.php",
+            "new_version": "<upstream_version>",
+            "package": ""
           }
-
-          unset( $value->response['hello-dolly/hello.php'] );
-          $value->no_update['hello-dolly/hello.php']->new_version = '1.5';
-
-          return $value;
-      } );
-      ?>
+        }
+      }
       """
 
-    When I run `wp plugin list --name=hello-dolly  --field=version`
-    Then save STDOUT as {PLUGIN_VERSION}
-
-    When I run `wp plugin list --name=hello-dolly  --field=update_version`
-    Then save STDOUT as {UPDATE_VERSION}
-
     When I run `wp plugin list`
     Then STDOUT should be a table containing rows:
-      | name               | status   | update                       | version          | update_version   | auto_update |
-      | hello-dolly        | inactive | version higher than expected | {PLUGIN_VERSION} | {UPDATE_VERSION} | off         |
+      | name    | status   | update | version | update_version | auto_update |
+      | example | inactive | none   | 2.0.0   |                | off         |
 
-    When I try `wp plugin update --all`
-    Then STDERR should be:
+    When I run `wp plugin update --all`
+    Then STDOUT should be:
       """
-      Warning: hello-dolly: version higher than expected.
-      Error: No plugins updated.
+      Success: Plugin already updated.
       """
+    And STDERR should be empty
 
-    When I try `wp plugin update hello-dolly`
-    Then STDERR should be:
+    When I run `wp plugin update example`
+    Then STDOUT should be:
       """
-      Warning: hello-dolly: version higher than expected.
-      Error: No plugins updated.
+      Success: Plugin already updated.
       """
+    And STDERR should be empty
+
+    Examples:
+      | upstream_version |
+      | 1.0.0            |
+      |                  |
 
   Scenario: Only valid status filters are accepted when listing plugins
     Given a WP install