fix(requests): update Requests class and certificate path

Author: mrrobot47

php/EE/Bootstrap/IncludeFrameworkAutoloader.php

@@ -34,7 +34,7 @@ public function process( BootstrapState $state ) {
 		$mappings = [
 			'EE'                       => EE_ROOT . '/php/EE',
 			'cli'                      => EE_VENDOR_DIR . '/wp-cli/php-cli-tools/lib/cli',
-			'Requests'                 => EE_VENDOR_DIR . '/rmccue/requests/library/Requests',
+			'WpOrg\\Requests'          => EE_VENDOR_DIR . '/rmccue/requests/src', // New PSR-4 mapping
 			'Symfony\Component\Finder' => EE_VENDOR_DIR . '/symfony/finder/',
 			'Psr\Log'                  => EE_VENDOR_DIR . '/psr/log/Psr/Log/',
 			'Monolog'                  => EE_VENDOR_DIR . '/monolog/monolog/src/Monolog',
@@ -47,7 +47,6 @@ public function process( BootstrapState $state ) {
 			);
 		}
 
-		include_once EE_VENDOR_DIR . '/rmccue/requests/library/Requests.php';
 		include_once EE_VENDOR_DIR . '/wp-cli/mustangostang-spyc/Spyc.php';
 
 		$autoloader->register();

php/utils.php

@@ -492,12 +492,13 @@ function replace_path_consts( $source, $path ) {
  * @param string $method    HTTP method (GET, POST, DELETE, etc.)
  * @param string $url       URL to make the HTTP request to.
  * @param array $headers    Add specific headers to the request.
+ * @param array $data
  * @param array $options
  * @return object
  */
 function http_request( $method, $url, $data = null, $headers = array(), $options = array() ) {
 
-	$cert_path = '/rmccue/requests/library/Requests/Transport/cacert.pem';
+	$cert_path = '/rmccue/requests/certificates/cacert.pem';
 	$halt_on_error = ! isset( $options['halt_on_error'] ) || (bool) $options['halt_on_error'];
 	if ( inside_phar() ) {
 		// cURL can't read Phar archives
@@ -521,23 +522,31 @@ function http_request( $method, $url, $data = null, $headers = array(), $options
 	}
 
 	try {
-		return \Requests::request( $url, $headers, $data, $method, $options );
-	} catch ( \Requests_Exception $ex ) {
-		// CURLE_SSL_CACERT_BADFILE only defined for PHP >= 7.
-		if ( 'curlerror' !== $ex->getType() || ! in_array( curl_errno( $ex->getData() ), array( CURLE_SSL_CONNECT_ERROR, CURLE_SSL_CERTPROBLEM, 77 /*CURLE_SSL_CACERT_BADFILE*/ ), true ) ) {
-			$error_msg = sprintf( "Failed to get url '%s': %s.", $url, $ex->getMessage() );
-			if ( $halt_on_error ) {
-				EE::error( $error_msg );
-			}
-			throw new \RuntimeException( $error_msg, null, $ex );
-		}
+		// Updated class name: \WpOrg\Requests\Requests
+		$response = \WpOrg\Requests\Requests::request( $url, $headers, $data, $method, $options );
+		return $response;
+	} catch ( \WpOrg\Requests\Exception $ex ) { // Updated exception class name
+
 		// Handle SSL certificate issues gracefully
-		\EE::warning( sprintf( "Re-trying without verify after failing to get verified url '%s' %s.", $url, $ex->getMessage() ) );
-		$options['verify'] = false;
-		try {
-			return \Requests::request( $url, $headers, $data, $method, $options );
-		} catch ( \Requests_Exception $ex ) {
-			$error_msg = sprintf( "Failed to get non-verified url '%s' %s.", $url, $ex->getMessage() );
+		$curl_error = false;
+		if ( $ex instanceof \WpOrg\Requests\Exception\Transport\Curl ) {
+			$curl_error = true;
+		}
+
+		if ( $curl_error && in_array( $ex->getCode(), array( CURLE_SSL_CONNECT_ERROR, CURLE_SSL_CERTPROBLEM, 77 /*CURLE_SSL_CACERT_BADFILE*/ ), true ) ) {
+			\EE::warning( sprintf( "Re-trying without verify after failing to get verified url '%s' %s.", $url, $ex->getMessage() ) );
+			$options['verify'] = false;
+			try {
+				return \WpOrg\Requests\Requests::request( $url, $headers, $data, $method, $options );
+			} catch ( \WpOrg\Requests\Exception $ex ) {
+				$error_msg = sprintf( "Failed to get non-verified url '%s' %s.", $url, $ex->getMessage() );
+				if ( $halt_on_error ) {
+					EE::error( $error_msg );
+				}
+				throw new \RuntimeException( $error_msg, null, $ex );
+			}
+		} else {
+			$error_msg = sprintf( "Failed to get url '%s': %s.", $url, $ex->getMessage() );
 			if ( $halt_on_error ) {
 				EE::error( $error_msg );
 			}

tests/test-utils.php

@@ -383,7 +383,7 @@ public function testHttpRequestBadCAcert() {
 
 		// Hack to create bad CAcert, using Utils\get_vendor_paths() preference for a path as part of a Composer-installed larger project.
 		$vendor_dir = EE_ROOT . '/../../../vendor';
-		$cert_path = '/rmccue/requests/library/Requests/Transport/cacert.pem';
+		$cert_path = '/rmccue/requests/certificates/cacert.pem';
 		$bad_cacert_path = $vendor_dir . $cert_path;
 		if ( ! file_exists( $bad_cacert_path ) ) {
 			// Capture any directories created so can clean up.