Changeset 46206 for trunk/src/wp-includes/rest-api/class-wp-rest-request.php

Timestamp:

09/20/2019 08:07:28 PM (5 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/rest-api/class-wp-rest-request.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/class-wp-rest-request.php

@@ -640 +640 @@
         /*
          * Check for a parsing error.
-         *
-         * Note that due to WP's JSON compatibility functions, json_last_error
-         * might not be defined: https://core.trac.wordpress.org/ticket/27799
          */
-        if ( null === $params && ( ! function_exists( 'json_last_error' ) || JSON_ERROR_NONE !== json_last_error() ) ) {
+        if ( null === $params && JSON_ERROR_NONE !== json_last_error() ) {
             // Ensure subsequent calls receive error instance.
             $this->parsed_json = false;
 
             $error_data = array(
-                'status' => WP_Http::BAD_REQUEST,
+                'status'             => WP_Http::BAD_REQUEST,
+                'json_error_code'    => json_last_error(),
+                'json_error_message' => json_last_error_msg(),
             );
-            if ( function_exists( 'json_last_error' ) ) {
-                $error_data['json_error_code']    = json_last_error();
-                $error_data['json_error_message'] = json_last_error_msg();
-            }
 
             return new WP_Error( 'rest_invalid_json', __( 'Invalid JSON body passed.' ), $error_data );