Changeset 6806 for sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php

Timestamp:

02/28/2018 03:27:07 AM (8 years ago)

Author:

dd32

Message:

API: Serve Happy: Update the API to return the final selection of fields.

Props flixos90.
Fixes #3474.

File:

• sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php

@@ -19 +19 @@
         }
 
-        // Including the IP address here as an optional parameter incase it's wanted later to return dynamic responses for hosts.
-        $ip_adress = false;
-        if ( ! empty( $request['ip_address'] ) ) {
-                $ip_address = $request['ip_address'];
-
-                // Only allow a IP range to be passed. for example: 123.123.123.0 instead of 123.123.123.45
-                if ( '.0' != substr( $ip_address, -2 ) ) {
-                        return bail( 'invalid_param', 'Invalid parameter: ip_address', 400 );
-                }
-        }
-
-        return compact(
-                'php_version',
-                'ip_address'
-        );
+        return compact( 'php_version' );
 }
 
@@ -39 +25 @@
         $php_version = $request['php_version'];
 
-        $out_of_date                = version_compare( $php_version, TRIGGER_PHP_VERSION,            '<'  );
-        $receiving_security_updates = version_compare( $php_version, PHP_RECEIVING_SECURITY_UPDATES, '>=' );
-
-        $status = 'ok';
-        if ( $out_of_date ) {
-                $status = 'out_of_date';
-        } elseif ( ! $receiving_security_updates ) {
-                $status = 'no_security_updates';
-        }
-
-        $recommended_php = RECOMMENDED_PHP;
-        $secure_php      = PHP_RECEIVING_SECURITY_UPDATES;
-        $update_url      = ''; // Potential future use based on $request['ip_address']
-
-        return compact(
-                'php_version',
-                'recommended_php',
-                'secure_php',
-                'status',
-                'update_url',
-
-                // Including for debugging purposes, see https://meta.trac.wordpress.org/ticket/3474
-                'out_of_date',
-                'receiving_security_updates'
+        return array(
+                'recommended_version' => RECOMMENDED_PHP,
+                'is_supported'        => version_compare( $php_version, SUPPORTED_PHP, '>=' ),
+                'is_secure'           => version_compare( $php_version, SECURE_PHP, '>=' ),
+                'is_acceptable'       => version_compare( $php_version, ACCEPTABLE_PHP, '>=' ),
         );
 }