Upgrade to Requests 2.0: documentation updates only

Author: jrfnl

src/wp-includes/class-wp-http-requests-hooks.php

@@ -12,7 +12,7 @@
  *
  * @since 4.7.0
  *
- * @see Requests_Hooks
+ * @see WpOrg\Requests\Hooks
  */
 #[AllowDynamicProperties]
 class WP_HTTP_Requests_Hooks extends WpOrg\Requests\Hooks {

src/wp-includes/class-wp-http-requests-response.php

@@ -8,7 +8,7 @@
  */
 
 /**
- * Core wrapper object for a Requests_Response for standardisation.
+ * Core wrapper object for a WpOrg\Requests\Response for standardisation.
  *
  * @since 4.6.0
  *
@@ -19,7 +19,7 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 * Requests Response object.
 	 *
 	 * @since 4.6.0
-	 * @var Requests_Response
+	 * @var \WpOrg\Requests\Response
 	 */
 	protected $response;
 
@@ -36,8 +36,8 @@ class WP_HTTP_Requests_Response extends WP_HTTP_Response {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @param Requests_Response $response HTTP response.
-	 * @param string            $filename Optional. File name. Default empty.
+	 * @param \WpOrg\Requests\Response $response HTTP response.
+	 * @param string                   $filename Optional. File name. Default empty.
 	 */
 	public function __construct( WpOrg\Requests\Response $response, $filename = '' ) {
 		$this->response = $response;
@@ -49,7 +49,7 @@ public function __construct( WpOrg\Requests\Response $response, $filename = '' )
 	 *
 	 * @since 4.6.0
 	 *
-	 * @return Requests_Response HTTP response.
+	 * @return WpOrg\Requests\Response HTTP response.
 	 */
 	public function get_response_object() {
 		return $this->response;
@@ -60,7 +60,7 @@ public function get_response_object() {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @return \Requests_Utility_CaseInsensitiveDictionary Map of header name to header value.
+	 * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary Map of header name to header value.
 	 */
 	public function get_headers() {
 		// Ensure headers remain case-insensitive.

src/wp-includes/class-wp-http.php

@@ -347,7 +347,7 @@ public function request( $url, $args = array() ) {
 			$options['max_bytes'] = $parsed_args['limit_response_size'];
 		}
 
-		// If we've got cookies, use and convert them to Requests_Cookie.
+		// If we've got cookies, use and convert them to WpOrg\Requests\Cookie.
 		if ( ! empty( $parsed_args['cookies'] ) ) {
 			$options['cookies'] = WP_Http::normalize_cookies( $parsed_args['cookies'] );
 		}
@@ -453,7 +453,7 @@ public function request( $url, $args = array() ) {
 	 * @since 4.6.0
 	 *
 	 * @param array $cookies Array of cookies to send with the request.
-	 * @return Requests_Cookie_Jar Cookie holder object.
+	 * @return WpOrg\Requests\Cookie\Jar Cookie holder object.
 	 */
 	public static function normalize_cookies( $cookies ) {
 		$cookie_jar = new WpOrg\Requests\Cookie\Jar();
@@ -484,11 +484,11 @@ static function( $attr ) {
 	 *
 	 * @since 4.6.0
 	 *
-	 * @param string            $location URL to redirect to.
-	 * @param array             $headers  Headers for the redirect.
-	 * @param string|array      $data     Body to send with the request.
-	 * @param array             $options  Redirect request options.
-	 * @param Requests_Response $original Response object.
+	 * @param string                  $location URL to redirect to.
+	 * @param array                   $headers  Headers for the redirect.
+	 * @param string|array            $data     Body to send with the request.
+	 * @param array                   $options  Redirect request options.
+	 * @param WpOrg\Requests\Response $original Response object.
 	 */
 	public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {
 		// Browser compatibility.
@@ -502,7 +502,7 @@ public static function browser_redirect_compatibility( $location, $headers, $dat
 	 *
 	 * @since 4.7.5
 	 *
-	 * @throws Requests_Exception On unsuccessful URL validation.
+	 * @throws WpOrg\Requests\Exception On unsuccessful URL validation.
 	 * @param string $location URL to redirect to.
 	 */
 	public static function validate_redirects( $location ) {

src/wp-includes/deprecated.php

@@ -3654,7 +3654,7 @@ function post_permalink( $post = 0 ) {
  * @param string|bool $file_path Optional. File path to write request to. Default false.
  * @param int         $red       Optional. The number of Redirects followed, Upon 5 being hit,
  *                               returns false. Default 1.
- * @return \Requests_Utility_CaseInsensitiveDictionary|false Headers on success, false on failure.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|false Headers on success, false on failure.
  */
 function wp_get_http( $url, $file_path = false, $red = 1 ) {
 	_deprecated_function( __FUNCTION__, '4.4.0', 'WP_Http' );

src/wp-includes/functions.php

@@ -978,7 +978,7 @@ function do_enclose( $content, $post ) {
  *
  * @param string $url        URL to retrieve HTTP headers from.
  * @param bool   $deprecated Not Used.
- * @return \Requests_Utility_CaseInsensitiveDictionary|false Headers on success, false on failure.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|false Headers on success, false on failure.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
 	if ( ! empty( $deprecated ) ) {

src/wp-includes/http.php

@@ -200,13 +200,13 @@ function wp_remote_head( $url, $args = array() ) {
  * Retrieve only the headers from the raw response.
  *
  * @since 2.7.0
- * @since 4.6.0 Return value changed from an array to an Requests_Utility_CaseInsensitiveDictionary instance.
+ * @since 4.6.0 Return value changed from an array to an WpOrg\Requests\Utility\CaseInsensitiveDictionary instance.
  *
- * @see \Requests_Utility_CaseInsensitiveDictionary
+ * @see \WpOrg\Requests\Utility\CaseInsensitiveDictionary
  *
  * @param array|WP_Error $response HTTP response.
- * @return \Requests_Utility_CaseInsensitiveDictionary|array The headers of the response, or empty array
- *                                                           if incorrect parameter given.
+ * @return \WpOrg\Requests\Utility\CaseInsensitiveDictionary|array The headers of the response, or empty array
+ *                                                                 if incorrect parameter given.
  */
 function wp_remote_retrieve_headers( $response ) {
 	if ( is_wp_error( $response ) || ! isset( $response['headers'] ) ) {

tests/phpunit/tests/http/functions.php

@@ -231,7 +231,7 @@ public function test_get_cookie_host_only() {
 		$this->assertSame( $cookie->domain, 'wordpress.org' );
 		$this->assertFalse( $cookie->host_only, 'host-only flag not set' );
 
-		// Regurgitate (Requests_Cookie -> WP_Http_Cookie -> Requests_Cookie).
+		// Regurgitate (WpOrg\Requests\Cookie -> WP_Http_Cookie -> WpOrg\Requests\Cookie).
 		$cookies = WP_Http::normalize_cookies( wp_remote_retrieve_cookies( $response ) );
 		$this->assertFalse( $cookies['test']->flags['host-only'], 'host-only flag data lost' );
 	}