Changeset 46206 for trunk/src/wp-includes/functions.php

Timestamp:

09/20/2019 08:07:28 PM (7 years ago)

Author:

desrosj

Message:

Code Modernization: Remove JSON extension workarounds for PHP < 5.6.

The PHP native JSON extension has been bundled and compiled with PHP by default since version 5.2.0. Because the minimum version of PHP required by WordPress is now 5.6.20 (see #46594 and [45058]), JSON extension related polyfills and backwards compatibility code can now be removed.

This change removes code that supported JSON related functionality on older versions of PHP. This includes (but is not limited to) checks that json_last_error() exists, checking and setting the JSON_UNESCAPED_SLASHES and JSON_PRETTY_PRINT constants if not previously defined, and deprecating the _wp_json_prepare_data() function (which was 100% workaround code).

Follow up of [46205].

See #47699.
Props jrf, Clorith, pento.

File:

• trunk/src/wp-includes/functions.php (modified) (4 diffs)

trunk/src/wp-includes/functions.php

@@ -3722 +3722 @@
  *
  * @since 4.1.0
+ * @since 5.3.0 No longer handles support for PHP < 5.6.
  *
  * @param mixed $data    Variable (usually an array or object) to encode as JSON.
@@ -3730 +3731 @@
  */
 function wp_json_encode( $data, $options = 0, $depth = 512 ) {
-        /*
-         * json_encode() has had extra params added over the years.
-         * $options was added in 5.3, and $depth in 5.5.
-         * We need to make sure we call it with the correct arguments.
-         */
-        if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-                $args = array( $data, $options, $depth );
-        } elseif ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-                $args = array( $data, $options );
-        } else {
-                $args = array( $data );
-        }
-
-        // Prepare the data for JSON serialization.
-        $args[0] = _wp_json_prepare_data( $data );
-
-        // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged -- json_encode() errors are handled after this call
-        $json = @call_user_func_array( 'json_encode', $args );
+        $json = json_encode( $data, $options, $depth );
 
         // If json_encode() was successful, no need to do more sanity checking.
-        // ... unless we're in an old version of PHP, and json_encode() returned
-        // a string containing 'null'. Then we need to do more sanity checking.
-        if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) ) {
+        if ( false !== $json ) {
                 return $json;
         }
 
         try {
-                $args[0] = _wp_json_sanity_check( $data, $depth );
+                $data = _wp_json_sanity_check( $data, $depth );
         } catch ( Exception $e ) {
                 return false;
         }
 
-        return call_user_func_array( 'json_encode', $args );
+        return json_encode( $data, $options, $depth );
 }
 
@@ -3866 +3848 @@
  *
  * @ignore
- * @since 4.4.0
- * @access private
+ * @since      4.4.0
+ * @deprecated 5.3.0 This function is no longer needed as support for PHP 5.2-5.3
+ *                   has been dropped.
+ * @access     private
  *
  * @param mixed $data Native representation.
@@ -3873 +3857 @@
  */
 function _wp_json_prepare_data( $data ) {
-        if ( ! defined( 'WP_JSON_SERIALIZE_COMPATIBLE' ) || WP_JSON_SERIALIZE_COMPATIBLE === false ) {
-                return $data;
-        }
-
-        switch ( gettype( $data ) ) {
-                case 'boolean':
-                case 'integer':
-                case 'double':
-                case 'string':
-                case 'NULL':
-                        // These values can be passed through.
-                        return $data;
-
-                case 'array':
-                        // Arrays must be mapped in case they also return objects.
-                        return array_map( '_wp_json_prepare_data', $data );
-
-                case 'object':
-                        // If this is an incomplete object (__PHP_Incomplete_Class), bail.
-                        if ( ! is_object( $data ) ) {
-                                return null;
-                        }
-
-                        if ( $data instanceof JsonSerializable ) {
-                                $data = $data->jsonSerialize();
-                        } else {
-                                $data = get_object_vars( $data );
-                        }
-
-                        // Now, pass the array (or whatever was returned from jsonSerialize through).
-                        return _wp_json_prepare_data( $data );
-
-                default:
-                        return null;
-        }
+        _deprecated_function( __FUNCTION__, '5.3.0' );
+        return $data;
 }