Changeset 51825 for trunk/src/wp-includes/class-wp-http-streams.php

Timestamp:

09/19/2021 04:59:35 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Rename the $arrURL variable to $parsed_url in WP_Http_Streams::request().

This fixes a Variable "$arrURL" is not in valid snake_case format WPCS warning.

Follow-up to [8620], [10509], [25044], [25224], [45667], [51823], [51824].

See #53359.

File:

• trunk/src/wp-includes/class-wp-http-streams.php (modified) (7 diffs)

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

@@ -52 +52 @@
         WP_Http::buildCookieHeader( $parsed_args );
 
-        $arrURL = parse_url( $url );
-
-        $connect_host = $arrURL['host'];
-
-        $secure_transport = ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] );
-        if ( ! isset( $arrURL['port'] ) ) {
-            if ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] ) {
-                $arrURL['port']   = 443;
-                $secure_transport = true;
+        $parsed_url = parse_url( $url );
+
+        $connect_host = $parsed_url['host'];
+
+        $secure_transport = ( 'ssl' === $parsed_url['scheme'] || 'https' === $parsed_url['scheme'] );
+        if ( ! isset( $parsed_url['port'] ) ) {
+            if ( 'ssl' === $parsed_url['scheme'] || 'https' === $parsed_url['scheme'] ) {
+                $parsed_url['port'] = 443;
+                $secure_transport   = true;
             } else {
-                $arrURL['port'] = 80;
+                $parsed_url['port'] = 80;
             }
         }
 
         // Always pass a path, defaulting to the root in cases such as http://example.com.
-        if ( ! isset( $arrURL['path'] ) ) {
-            $arrURL['path'] = '/';
+        if ( ! isset( $parsed_url['path'] ) ) {
+            $parsed_url['path'] = '/';
         }
 
         if ( isset( $parsed_args['headers']['Host'] ) || isset( $parsed_args['headers']['host'] ) ) {
             if ( isset( $parsed_args['headers']['Host'] ) ) {
-                $arrURL['host'] = $parsed_args['headers']['Host'];
+                $parsed_url['host'] = $parsed_args['headers']['Host'];
             } else {
-                $arrURL['host'] = $parsed_args['headers']['host'];
+                $parsed_url['host'] = $parsed_args['headers']['host'];
             }
             unset( $parsed_args['headers']['Host'], $parsed_args['headers']['host'] );
@@ -115 +115 @@
                 'ssl' => array(
                     'verify_peer'       => $ssl_verify,
-                    // 'CN_match' => $arrURL['host'], // This is handled by self::verify_ssl_certificate().
+                    // 'CN_match' => $parsed_url['host'], // This is handled by self::verify_ssl_certificate().
                     'capture_peer_cert' => $ssl_verify,
                     'SNI_enabled'       => true,
@@ -145 +145 @@
             } else {
                 // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
-                $handle = @stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+                $handle = @stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
             }
 
@@ -155 +155 @@
                 $handle = stream_socket_client( 'tcp://' . $proxy->host() . ':' . $proxy->port(), $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
             } else {
-                $handle = stream_socket_client( $connect_host . ':' . $arrURL['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
+                $handle = stream_socket_client( $connect_host . ':' . $parsed_url['port'], $connection_error, $connection_error_str, $connect_timeout, STREAM_CLIENT_CONNECT, $context );
             }
         }
@@ -170 +170 @@
         // Verify that the SSL certificate is valid for this request.
         if ( $secure_transport && $ssl_verify && ! $proxy->is_enabled() ) {
-            if ( ! self::verify_ssl_certificate( $handle, $arrURL['host'] ) ) {
+            if ( ! self::verify_ssl_certificate( $handle, $parsed_url['host'] ) ) {
                 return new WP_Error( 'http_request_failed', __( 'The SSL certificate for the host could not be verified.' ) );
             }
@@ -180 +180 @@
             $requestPath = $url;
         } else {
-            $requestPath = $arrURL['path'] . ( isset( $arrURL['query'] ) ? '?' . $arrURL['query'] : '' );
+            $requestPath = $parsed_url['path'] . ( isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '' );
         }
 
@@ -187 +187 @@
         $include_port_in_host_header = (
             ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
-            ( 'http' === $arrURL['scheme'] && 80 != $arrURL['port'] ) ||
-            ( 'https' === $arrURL['scheme'] && 443 != $arrURL['port'] )
+            ( 'http' === $parsed_url['scheme'] && 80 != $parsed_url['port'] ) ||
+            ( 'https' === $parsed_url['scheme'] && 443 != $parsed_url['port'] )
         );
 
         if ( $include_port_in_host_header ) {
-            $strHeaders .= 'Host: ' . $arrURL['host'] . ':' . $arrURL['port'] . "\r\n";
+            $strHeaders .= 'Host: ' . $parsed_url['host'] . ':' . $parsed_url['port'] . "\r\n";
         } else {
-            $strHeaders .= 'Host: ' . $arrURL['host'] . "\r\n";
+            $strHeaders .= 'Host: ' . $parsed_url['host'] . "\r\n";
         }