--- a/wp/wp-includes/compat.php Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-includes/compat.php Tue Dec 15 13:49:49 2020 +0100
@@ -6,7 +6,7 @@
* @access private
*/
-// If gettext isn't available
+// If gettext isn't available.
if ( ! function_exists( '_' ) ) {
function _( $string ) {
return $string;
@@ -20,8 +20,6 @@
* @since 4.2.2
* @access private
*
- * @staticvar string $utf8_pcre
- *
* @param bool $set - Used for testing only
* null : default - get PCRE/u capability
* false : Used for testing - return false for future calls to this function
@@ -35,6 +33,7 @@
}
if ( 'reset' === $utf8_pcre ) {
+ // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- intentional error generated to detect PCRE/u support.
$utf8_pcre = @preg_match( '/^./u', 'a' );
}
@@ -88,7 +87,7 @@
* The solution below works only for UTF-8, so in case of a different
* charset just use built-in substr().
*/
- if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
+ if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
}
@@ -100,7 +99,7 @@
}
$regex = '/(
- [\x00-\x7F] # single-byte sequences 0xxxxxxx
+ [\x00-\x7F] # single-byte sequences 0xxxxxxx
| [\xC2-\xDF][\x80-\xBF] # double-byte sequences 110xxxxx 10xxxxxx
| \xE0[\xA0-\xBF][\x80-\xBF] # triple-byte sequences 1110xxxx 10xxxxxx * 2
| [\xE1-\xEC][\x80-\xBF]{2}
@@ -172,7 +171,7 @@
* The solution below works only for UTF-8, so in case of a different charset
* just use built-in strlen().
*/
- if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
+ if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
return strlen( $str );
}
@@ -183,7 +182,7 @@
}
$regex = '/(?:
- [\x00-\x7F] # single-byte sequences 0xxxxxxx
+ [\x00-\x7F] # single-byte sequences 0xxxxxxx
| [\xC2-\xDF][\x80-\xBF] # double-byte sequences 110xxxxx 10xxxxxx
| \xE0[\xA0-\xBF][\x80-\xBF] # triple-byte sequences 1110xxxx 10xxxxxx * 2
| [\xE1-\xEC][\x80-\xBF]{2}
@@ -220,6 +219,13 @@
/**
* Compat function to mimic hash_hmac().
*
+ * The Hash extension is bundled with PHP by default since PHP 5.1.2.
+ * However, the extension may be explicitly disabled on select servers.
+ * As of PHP 7.4.0, the Hash extension is a core PHP extension and can no
+ * longer be disabled.
+ * I.e. when PHP 7.4.0 becomes the minimum requirement, this polyfill
+ * and the associated `_hash_hmac()` function can be safely removed.
+ *
* @ignore
* @since 3.2.0
*
@@ -281,62 +287,20 @@
return $hmac;
}
-if ( ! function_exists( 'json_encode' ) ) {
- function json_encode( $string ) {
- global $wp_json;
-
- if ( ! ( $wp_json instanceof Services_JSON ) ) {
- require_once( ABSPATH . WPINC . '/class-json.php' );
- $wp_json = new Services_JSON();
- }
-
- return $wp_json->encodeUnsafe( $string );
- }
-}
-
-if ( ! function_exists( 'json_decode' ) ) {
- /**
- * @global Services_JSON $wp_json
- * @param string $string
- * @param bool $assoc_array
- * @return object|array
- */
- function json_decode( $string, $assoc_array = false ) {
- global $wp_json;
-
- if ( ! ( $wp_json instanceof Services_JSON ) ) {
- require_once( ABSPATH . WPINC . '/class-json.php' );
- $wp_json = new Services_JSON();
- }
-
- $res = $wp_json->decode( $string );
- if ( $assoc_array ) {
- $res = _json_decode_object_helper( $res );
- }
- return $res;
- }
-
- /**
- * @param object $data
- * @return array
- */
- function _json_decode_object_helper( $data ) {
- if ( is_object( $data ) ) {
- $data = get_object_vars( $data );
- }
- return is_array( $data ) ? array_map( __FUNCTION__, $data ) : $data;
- }
-}
-
if ( ! function_exists( 'hash_equals' ) ) :
/**
* Timing attack safe string comparison
*
* Compares two strings using the same time whether they're equal or not.
*
- * This function was added in PHP 5.6.
+ * Note: It can leak the length of a string when arguments of differing length are supplied.
*
- * Note: It can leak the length of a string when arguments of differing length are supplied.
+ * This function was added in PHP 5.6.
+ * However, the Hash extension may be explicitly disabled on select servers.
+ * As of PHP 7.4.0, the Hash extension is a core PHP extension and can no
+ * longer be disabled.
+ * I.e. when PHP 7.4.0 becomes the minimum requirement, this polyfill
+ * can be safely removed.
*
* @since 3.9.2
*
@@ -346,7 +310,7 @@
*/
function hash_equals( $a, $b ) {
$a_length = strlen( $a );
- if ( $a_length !== strlen( $b ) ) {
+ if ( strlen( $b ) !== $a_length ) {
return false;
}
$result = 0;
@@ -356,160 +320,19 @@
$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
}
- return $result === 0;
- }
-endif;
-
-// JSON_PRETTY_PRINT was introduced in PHP 5.4
-// Defined here to prevent a notice when using it with wp_json_encode()
-if ( ! defined( 'JSON_PRETTY_PRINT' ) ) {
- define( 'JSON_PRETTY_PRINT', 128 );
-}
-
-if ( ! function_exists( 'json_last_error_msg' ) ) :
- /**
- * Retrieves the error string of the last json_encode() or json_decode() call.
- *
- * @since 4.4.0
- *
- * @internal This is a compatibility function for PHP <5.5
- *
- * @return bool|string Returns the error message on success, "No Error" if no error has occurred,
- * or false on failure.
- */
- function json_last_error_msg() {
- // See https://core.trac.wordpress.org/ticket/27799.
- if ( ! function_exists( 'json_last_error' ) ) {
- return false;
- }
-
- $last_error_code = json_last_error();
-
- // Just in case JSON_ERROR_NONE is not defined.
- $error_code_none = defined( 'JSON_ERROR_NONE' ) ? JSON_ERROR_NONE : 0;
-
- switch ( true ) {
- case $last_error_code === $error_code_none:
- return 'No error';
-
- case defined( 'JSON_ERROR_DEPTH' ) && JSON_ERROR_DEPTH === $last_error_code:
- return 'Maximum stack depth exceeded';
-
- case defined( 'JSON_ERROR_STATE_MISMATCH' ) && JSON_ERROR_STATE_MISMATCH === $last_error_code:
- return 'State mismatch (invalid or malformed JSON)';
-
- case defined( 'JSON_ERROR_CTRL_CHAR' ) && JSON_ERROR_CTRL_CHAR === $last_error_code:
- return 'Control character error, possibly incorrectly encoded';
-
- case defined( 'JSON_ERROR_SYNTAX' ) && JSON_ERROR_SYNTAX === $last_error_code:
- return 'Syntax error';
-
- case defined( 'JSON_ERROR_UTF8' ) && JSON_ERROR_UTF8 === $last_error_code:
- return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-
- case defined( 'JSON_ERROR_RECURSION' ) && JSON_ERROR_RECURSION === $last_error_code:
- return 'Recursion detected';
-
- case defined( 'JSON_ERROR_INF_OR_NAN' ) && JSON_ERROR_INF_OR_NAN === $last_error_code:
- return 'Inf and NaN cannot be JSON encoded';
-
- case defined( 'JSON_ERROR_UNSUPPORTED_TYPE' ) && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
- return 'Type is not supported';
-
- default:
- return 'An unknown error occurred';
- }
+ return 0 === $result;
}
endif;
-if ( ! interface_exists( 'JsonSerializable' ) ) {
- define( 'WP_JSON_SERIALIZE_COMPATIBLE', true );
- /**
- * JsonSerializable interface.
- *
- * Compatibility shim for PHP <5.4
- *
- * @link https://secure.php.net/jsonserializable
- *
- * @since 4.4.0
- */
- interface JsonSerializable {
- public function jsonSerialize();
- }
-}
-
-// random_int was introduced in PHP 7.0
+// random_int() was introduced in PHP 7.0.
if ( ! function_exists( 'random_int' ) ) {
require ABSPATH . WPINC . '/random_compat/random.php';
}
-// sodium_crypto_box was introduced in PHP 7.2
+// sodium_crypto_box() was introduced in PHP 7.2.
if ( ! function_exists( 'sodium_crypto_box' ) ) {
require ABSPATH . WPINC . '/sodium_compat/autoload.php';
}
-if ( ! function_exists( 'array_replace_recursive' ) ) :
- /**
- * PHP-agnostic version of {@link array_replace_recursive()}.
- *
- * The array_replace_recursive() function is a PHP 5.3 function. WordPress
- * currently supports down to PHP 5.2, so this method is a workaround
- * for PHP 5.2.
- *
- * Note: array_replace_recursive() supports infinite arguments, but for our use-
- * case, we only need to support two arguments.
- *
- * Subject to removal once WordPress makes PHP 5.3.0 the minimum requirement.
- *
- * @since 4.5.3
- *
- * @see https://secure.php.net/manual/en/function.array-replace-recursive.php#109390
- *
- * @param array $base Array with keys needing to be replaced.
- * @param array $replacements Array with the replaced keys.
- *
- * @return array
- */
- function array_replace_recursive( $base = array(), $replacements = array() ) {
- foreach ( array_slice( func_get_args(), 1 ) as $replacements ) {
- $bref_stack = array( &$base );
- $head_stack = array( $replacements );
-
- do {
- end( $bref_stack );
-
- $bref = &$bref_stack[ key( $bref_stack ) ];
- $head = array_pop( $head_stack );
-
- unset( $bref_stack[ key( $bref_stack ) ] );
-
- foreach ( array_keys( $head ) as $key ) {
- if ( isset( $key, $bref ) &&
- isset( $bref[ $key ] ) && is_array( $bref[ $key ] ) &&
- isset( $head[ $key ] ) && is_array( $head[ $key ] ) ) {
-
- $bref_stack[] = &$bref[ $key ];
- $head_stack[] = $head[ $key ];
- } else {
- $bref[ $key ] = $head[ $key ];
- }
- }
- } while ( count( $head_stack ) );
- }
-
- return $base;
- }
-endif;
-
-/**
- * Polyfill for the SPL autoloader. In PHP 5.2 (but not 5.3 and later), SPL can
- * be disabled, and PHP 7.2 raises notices if the compiler finds an __autoload()
- * function declaration. Function availability is checked here, and the
- * autoloader is included only if necessary.
- */
-if ( ! function_exists( 'spl_autoload_register' ) ) {
- require_once ABSPATH . WPINC . '/spl-autoload-compat.php';
-}
-
if ( ! function_exists( 'is_countable' ) ) {
/**
* Polyfill for is_countable() function added in PHP 7.3.
@@ -520,7 +343,6 @@
* @since 4.9.6
*
* @param mixed $var The value to check.
- *
* @return bool True if `$var` is countable, false otherwise.
*/
function is_countable( $var ) {
@@ -542,7 +364,6 @@
* @since 4.9.6
*
* @param mixed $var The value to check.
- *
* @return bool True if `$var` is iterable, false otherwise.
*/
function is_iterable( $var ) {