Add fix for Requests v2 and tests

Author: schlessera

features/requests.feature

@@ -0,0 +1,134 @@
+Feature: Requests integration with both v1 and v2
+
+  Scenario: Composer stack with Requests v1
+    Given an empty directory
+    And a composer.json file:
+      """
+      {
+          "name": "wp-cli/composer-test",
+          "type": "project",
+          "require": {
+              "wp-cli/wp-cli": "2.7.0",
+              "wp-cli/core-command": "^2",
+              "wp-cli/eval-command": "^2"
+          }
+      }
+      """
+    # Note: Composer outputs messages to stderr.
+    And I run `composer install --no-interaction 2>&1`
+
+    When I run `vendor/bin/wp cli version`
+    Then STDOUT should contain:
+      """
+      WP-CLI 2.7.0
+      """
+
+    Given a WP installation
+    And I run `vendor/bin/wp core update --version=5.8 --force`
+
+    When I run `vendor/bin/wp core version`
+    Then STDOUT should contain:
+      """
+      5.8
+      """
+
+    When I run `vendor/bin/wp eval 'var_dump( \WP_CLI\Utils\http_request( "GET", "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(Requests_Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+  Scenario: Current version with WordPress-bundled Requests v1
+    Given a WP installation
+    And I run `wp core update --version=5.8 --force`
+
+    When I run `wp core version`
+    Then STDOUT should contain:
+      """
+      5.8
+      """
+
+    When I run `wp eval 'var_dump( \WP_CLI\Utils\http_request( "GET", "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+    When I run `wp eval 'var_dump( \WpOrg\Requests\Requests::get( "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+    When I run `wp eval 'var_dump( \Requests::get( "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+  Scenario: Current version with WordPress-bundled Requests v2
+    Given a WP installation
+    And I run `wp core update --version=6.2 --force`
+
+    When I run `wp core version`
+    Then STDOUT should contain:
+      """
+      6.2
+      """
+
+    When I run `wp eval 'var_dump( \WP_CLI\Utils\http_request( "GET", "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+    When I run `wp eval 'var_dump( \WpOrg\Requests\Requests::get( "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should be empty
+
+    # Expect a deprecation warning here.
+    When I try `wp eval 'var_dump( \Requests::get( "https://example.com/" ) );'`
+    Then STDOUT should contain:
+      """
+      object(WpOrg\Requests\Response)
+      """
+    And STDOUT should contain:
+      """
+      HTTP/1.1 200 OK
+      """
+    And STDERR should contain:
+      """
+      The PSR-0 `Requests_...` class names in the Requests library are deprecated.
+      """

utils/make-phar.php

@@ -290,7 +290,7 @@ function get_composer_versions( $current_version ) {
 	add_file( $phar, WP_CLI_VENDOR_DIR . '/composer/composer/LICENSE' );
 	add_file( $phar, WP_CLI_VENDOR_DIR . '/composer/composer/res/composer-schema.json' );
 }
-add_file( $phar, WP_CLI_VENDOR_DIR . '/rmccue/requests/library/Requests/Transport/cacert.pem' );
+add_file( $phar, WP_CLI_VENDOR_DIR . '/rmccue/requests/certificates/cacert.pem' );
 
 set_file_contents( $phar, WP_CLI_ROOT . '/COMPOSER_VERSIONS', get_composer_versions( $current_version ) );
 set_file_contents( $phar, WP_CLI_ROOT . '/VERSION', $current_version );