Ticket #54728: 54728.5.diff

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

@@ -258 +258 @@
                 curl_exec( $handle );
 
                 $processed_headers   = WP_Http::processHeaders( $this->headers, $url );
-                $theBody             = $this->body;
+                $the_body            = $this->body;
                 $bytes_written_total = $this->bytes_written_total;
 
                 $this->headers             = '';
@@ -268 +268 @@
                 $curl_error = curl_errno( $handle );
 
                 // If an error occurred, or, no response.
-                if ( $curl_error || ( 0 == strlen( $theBody ) && empty( $processed_headers['headers'] ) ) ) {
+                if ( $curl_error || ( 0 == strlen( $the_body ) && empty( $processed_headers['headers'] ) ) ) {
                         if ( CURLE_WRITE_ERROR /* 23 */ == $curl_error ) {
                                 if ( ! $this->max_body_length || $this->max_body_length != $bytes_written_total ) {
                                         if ( $parsed_args['stream'] ) {
@@ -316 +316 @@
                 if ( true === $parsed_args['decompress']
                         && true === WP_Http_Encoding::should_decode( $processed_headers['headers'] )
                 ) {
-                        $theBody = WP_Http_Encoding::decompress( $theBody );
+                        $the_body = WP_Http_Encoding::decompress( $the_body );
                 }
 
-                $response['body'] = $theBody;
+                $response['body'] = $the_body;
 
                 return $response;
         }

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

@@ -206 +206 @@
                 stream_set_timeout( $handle, $timeout, $utimeout );
 
                 if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) { // Some proxies require full URL in this field.
-                        $requestPath = $url;
+                        $request_path = $url;
                 } else {
-                        $requestPath = $parsed_url['path'] . ( isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '' );
+                        $request_path = $parsed_url['path'] . ( isset( $parsed_url['query'] ) ? '?' . $parsed_url['query'] : '' );
                 }
 
-                $strHeaders = strtoupper( $parsed_args['method'] ) . ' ' . $requestPath . ' HTTP/' . $parsed_args['httpversion'] . "\r\n";
+                $str_headers = strtoupper( $parsed_args['method'] ) . ' ' . $request_path . ' HTTP/' . $parsed_args['httpversion'] . "\r\n";
 
                 $include_port_in_host_header = (
                         ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) )
@@ -220 +220 @@
                 );
 
                 if ( $include_port_in_host_header ) {
-                        $strHeaders .= 'Host: ' . $parsed_url['host'] . ':' . $parsed_url['port'] . "\r\n";
+                        $str_headers .= 'Host: ' . $parsed_url['host'] . ':' . $parsed_url['port'] . "\r\n";
                 } else {
-                        $strHeaders .= 'Host: ' . $parsed_url['host'] . "\r\n";
+                        $str_headers .= 'Host: ' . $parsed_url['host'] . "\r\n";
                 }
 
                 if ( isset( $parsed_args['user-agent'] ) ) {
-                        $strHeaders .= 'User-agent: ' . $parsed_args['user-agent'] . "\r\n";
+                        $str_headers .= 'User-agent: ' . $parsed_args['user-agent'] . "\r\n";
                 }
 
                 if ( is_array( $parsed_args['headers'] ) ) {
-                        foreach ( (array) $parsed_args['headers'] as $header => $headerValue ) {
-                                $strHeaders .= $header . ': ' . $headerValue . "\r\n";
+                        foreach ( (array) $parsed_args['headers'] as $header => $header_value ) {
+                                $str_headers .= $header . ': ' . $header_value . "\r\n";
                         }
                 } else {
-                        $strHeaders .= $parsed_args['headers'];
+                        $str_headers .= $parsed_args['headers'];
                 }
 
                 if ( $proxy->use_authentication() ) {
-                        $strHeaders .= $proxy->authentication_header() . "\r\n";
+                        $str_headers .= $proxy->authentication_header() . "\r\n";
                 }
 
-                $strHeaders .= "\r\n";
+                $str_headers .= "\r\n";
 
                 if ( ! is_null( $parsed_args['body'] ) ) {
-                        $strHeaders .= $parsed_args['body'];
+                        $str_headers .= $parsed_args['body'];
                 }
 
-                fwrite( $handle, $strHeaders );
+                fwrite( $handle, $str_headers );
 
                 if ( ! $parsed_args['blocking'] ) {
                         stream_set_blocking( $handle, 0 );
@@ -263 +263 @@
                         );
                 }
 
-                $strResponse  = '';
-                $bodyStarted  = false;
+                $str_response = '';
+                $body_started = false;
                 $keep_reading = true;
                 $block_size   = 4096;
 
@@ -296 +296 @@
 
                         while ( ! feof( $handle ) && $keep_reading ) {
                                 $block = fread( $handle, $block_size );
-                                if ( ! $bodyStarted ) {
-                                        $strResponse .= $block;
-                                        if ( strpos( $strResponse, "\r\n\r\n" ) ) {
-                                                $processed_response = WP_Http::processResponse( $strResponse );
-                                                $bodyStarted        = true;
+                                if ( ! $body_started ) {
+                                        $str_response .= $block;
+                                        if ( strpos( $str_response, "\r\n\r\n" ) ) {
+                                                $processed_response = WP_Http::processResponse( $str_response );
+                                                $body_started       = true;
                                                 $block              = $processed_response['body'];
-                                                unset( $strResponse );
+                                                unset( $str_response );
                                                 $processed_response['body'] = '';
                                         }
                                 }
@@ -338 +338 @@
                         $header_length = 0;
 
                         while ( ! feof( $handle ) && $keep_reading ) {
-                                $block        = fread( $handle, $block_size );
-                                $strResponse .= $block;
+                                $block         = fread( $handle, $block_size );
+                                $str_response .= $block;
 
-                                if ( ! $bodyStarted && strpos( $strResponse, "\r\n\r\n" ) ) {
-                                        $header_length = strpos( $strResponse, "\r\n\r\n" ) + 4;
-                                        $bodyStarted   = true;
+                                if ( ! $body_started && strpos( $str_response, "\r\n\r\n" ) ) {
+                                        $header_length = strpos( $str_response, "\r\n\r\n" ) + 4;
+                                        $body_started  = true;
                                 }
 
                                 $keep_reading = (
-                                        ! $bodyStarted
+                                        ! $body_started
                                         || ! isset( $parsed_args['limit_response_size'] )
-                                        || strlen( $strResponse ) < ( $header_length + $parsed_args['limit_response_size'] )
+                                        || strlen( $str_response ) < ( $header_length + $parsed_args['limit_response_size'] )
                                 );
                         }
 
-                        $processed_response = WP_Http::processResponse( $strResponse );
-                        unset( $strResponse );
+                        $processed_response = WP_Http::processResponse( $str_response );
+                        unset( $str_response );
 
                 }
 

src/wp-includes/category-template.php

@@ -103 +103 @@
  *
  * @since 0.71
  *
- * @param int $cat_ID Category ID.
+ * @param int $cat_id Category ID.
  * @return string|WP_Error Category name on success, WP_Error on failure.
  */
-function get_the_category_by_ID( $cat_ID ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
-        $cat_ID   = (int) $cat_ID;
-        $category = get_term( $cat_ID );
+function get_the_category_by_ID( $cat_id ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
+        $cat_id   = (int) $cat_id;
+        $category = get_term( $cat_id );
 
         if ( is_wp_error( $category ) ) {
                 return $category;