Changeset 42343 for trunk/src/wp-includes/class-wp-http-encoding.php

Timestamp:

11/30/2017 11:09:33 PM (7 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-includes/class-wp-http-encoding.php (modified) (6 diffs)

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

@@ -53 +53 @@
     public static function decompress( $compressed, $length = null ) {
 
-        if ( empty($compressed) )
+        if ( empty( $compressed ) ) {
             return $compressed;
-
-        if ( false !== ( $decompressed = @gzinflate( $compressed ) ) )
-            return $decompressed;
-
-        if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) )
-            return $decompressed;
-
-        if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) )
-            return $decompressed;
-
-        if ( function_exists('gzdecode') ) {
+        }
+
+        if ( false !== ( $decompressed = @gzinflate( $compressed ) ) ) {
+            return $decompressed;
+        }
+
+        if ( false !== ( $decompressed = self::compatible_gzinflate( $compressed ) ) ) {
+            return $decompressed;
+        }
+
+        if ( false !== ( $decompressed = @gzuncompress( $compressed ) ) ) {
+            return $decompressed;
+        }
+
+        if ( function_exists( 'gzdecode' ) ) {
             $decompressed = @gzdecode( $compressed );
 
-            if ( false !== $decompressed )
+            if ( false !== $decompressed ) {
                 return $decompressed;
+            }
         }
 
@@ -97 +102 @@
      * @return string|bool False on failure.
      */
-    public static function compatible_gzinflate($gzData) {
+    public static function compatible_gzinflate( $gzData ) {
 
         // Compressed data might contain a full header, if so strip it for gzinflate().
-        if ( substr($gzData, 0, 3) == "\x1f\x8b\x08" ) {
-            $i = 10;
-            $flg = ord( substr($gzData, 3, 1) );
+        if ( substr( $gzData, 0, 3 ) == "\x1f\x8b\x08" ) {
+            $i   = 10;
+            $flg = ord( substr( $gzData, 3, 1 ) );
             if ( $flg > 0 ) {
                 if ( $flg & 4 ) {
-                    list($xlen) = unpack('v', substr($gzData, $i, 2) );
-                    $i = $i + 2 + $xlen;
-                }
-                if ( $flg & 8 )
-                    $i = strpos($gzData, "\0", $i) + 1;
-                if ( $flg & 16 )
-                    $i = strpos($gzData, "\0", $i) + 1;
-                if ( $flg & 2 )
+                    list($xlen) = unpack( 'v', substr( $gzData, $i, 2 ) );
+                    $i          = $i + 2 + $xlen;
+                }
+                if ( $flg & 8 ) {
+                    $i = strpos( $gzData, "\0", $i ) + 1;
+                }
+                if ( $flg & 16 ) {
+                    $i = strpos( $gzData, "\0", $i ) + 1;
+                }
+                if ( $flg & 2 ) {
                     $i = $i + 2;
-            }
-            $decompressed = @gzinflate( substr($gzData, $i, -8) );
-            if ( false !== $decompressed )
+                }
+            }
+            $decompressed = @gzinflate( substr( $gzData, $i, -8 ) );
+            if ( false !== $decompressed ) {
                 return $decompressed;
+            }
         }
 
         // Compressed data from java.util.zip.Deflater amongst others.
-        $decompressed = @gzinflate( substr($gzData, 2) );
-        if ( false !== $decompressed )
-            return $decompressed;
+        $decompressed = @gzinflate( substr( $gzData, 2 ) );
+        if ( false !== $decompressed ) {
+            return $decompressed;
+        }
 
         return false;
@@ -140 +150 @@
      */
     public static function accept_encoding( $url, $args ) {
-        $type = array();
+        $type                = array();
         $compression_enabled = self::is_available();
 
-        if ( ! $args['decompress'] ) // Decompression specifically disabled.
+        if ( ! $args['decompress'] ) { // Decompression specifically disabled.
             $compression_enabled = false;
-        elseif ( $args['stream'] ) // Disable when streaming to file.
+        } elseif ( $args['stream'] ) { // Disable when streaming to file.
             $compression_enabled = false;
-        elseif ( isset( $args['limit_response_size'] ) ) // If only partial content is being requested, we won't be able to decompress it.
+        } elseif ( isset( $args['limit_response_size'] ) ) { // If only partial content is being requested, we won't be able to decompress it.
             $compression_enabled = false;
+        }
 
         if ( $compression_enabled ) {
-            if ( function_exists( 'gzinflate' ) )
+            if ( function_exists( 'gzinflate' ) ) {
                 $type[] = 'deflate;q=1.0';
-
-            if ( function_exists( 'gzuncompress' ) )
+            }
+
+            if ( function_exists( 'gzuncompress' ) ) {
                 $type[] = 'compress;q=0.5';
-
-            if ( function_exists( 'gzdecode' ) )
+            }
+
+            if ( function_exists( 'gzdecode' ) ) {
                 $type[] = 'gzip;q=0.5';
+            }
         }
 
@@ -173 +187 @@
         $type = apply_filters( 'wp_http_accept_encoding', $type, $url, $args );
 
-        return implode(', ', $type);
+        return implode( ', ', $type );
     }
 
@@ -199 +213 @@
      * @return bool
      */
-    public static function should_decode($headers) {
+    public static function should_decode( $headers ) {
         if ( is_array( $headers ) ) {
-            if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
+            if ( array_key_exists( 'content-encoding', $headers ) && ! empty( $headers['content-encoding'] ) ) {
                 return true;
+            }
         } elseif ( is_string( $headers ) ) {
-            return ( stripos($headers, 'content-encoding:') !== false );
+            return ( stripos( $headers, 'content-encoding:' ) !== false );
         }
 
@@ -224 +239 @@
      */
     public static function is_available() {
-        return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
+        return ( function_exists( 'gzuncompress' ) || function_exists( 'gzdeflate' ) || function_exists( 'gzinflate' ) );
     }
 }