Swap around

Author: swissspidy

src/Context/GivenStepDefinitions.php

@@ -132,11 +132,11 @@ public function request( \$url, \$headers = array(), \$data = array(), \$options
 			}
 		}
 
-		if ( class_exists( 'Requests_Transport_cURL' ) ) {
-			return ( new Requests_Transport_cURL() )->request( \$url, \$headers, \$data, \$options );
+		if ( class_exists( '\WpOrg\Requests\Transport\Curl' ) ) {
+			return ( new WpOrg\Requests\Transport\Curl() )->request( \$url, \$headers, \$data, \$options );
 		}
 
-		return ( new WpOrg\Requests\Transport\Curl() )->request( \$url, \$headers, \$data, \$options );
+		return ( new Requests_Transport_cURL() )->request( \$url, \$headers, \$data, \$options );
 	}
 
 	public function request_multiple( \$requests, \$options ) {
@@ -148,12 +148,12 @@ public static function test( \$capabilities = array() ) {
 	}
 }
 
-if ( interface_exists( 'Requests_Transport' ) ) {
-	class WP_CLI_Tests_Mock_Requests_Transport implements Requests_Transport {
+if ( interface_exists( '\WpOrg\Requests\Transport' ) ) {
+	class WP_CLI_Tests_Mock_Requests_Transport implements WpOrg\Requests\Transport {
 		use WP_CLI_Tests_Mock_Requests_Trait;
 	}
 } else {
-	class WP_CLI_Tests_Mock_Requests_Transport implements WpOrg\Requests\Transport {
+	class WP_CLI_Tests_Mock_Requests_Transport implements Requests_Transport {
 		use WP_CLI_Tests_Mock_Requests_Trait;
 	}
 }
@@ -179,8 +179,8 @@ static function( \$pre, \$parsed_args, \$url ) {
 					\$response = substr( \$response, 0, \$pos ) . "\r\n\r\n" . substr( \$response, \$pos + 2 );
 				}
 
-				if ( class_exists( '\Requests' ) ) {
-					\Requests::parse_multiple(
+				if ( class_exists( '\WpOrg\Requests\Requests' ) ) {
+					WpOrg\Requests\Requests::parse_multiple(
 						\$response,
 						array(
 							'url'     => \$url,
@@ -189,13 +189,13 @@ static function( \$pre, \$parsed_args, \$url ) {
 							'options' => array_merge(
 								Requests::OPTION_DEFAULTS,
 								array(
-									'hooks' => new Requests_Hooks(),
+									'hooks' => new WpOrg\Requests\Hooks(),
 								)
 							),
 						)
 					);
 				} else {
-					WpOrg\Requests\Requests::parse_multiple(
+					\Requests::parse_multiple(
 						\$response,
 						array(
 							'url'     => \$url,
@@ -204,14 +204,13 @@ static function( \$pre, \$parsed_args, \$url ) {
 							'options' => array_merge(
 								Requests::OPTION_DEFAULTS,
 								array(
-									'hooks' => new WpOrg\Requests\Hooks(),
+									'hooks' => new Requests_Hooks(),
 								)
 							),
 						)
 					);
 				}
 
-
 				return array(
 					'headers'  => \$response->headers->getAll(),
 					'body'     => \$response->body,