<!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>[56345] trunk/src/wp-includes/class-wp-theme-json.php: Themes: Use `isset` instead of `array_key_exists` in `WP_Theme_JSON` class.</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/56345">56345</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/56345","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>flixos90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-08-01 20:29:47 +0000 (Tue, 01 Aug 2023)</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'>Themes: Use `isset` instead of `array_key_exists` in `WP_Theme_JSON` class.
With the minimum PHP version requirement raised to 7.0, we can now use `isset` on constants that are arrays. Since `isset` is slightly faster than `array_key_exists` (and the different handling of `null` values is irrelevant for the updates here), remaining instances of `array_key_exists` in the `WP_Theme_JSON` class are replaced in this changeset.
Props soean.
Fixes <a href="https://core.trac.wordpress.org/ticket/57067">#57067</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2023-08-01 16:50:50 UTC (rev 56344)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2023-08-01 20:29:47 UTC (rev 56345)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,11 +545,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_element_class_name( $element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class_name = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- if ( array_key_exists( $element, static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_name = static::__EXPERIMENTAL_ELEMENT_CLASS_NAMES[ $element ];
</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">@@ -740,11 +736,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $valid_element_names as $element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema_styles_elements[ $element ] = $styles_non_top_level;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $schema_styles_elements[ $element ][ $pseudo_selector ] = $styles_non_top_level;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1928,11 +1920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $value_path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path_string = implode( '.', $value_path );
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- array_key_exists( $path_string, static::PROTECTED_PROPERTIES ) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isset( static::PROTECTED_PROPERTIES[ $path_string ] ) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> _wp_array_get( $settings, static::PROTECTED_PROPERTIES[ $path_string ], null ) === null
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2136,12 +2124,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => static::ELEMENTS[ $element ],
</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">- /*
- * Handle any pseudo selectors for the element.
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle any pseudo selectors for the element.
+ if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme_json['styles']['elements'][ $element ][ $pseudo_selector ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2290,12 +2274,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => $selectors[ $name ]['elements'][ $element ],
</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">- /*
- * Handle any pseudo selectors for the element.
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- if ( array_key_exists( $element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Handle any pseudo selectors for the element.
+ if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $element ] as $pseudo_selector ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme_json['styles']['blocks'][ $name ]['elements'][ $element ][ $pseudo_selector ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $nodes[] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2373,11 +2353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $element_pseudo_allowed = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- if ( array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $element_pseudo_allowed = static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ];
</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">@@ -2402,11 +2378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Otherwise just compute the styles for the default selector as normal.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pseudo_selector && isset( $node[ $pseudo_selector ] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
- */
- array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] )
</ins><span class="cx" style="display: block; padding: 0 10px"> && in_array( $pseudo_selector, static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ], true )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $declarations = static::compute_style_properties( $node[ $pseudo_selector ], $settings, null, $this->theme_json, $selector, $use_root_padding );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2895,11 +2867,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * $output is stripped of pseudo selectors. Re-add and process them
</span><span class="cx" style="display: block; padding: 0 10px"> * or insecure styles here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
- * TODO: Replace array_key_exists() with isset() check once WordPress drops
- * support for PHP 5.6. See https://core.trac.wordpress.org/ticket/57067.
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( array_key_exists( $current_element, static::VALID_ELEMENT_PSEUDO_SELECTORS ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( static::VALID_ELEMENT_PSEUDO_SELECTORS[ $current_element ] as $pseudo_selector ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $input[ $pseudo_selector ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output[ $pseudo_selector ] = static::remove_insecure_styles( $input[ $pseudo_selector ] );
</span></span></pre>
</div>
</div>
</body>
</html>