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

Timestamp:

05/29/2015 03:42:40 PM (10 years ago)

Author:

wonderboymusic

Message:

Add @static* annotations where they are missing.
Initialize all static vars that are not, most to null.

See #32444.

File:

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

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

@@ -342 +342 @@
      *
      * @since 3.2.0
+     *
+     * @static
      * @access private
      *
@@ -627 +629 @@
      * @link https://core.trac.wordpress.org/ticket/14636 Allow wildcard domains in WP_ACCESSIBLE_HOSTS
      *
+     * @staticvar array|null $accessible_hosts
+     * @staticvar array      $wildcard_regex
+     *
      * @param string $uri URI of url.
      * @return bool True to block, false to allow.
@@ -657 +662 @@
             return true;
 
-        static $accessible_hosts;
-        static $wildcard_regex = false;
-        if ( null == $accessible_hosts ) {
+        static $accessible_hosts = null;
+        static $wildcard_regex = array();
+        if ( null === $accessible_hosts ) {
             $accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
 
@@ -688 +693 @@
      *
      * @since 4.1.0
+     *
+     * @static
      * @access protected
      *
@@ -726 +733 @@
      * @since 3.4.0
      *
+     * @static
      * @access public
+     *
      * @param string $maybe_relative_path The URL which might be relative
      * @param string $url                 The URL which $maybe_relative_path is relative to
@@ -796 +805 @@
      *
      * @since 3.7.0
+     *
+     * @static
      *
      * @param string $url The URL which was requested.
@@ -1799 +1810 @@
      * @since 2.8.0
      *
+     * @staticvar array|null $bypass_hosts
+     * @staticvar array      $wildcard_regex
+     *
      * @param string $uri URI to check.
      * @return bool True, to send through the proxy and false if, the proxy should not be used.
@@ -1838 +1852 @@
             return true;
 
-        static $bypass_hosts;
-        static $wildcard_regex = false;
-        if ( null == $bypass_hosts ) {
+        static $bypass_hosts = null;
+        static $wildcard_regex = array();
+        if ( null === $bypass_hosts ) {
             $bypass_hosts = preg_split('|,\s*|', WP_PROXY_BYPASS_HOSTS);
 
@@ -2088 +2102 @@
      * @since 2.8.0
      *
+     * @static
+     *
      * @param string $raw String to compress.
      * @param int $level Optional, default is 9. Compression level, 9 is highest.
@@ -2107 +2123 @@
      * @since 2.8.0
      *
+     * @static
+     *
      * @param string $compressed String to decompress.
      * @param int $length The optional length of the compressed data.
@@ -2151 +2169 @@
      * @link http://au2.php.net/manual/en/function.gzinflate.php#70875
      * @link http://au2.php.net/manual/en/function.gzinflate.php#77336
+     *
+     * @static
      *
      * @param string $gzData String to decompress.
@@ -2191 +2211 @@
      * @since 2.8.0
      *
+     * @static
+     *
      * @param string $url
      * @param array  $args
@@ -2237 +2259 @@
      * @since 2.8.0
      *
+     * @static
+     *
      * @return string Content-Encoding string to send in the header.
      */
@@ -2247 +2271 @@
      *
      * @since 2.8.0
+     *
+     * @static
      *
      * @param array|string $headers All of the available headers.
@@ -2271 +2297 @@
      * @since 2.8.0
      *
+     * @static
+     *
      * @return bool
      */