Changeset 55736

Timestamp:

05/09/2023 12:15:44 PM (3 years ago)

Author:

audrasjb

Message:

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 [52036], [52695], and [52754].

Props westonruter, adamsilverstein, azaozz.
Merges [55658] and [55669] to the 6.2 branch.
Fixes #58069.
See #54243.

Location:

branches/6.2

Files:

• . (modified) (1 prop)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/styles.php (modified) (2 diffs)

branches/6.2/src/wp-includes/script-loader.php

@@ -2942 +2942 @@
  */
 function _wp_normalize_relative_css_links( $css, $stylesheet_url ) {
-        $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;
+        return preg_replace_callback(
+                '#(url\s*\(\s*[\'"]?\s*)([^\'"\)]+)#',
+                static function ( $matches ) use ( $stylesheet_url ) {
+                        list( , $prefix, $url ) = $matches;
+
+                        // 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];
                         }
 
-                        // Skip if the URL is an HTML ID.
-                        if ( str_starts_with( $src_result, '#' ) ) {
-                                continue;
-                        }
-
-                        // Skip if the URL is a data URI.
-                        if ( str_starts_with( $src_result, 'data:' ) ) {
-                                continue;
-                        }
-
                         // Build the absolute URL.
-                        $absolute_url = dirname( $stylesheet_url ) . '/' . $src_result;
+                        $absolute_url = dirname( $stylesheet_url ) . '/' . $url;
                         $absolute_url = str_replace( '/./', '/', $absolute_url );
+
                         // Convert to URL related to the site root.
-                        $relative_url = wp_make_link_relative( $absolute_url );
-
-                        // 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;
+                        $url = wp_make_link_relative( $absolute_url );
+
+                        return $prefix . $url;
+                },
+                $css
+        );
 }
 

branches/6.2/tests/phpunit/tests/dependencies/styles.php

@@ -197 +197 @@
          * @ticket 54243
          * @ticket 54922
+         * @ticket 58069
          *
          * @covers ::_wp_normalize_relative_css_links
@@ -240 +241 @@
                                 'css'      => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
                                 'expected' => 'img {mask-image: url(\'data:image/svg+xml;utf8,<svg></svg>\');}',
+                        ),
+                        '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" );}',
                         ),
                 );