From 2b9d7dec086e92dc8f5fbd09ccb5de8258959c70 Mon Sep 17 00:00:00 2001
From: wp-make-coffee <info@wp-cli.org>
Date: Thu, 3 Apr 2025 04:23:35 +0000
Subject: [PATCH 1/2] Update wp-cli framework - 2025-04-03

---
 composer.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.lock b/composer.lock
index cd92bb0dc..c540201e2 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3663,12 +3663,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/wp-cli/wp-cli.git",
-                "reference": "aeae8711ad62327b943f2fb9d1ed8770dd01b4d6"
+                "reference": "2e2c3c8f33285ccd9b30e7cb9b8b3c6f079b8b4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/aeae8711ad62327b943f2fb9d1ed8770dd01b4d6",
-                "reference": "aeae8711ad62327b943f2fb9d1ed8770dd01b4d6",
+                "url": "https://api.github.com/repos/wp-cli/wp-cli/zipball/2e2c3c8f33285ccd9b30e7cb9b8b3c6f079b8b4d",
+                "reference": "2e2c3c8f33285ccd9b30e7cb9b8b3c6f079b8b4d",
                 "shasum": ""
             },
             "require": {
@@ -3725,7 +3725,7 @@
                 "issues": "https://github.com/wp-cli/wp-cli/issues",
                 "source": "https://github.com/wp-cli/wp-cli"
             },
-            "time": "2025-03-28T12:17:54+00:00"
+            "time": "2025-04-02T14:54:42+00:00"
         },
         {
             "name": "wp-cli/wp-config-transformer",

From c158cb210a714635e5f2c980bbf4416c99477612 Mon Sep 17 00:00:00 2001
From: Nilambar Sharma <nilambar@outlook.com>
Date: Thu, 3 Apr 2025 11:01:32 +0545
Subject: [PATCH 2/2] Update feature tests

---
 features/bootstrap.feature | 16 ++++++++--------
 features/config.feature    | 20 ++++++++++----------
 features/requests.feature  |  2 +-
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/features/bootstrap.feature b/features/bootstrap.feature
index 80726f085..839acc8ee 100644
--- a/features/bootstrap.feature
+++ b/features/bootstrap.feature
@@ -44,13 +44,13 @@ Feature: Bootstrap WP-CLI
     And I run `composer install --working-dir={RUN_DIR}/cli-override-command --no-interaction 2>&1`
 
     When I run `{PHAR_PATH} cli version`
-      Then STDOUT should contain:
-        """
-        WP-CLI
-        """
+    Then STDOUT should contain:
+      """
+      WP-CLI
+      """
 
     When I run `{PHAR_PATH} --require=cli-override-command/cli.php cli version`
-      Then STDOUT should contain:
-        """
-        WP-Override-CLI
-        """
+    Then STDOUT should contain:
+      """
+      WP-Override-CLI
+      """
diff --git a/features/config.feature b/features/config.feature
index 9c734b242..14f7a92dc 100644
--- a/features/config.feature
+++ b/features/config.feature
@@ -4,10 +4,10 @@ Feature: wp-config.php tests
   # Only testing on MySQL because the SQLite drop-in is not added to the custom directories in this test.
   @require-mysql
   Scenario: __FILE__ and __DIR__ in wp-config.php don't point into the PHAR filesystem
-  Given a WP installation
-  And a new Phar with the same version
-  And a wp-config.php file:
-  """
+    Given a WP installation
+    And a new Phar with the same version
+    And a wp-config.php file:
+      """
       <?php
       define( 'DB_NAME', 'wp_cli_test' );
       define( 'DB_USER', '{DB_USER}' );
@@ -24,14 +24,14 @@ Feature: wp-config.php tests
       require_once( ABSPATH . 'wp-settings.php' );
       """
 
-  When I run `{PHAR_PATH} eval "echo 'WP_CONTENT_DIR => ' . WP_CONTENT_DIR;"`
-  Then STDOUT should not contain:
-  """
+    When I run `{PHAR_PATH} eval "echo 'WP_CONTENT_DIR => ' . WP_CONTENT_DIR;"`
+    Then STDOUT should not contain:
+      """
       WP_CONTENT_DIR => phar://
       """
 
-  When I run `{PHAR_PATH} eval "echo 'WP_PLUGIN_DIR => ' . WP_PLUGIN_DIR;"`
-  Then STDOUT should not contain:
-  """
+    When I run `{PHAR_PATH} eval "echo 'WP_PLUGIN_DIR => ' . WP_PLUGIN_DIR;"`
+    Then STDOUT should not contain:
+      """
       WP_PLUGIN_DIR => phar://
       """
diff --git a/features/requests.feature b/features/requests.feature
index 6a6feeb91..c4ab0d0d5 100644
--- a/features/requests.feature
+++ b/features/requests.feature
@@ -77,7 +77,7 @@ Feature: Requests integration with both v1 and v2
       Success: Installed 1 of 1 plugins.
       """
 
-    Scenario: Current version with WordPress-bundled Requests v2
+  Scenario: Current version with WordPress-bundled Requests v2
     Given a WP installation
     # Switch themes because twentytwentyfive requires a version newer than 6.2
     # and it would otherwise cause a fatal error further down.