<!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>[55736] branches/6.2/tests/phpunit/tests/dependencies/styles.php: Script Loader: Optimize performance of `_wp_normalize_relative_css_links()` by more than 2x.</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/55736">55736</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/55736","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-05-09 12:15:44 +0000 (Tue, 09 May 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'>Script Loader: Optimize performance of `_wp_normalize_relative_css_links()` by more than 2x.
- Replace `preg_match_all()` and its secondary `str_replace()` call with `preg_replace_callback()`.
- Fix case where paths beginning with `http` and `https` (but not `http:` and `https:`) were erroneously not counted as relative.
- Improve code style and readability by consolidating conditions and returning once.
- Use `str_starts_with()` consistently instead of `strpos()`.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52036">[52036]</a>, <a href="https://core.trac.wordpress.org/changeset/52695">[52695]</a>, and <a href="https://core.trac.wordpress.org/changeset/52754">[52754]</a>.
Props westonruter, adamsilverstein, azaozz.
Merges <a href="https://core.trac.wordpress.org/changeset/55658">[55658]</a> and <a href="https://core.trac.wordpress.org/changeset/55669">[55669]</a> to the 6.2 branch.
Fixes <a href="https://core.trac.wordpress.org/ticket/58069">#58069</a>.
See <a href="https://core.trac.wordpress.org/ticket/54243">#54243</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches62srcwpincludesscriptloaderphp">branches/6.2/src/wp-includes/script-loader.php</a></li>
<li><a href="#branches62testsphpunittestsdependenciesstylesphp">branches/6.2/tests/phpunit/tests/dependencies/styles.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches62">branches/6.2/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.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">--- branches/6.2 2023-05-09 12:05:07 UTC (rev 55735)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.2 2023-05-09 12:15:44 UTC (rev 55736)
</ins><a id="branches62"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.2</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:55508,55542,55544-55545,55547,55552,55568,55573-55574,55584,55597-55598,55600-55601,55606,55632,55637,55649,55670,55713,55716,55724,55727
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:55508,55542,55544-55545,55547,55552,55568,55573-55574,55584,55597-55598,55600-55601,55606,55632,55637,55649,55658,55669-55670,55713,55716,55724,55727
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches62srcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.2/src/wp-includes/script-loader.php 2023-05-09 12:05:07 UTC (rev 55735)
+++ branches/6.2/src/wp-includes/script-loader.php 2023-05-09 12:15:44 UTC (rev 55736)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2941,41 +2941,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The CSS with URLs made relative to the WordPress installation.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_normalize_relative_css_links( $css, $stylesheet_url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_src_results = preg_match_all( '#url\s*\(\s*[\'"]?\s*([^\'"\)]+)#', $css, $src_results );
- if ( $has_src_results ) {
- // Loop through the URLs to find relative ones.
- foreach ( $src_results[1] as $src_index => $src_result ) {
- // Skip if this is an absolute URL.
- if ( 0 === strpos( $src_result, 'http' ) || 0 === strpos( $src_result, '//' ) ) {
- continue;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return preg_replace_callback(
+ '#(url\s*\(\s*[\'"]?\s*)([^\'"\)]+)#',
+ static function ( $matches ) use ( $stylesheet_url ) {
+ list( , $prefix, $url ) = $matches;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Skip if the URL is an HTML ID.
- if ( str_starts_with( $src_result, '#' ) ) {
- continue;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Short-circuit if the URL does not require normalization.
+ if (
+ str_starts_with( $url, 'http:' ) ||
+ str_starts_with( $url, 'https:' ) ||
+ str_starts_with( $url, '//' ) ||
+ str_starts_with( $url, '#' ) ||
+ str_starts_with( $url, 'data:' )
+ ) {
+ return $matches[0];
</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">- // Skip if the URL is a data URI.
- if ( str_starts_with( $src_result, 'data:' ) ) {
- continue;
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Build the absolute URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $absolute_url = dirname( $stylesheet_url ) . '/' . $src_result;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $absolute_url = dirname( $stylesheet_url ) . '/' . $url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $absolute_url = str_replace( '/./', '/', $absolute_url );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Convert to URL related to the site root.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $relative_url = wp_make_link_relative( $absolute_url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = wp_make_link_relative( $absolute_url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Replace the URL in the CSS.
- $css = str_replace(
- $src_results[0][ $src_index ],
- str_replace( $src_result, $relative_url, $src_results[0][ $src_index ] ),
- $css
- );
- }
- }
-
- return $css;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $prefix . $url;
+ },
+ $css
+ );
</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="branches62testsphpunittestsdependenciesstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.2/tests/phpunit/tests/dependencies/styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.2/tests/phpunit/tests/dependencies/styles.php 2023-05-09 12:05:07 UTC (rev 55735)
+++ branches/6.2/tests/phpunit/tests/dependencies/styles.php 2023-05-09 12:15:44 UTC (rev 55736)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 54243
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 54922
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 58069
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @covers ::_wp_normalize_relative_css_links
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,6 +241,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'URLs with path beginning with http' => array(
+ 'css' => 'p {background:url( "http-is-awesome.png" );}',
+ 'expected' => 'p {background:url( "/wp-content/themes/test/http-is-awesome.png" );}',
+ ),
+ 'URLs with path beginning with https' => array(
+ 'css' => 'p {background:url( "https-is-more-awesome.png" );}',
+ 'expected' => 'p {background:url( "/wp-content/themes/test/https-is-more-awesome.png" );}',
+ ),
</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>