<!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>[46268] trunk/src/wp-admin/includes/class-wp-site-health.php: Site Health: Update PHP extension tests to reflect the current state of the Hosting Teams handbook recommendations.</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 { white-space: pre-line; 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="https://core.trac.wordpress.org/changeset/46268">46268</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/46268","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-09-23 19:49:06 +0000 (Mon, 23 Sep 2019)</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'>Site Health: Update PHP extension tests to reflect the current state of the Hosting Teams handbook recommendations.
Props Clorith, bronsonquick, jrf, johnbillion, galbaras, mikeschroder, jorbin.
Fixes <a href="https://core.trac.wordpress.org/ticket/47454">#47454</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2019-09-23 19:38:56 UTC (rev 46267)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2019-09-23 19:49:06 UTC (rev 46268)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -727,15 +727,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Make the check for available PHP modules into a simple boolean operator for a cleaner test runner.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 The `$constant` and `$class` parameters were added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $extension Optional. The extension name to test. Default null.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $function Optional. The function name to test. Default null.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $constant Optional. The constant name to test for. Default null.
+ * @param string $class Optional. The class name to test for. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether or not the extension and function are available.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- private function test_php_extension_availability( $extension = null, $function = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private function test_php_extension_availability( $extension = null, $function = null, $constant = null, $class = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If no extension or function is passed, claim to fail testing, as we have nothing to test against.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $extension && ! $function ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $extension && ! $function && ! $constant && ! $class ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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">@@ -745,6 +748,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $function && ! function_exists( $function ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $constant && ! defined( $constant ) ) {
+ return false;
+ }
+ if ( $class && ! class_exists( $class ) ) {
+ return false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,36 +797,40 @@
</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"> $modules = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'bcmath' => array(
- 'function' => 'bcadd',
- 'required' => false,
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'curl' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'function' => 'curl_version',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'dom' => array(
+ 'class' => 'DOMNode',
+ 'required' => false,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'exif' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'function' => 'exif_read_data',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'filter' => array(
- 'function' => 'filter_list',
- 'required' => false,
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'fileinfo' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'function' => 'finfo_file',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'mod_xml' => array(
- 'extension' => 'libxml',
- 'required' => false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'hash' => array(
+ 'function' => 'hash',
+ 'required' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'json' => array(
+ 'function' => 'json_last_error',
+ 'required' => true,
+ ),
+ 'mbstring' => array(
+ 'function' => 'mb_check_encoding',
+ 'required' => false,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mysqli' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'function' => 'mysqli_connect',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'libsodium' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'function' => 'sodium_compare',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'constant' => 'SODIUM_LIBRARY_VERSION',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'php_bundled_version' => '7.2.0',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -833,20 +846,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'extension' => 'imagick',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'mod_xml' => array(
+ 'extension' => 'libxml',
+ 'required' => false,
+ ),
+ 'zip' => array(
+ 'class' => 'ZipArchive',
+ 'required' => false,
+ ),
+ 'filter' => array(
+ 'function' => 'filter_list',
+ 'required' => false,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'gd' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'extension' => 'gd',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fallback_for' => 'imagick',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'iconv' => array(
+ 'function' => 'iconv',
+ 'required' => false,
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mcrypt' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'extension' => 'mcrypt',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fallback_for' => 'libsodium',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'simplexml' => array(
+ 'extension' => 'simplexml',
+ 'required' => false,
+ 'fallback_for' => 'mod_xml',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'xmlreader' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'extension' => 'xmlreader',
</span><span class="cx" style="display: block; padding: 0 10px"> 'required' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fallback_for' => 'xml',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'fallback_for' => 'mod_xml',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'zlib' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'extension' => 'zlib',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -859,6 +893,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * An array representing all the modules we wish to test for.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.3.0 The `$constant` and `$class` parameters were added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $modules {
</span><span class="cx" style="display: block; padding: 0 10px"> * An associated array of modules to test for.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,6 +904,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * string $function Optional. A function name to test for the existence of.
</span><span class="cx" style="display: block; padding: 0 10px"> * string $extension Optional. An extension to check if is loaded in PHP.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * string $constant Optional. A constant name to check for to verify an extension exists.
+ * string $class Optional. A class name to check for to verify an extension exists.
</ins><span class="cx" style="display: block; padding: 0 10px"> * bool $required Is this a required feature or not.
</span><span class="cx" style="display: block; padding: 0 10px"> * string $fallback_for Optional. The module this module replaces as a fallback.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,8 +916,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $failures = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $modules as $library => $module ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $extension = ( isset( $module['extension'] ) ? $module['extension'] : null );
- $function = ( isset( $module['function'] ) ? $module['function'] : null );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $extension = ( isset( $module['extension'] ) ? $module['extension'] : null );
+ $function = ( isset( $module['function'] ) ? $module['function'] : null );
+ $constant = ( isset( $module['constant'] ) ? $module['constant'] : null );
+ $class_name = ( isset( $module['class'] ) ? $module['class'] : null );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this module is a fallback for another function, check if that other function passed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $module['fallback_for'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -895,7 +934,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $this->test_php_extension_availability( $extension, $function ) && ( ! isset( $module['php_bundled_version'] ) || version_compare( PHP_VERSION, $module['php_bundled_version'], '<' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $this->test_php_extension_availability( $extension, $function, $constant, $class_name ) && ( ! isset( $module['php_bundled_version'] ) || version_compare( PHP_VERSION, $module['php_bundled_version'], '<' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $module['required'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'critical';
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>