<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6806] sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0: API: Serve Happy: Update the API to return the final selection of fields.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6806">6806</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6806","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-28 03:27:07 +0000 (Wed, 28 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>API: Serve Happy: Update the API to return the final selection of fields.
Props flixos90.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3474">#3474</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcoreservehappy10configphp">sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/config.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcoreservehappy10includephp">sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php</a></li>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcoreservehappy10teststestsphp">sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcoreservehappy10configphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/config.php 2018-02-28 03:03:00 UTC (rev 6805)
+++ sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/config.php 2018-02-28 03:27:07 UTC (rev 6806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,11 +1,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> namespace WordPressdotorg\API\Serve_Happy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// The latest branch of PHP which is receiving security updates. Should be defined as X.Y
-define( 'PHP_RECEIVING_SECURITY_UPDATES', '5.6' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// The latest branch of PHP which WordPress.org recommends.
+define( 'RECOMMENDED_PHP', '7.2' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// The latest branch of PHP which is considered NOT out-of-date.
-define( 'TRIGGER_PHP_VERSION', '5.3' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// The lowest branch of PHP which is actively supported.
+define( 'SUPPORTED_PHP', '7.0' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// The latest branch of PHP which WordPress.org recommends.
-define( 'RECOMMENDED_PHP', '7.2' );
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// 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' );
</ins></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcoreservehappy10includephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php 2018-02-28 03:03:00 UTC (rev 6805)
+++ sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/include.php 2018-02-28 03:27:07 UTC (rev 6806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,50 +18,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return bail( 'invalid_param', 'Invalid parameter: php_version', 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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'
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return compact( 'php_version' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function parse_request( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $php_version = $request['php_version'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $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'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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, '>=' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkapiwordpressorgpublic_htmlcoreservehappy10teststestsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php 2018-02-28 03:03:00 UTC (rev 6805)
+++ sites/trunk/api.wordpress.org/public_html/core/serve-happy/1.0/tests/tests.php 2018-02-28 03:27:07 UTC (rev 6806)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,16 +24,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> [ 'php_version' => '5.3.2' ]
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.0'
- ],
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.0'
- ]
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +44,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output = json_decode( $this->helper_api_request( $input ), true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Assert that it's a successful response, and not an error.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertArrayHasKey( 'status', $output );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertArrayHasKey( 'recommended_version', $output );
+ $this->assertArrayHasKey( 'is_supported', $output );
+ $this->assertArrayHasKey( 'is_secure', $output );
+ $this->assertArrayHasKey( 'is_acceptable', $output );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function dataprovider_determine_request_invalid() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,17 +84,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'status' => 400
</span><span class="cx" style="display: block; padding: 0 10px"> ]
</span><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [
- [
- 'php_version' => '7.0',
- 'ip_address' => '1.2.3.4'
- ],
- [
- 'code' => 'invalid_param',
- 'message' => 'Invalid parameter: ip_address',
- 'status' => 400
- ]
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,37 +107,39 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function dataprovider_parse_request_valid() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return [
- // Testing Valid IP Address format
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Test recommended PHP version is always returned.
+ $data = [
</ins><span class="cx" style="display: block; padding: 0 10px"> [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [
- 'php_version' => RECOMMENDED_PHP,
- 'ip_address' => '1.2.3.0',
- ],
- [ 'status' => 'ok' ]
- ],
- // Testing PHP version logic:
- [
</del><span class="cx" style="display: block; padding: 0 10px"> [ 'php_version' => RECOMMENDED_PHP ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [ 'status' => 'ok' ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ 'recommended_version' => RECOMMENDED_PHP ]
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><span class="cx" style="display: block; padding: 0 10px"> [
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [ 'php_version' => RECOMMENDED_PHP + 0.1 ],
- [ 'status' => 'ok' ]
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ [ 'php_version' => '5.2' ],
+ [ 'recommended_version' => RECOMMENDED_PHP ]
</ins><span class="cx" style="display: block; padding: 0 10px"> ],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- [
- [ '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' ]
- ],
</del><span class="cx" style="display: block; padding: 0 10px"> ];
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // 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;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>