Changeset 34123

Timestamp:

09/14/2015 05:36:37 PM (9 years ago)

Author:

wonderboymusic

Message:

Fix the case-sensitivity of some HTTP class usage.

See #33413.

Location:

trunk

Files:

• src/wp-includes/class-http.php (modified) (4 diffs)
• src/wp-includes/class-wp-http-streams.php (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/http/base.php (modified) (3 diffs)
• tests/phpunit/tests/http/http.php (modified) (2 diffs)

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

@@ -305 +305 @@
          * @since 3.7.0
          *
-         * @param array  $value Array of HTTP transports to check. Default array contains
-         *                      'curl', and 'streams', in that order.
-         * @param array  $args  HTTP request arguments.
-         * @param string $url   The URL to request.
+         * @param array  $transports Array of HTTP transports to check. Default array contains
+         *                           'curl', and 'streams', in that order.
+         * @param array  $args       HTTP request arguments.
+         * @param string $url        The URL to request.
          */
-        $request_order = apply_filters( 'http_api_transports', array( 'curl', 'streams' ), $args, $url );
+        $transports = array( 'curl', 'streams' );
+        $request_order = apply_filters( 'http_api_transports', $transports, $args, $url );
 
         // Loop over each transport on each HTTP request looking for one which will serve this request's needs.
         foreach ( $request_order as $transport ) {
-            $class = 'WP_HTTP_' . $transport;
+            if ( in_array( $transport, $transports ) ) {
+                $transport = ucfirst( $transport );
+            }
+            $class = 'WP_Http_' . $transport;
 
             // Check to see if this transport is a possibility, calls the transport statically.
@@ -549 +553 @@
             foreach ( $r['cookies'] as $name => $value ) {
                 if ( ! is_object( $value ) )
-                    $r['cookies'][ $name ] = new WP_HTTP_Cookie( array( 'name' => $name, 'value' => $value ) );
+                    $r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
             }
 
@@ -737 +741 @@
             return $maybe_relative_path;
 
-        if ( ! $url_parts = WP_HTTP::parse_url( $url ) ) {
+        if ( ! $url_parts = WP_Http::parse_url( $url ) ) {
             return $maybe_relative_path;
         }
 
-        if ( ! $relative_url_parts = WP_HTTP::parse_url( $maybe_relative_path ) ) {
+        if ( ! $relative_url_parts = WP_Http::parse_url( $maybe_relative_path ) ) {
             return $maybe_relative_path;
         }
@@ -825 +829 @@
             $redirect_location = array_pop( $redirect_location );
 
-        $redirect_location = WP_HTTP::make_absolute_url( $redirect_location, $url );
+        $redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
         // POST requests should not POST to a redirected location.

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

@@ -295 +295 @@
 
         // Handle redirects.
-        if ( false !== ( $redirect_response = WP_HTTP::handle_redirects( $url, $r, $response ) ) )
+        if ( false !== ( $redirect_response = WP_Http::handle_redirects( $url, $r, $response ) ) )
             return $redirect_response;
 
@@ -344 +344 @@
          * in the cert (if they exist)
          */
-        $host_type = ( WP_HTTP::is_ip_address( $host ) ? 'ip' : 'dns' );
+        $host_type = ( WP_Http::is_ip_address( $host ) ? 'ip' : 'dns' );
 
         $certificate_hostnames = array();

trunk/src/wp-includes/formatting.php

@@ -3998 +3998 @@
         ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
             $m[3] :
-            WP_HTTP::make_absolute_url( $m[3], $_links_add_base )
+            WP_Http::make_absolute_url( $m[3], $_links_add_base )
         )
         . $m[2];

trunk/tests/phpunit/tests/http/base.php

@@ -17 +17 @@
     function setUp() {
 
-        if ( is_callable( array('WP_HTTP', '_getTransport') ) ) {
-            $this->markTestSkipped('The WP_HTTP tests require a class-http.php file of r17550 or later.');
+        if ( is_callable( array('WP_Http', '_getTransport') ) ) {
+            $this->markTestSkipped('The WP_Http tests require a class-http.php file of r17550 or later.');
             return;
         }
 
-        $class = "WP_HTTP_" . $this->transport;
+        $class = "WP_Http_" . $this->transport;
         if ( !call_user_func( array($class, 'test') ) ) {
             $this->markTestSkipped( sprintf('The transport %s is not supported on this system', $this->transport) );
@@ -185 +185 @@
         $res = wp_remote_request( $url, array( 'stream' => true, 'timeout' => 30 ) ); //Auto generate the filename.
 
-        // Cleanup before we assert, as it'll return early. 
+        // Cleanup before we assert, as it'll return early.
         if ( ! is_wp_error( $res ) ) {
             $filesize = filesize( $res['filename'] );
@@ -206 +206 @@
         $res = wp_remote_request( $url, array( 'stream' => true, 'timeout' => 30, 'limit_response_size' => $size ) ); //Auto generate the filename.
 
-        // Cleanup before we assert, as it'll return early. 
+        // Cleanup before we assert, as it'll return early.
         if ( ! is_wp_error( $res ) ) {
             $filesize = filesize( $res['filename'] );

trunk/tests/phpunit/tests/http/http.php

@@ -11 +11 @@
      */
     function test_make_absolute_url( $relative_url, $absolute_url, $expected ) {
-        if ( ! is_callable( array( 'WP_HTTP', 'make_absolute_url' ) ) ) {
+        if ( ! is_callable( array( 'WP_Http', 'make_absolute_url' ) ) ) {
             $this->markTestSkipped( "This version of WP_HTTP doesn't support WP_HTTP::make_absolute_url()" );
             return;
         }
 
-        $actual = WP_HTTP::make_absolute_url( $relative_url, $absolute_url );
+        $actual = WP_Http::make_absolute_url( $relative_url, $absolute_url );
         $this->assertEquals( $expected, $actual );
     }
@@ -106 +106 @@
 
 /**
- * A Wrapper of WP_HTTP to make parse_url() publicaly accessible for testing purposes.
+ * A Wrapper of WP_Http to make parse_url() publicaly accessible for testing purposes.
  */
-class WP_HTTP_Testable extends WP_HTTP {
+class WP_HTTP_Testable extends WP_Http {
     public static function parse_url( $url ) {
         return parent::parse_url( $url );