Ticket #3474: 3474.2.diff

api.wordpress.org/public_html/core/serve-happy/1.0/config.php

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\API\Serve_Happy;
 
-// The latest branch of PHP which is receiving security updates. Should be defined as X.Y
-define( 'PHP_RECEIVING_SECURITY_UPDATES', '5.6' );
+// The latest branch of PHP which WordPress.org recommends.
+define( 'RECOMMENDED_PHP', '7.2' );
 
-// The latest branch of PHP which is considered NOT out-of-date.
-define( 'TRIGGER_PHP_VERSION',            '5.3' );
+// The lowest branch of PHP which is actively supported.
+define( 'SUPPORTED_PHP', '7.0' );
 
-// The latest branch of PHP which WordPress.org recommends.
-define( 'RECOMMENDED_PHP',                '7.2' );
- No newline at end of file
+// The lowest branch of PHP which is receiving security updates.
+define( 'SECURE_PHP', '5.6' );
+
+// The lowest branch of PHP which is still considered acceptable in WordPress.
+define( 'ACCEPTABLE_PHP', '5.3' );

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

@@ -18 +18 @@
                 return bail( 'invalid_param', 'Invalid parameter: php_version', 400 );
         }
 
-        // 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' );
 }
 
 function parse_request( $request ) {
         $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, '>=' ),
         );
 }
 

api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php

@@ -24 +24 @@
                                 ],
                                 [ 'php_version' => '5.3.2' ]
                         ],
-                        [
-                                [
-                                        'php_version' => '7.0',
-                                        'ip_address' => '1.2.3.0'
-                                ],
-                                [
-                                        'php_version' => '7.0',
-                                        'ip_address' => '1.2.3.0'
-                                ]
-                        ],
                 ];
         }
 
@@ -91 +81 @@
                                         'status'  => 400
                                 ]
                         ],
-                        [
-                                [
-                                        'php_version' => '7.0',
-                                        'ip_address' => '1.2.3.4'
-                                ],
-                                [
-                                        'code'    => 'invalid_param',
-                                        'message' => 'Invalid parameter: ip_address',
-                                        'status'  => 400
-                                ]
-                        ],
                 ];
         }
 
@@ -125 +104 @@
         }
 
         function dataprovider_parse_request_valid() {
-                return [
-                        // Testing Valid IP Address format
-                        [
-                                [
-                                        'php_version' => RECOMMENDED_PHP,
-                                        'ip_address'  => '1.2.3.0',
-                                ],
-                                [ 'status' => 'ok' ]
-                        ],
-                        // Testing PHP version logic:
+                // Test recommended PHP version is always returned.
+                $data = [
                         [
                                 [ 'php_version' => RECOMMENDED_PHP ],
-                                [ 'status' => 'ok' ]
-                        ],
-                        [
-                                [ 'php_version' => RECOMMENDED_PHP + 0.1 ],
-                                [ 'status' => 'ok' ]
+                                [ 'recommended_version' => RECOMMENDED_PHP ]
                         ],
                         [
-                                [ 'php_version' => PHP_RECEIVING_SECURITY_UPDATES ],
-                                [ 'status' => 'ok' ]
-                        ],
-                        [
-                                [ 'php_version' => PHP_RECEIVING_SECURITY_UPDATES - 0.1 ],
-                                [ 'status' => 'no_security_updates' ]
-                        ],
-                        [
-                                [ 'php_version' => TRIGGER_PHP_VERSION - 0.1 ],
-                                [ 'status' => 'out_of_date' ]
+                                [ 'php_version' => '5.2' ],
+                                [ 'recommended_version' => RECOMMENDED_PHP ]
                         ],
                 ];
+
+                // Test individual PHP versions.
+                $flags = [
+                        'is_supported'  => 'SUPPORTED_PHP',
+                        'is_secure'     => 'SECURE_PHP',
+                        'is_acceptable' => 'ACCEPTABLE_PHP'
+                ];
+                foreach ( $flags as $flag => $constant_name ) {
+                        $data[] = [
+                                [ 'php_version' => constant( $constant_name ) ],
+                                [ $flag => true ]
+                        ];
+                        $data[] = [
+                                [ 'php_version' => constant( $constant_name ) + 0.1 ],
+                                [ $flag => true ]
+                        ];
+                        $data[] = [
+                                [ 'php_version' => constant( $constant_name ) - 0.1 ],
+                                [ $flag => false ]
+                        ];
+                }
+                return $data;
         }
 
         /**