Changeset 61927 for trunk/tests/phpunit/tests/dependencies/styles.php

Timestamp:

03/11/2026 01:30:24 AM (7 months ago)

Author:

westonruter

Message:

Script Loader: Preserve duplicate URL query params in enqueued scripts and styles.

Previously in r61397, add_query_arg() was used to append versions or handle-specific query arguments. This resulted in stripping any existing duplicate query variables in the source URL (common in Google Fonts URLs). This change refactors WP_Styles::_css_href() and WP_Scripts::do_item() to manually append these parameters to the URL string. This ensures all original query variables are preserved exactly as provided. It also improves fragment handling by ensuring query parameters are inserted before any '#' anchor while maintaining the anchor's presence.

The URL encoding changes in tests/phpunit/tests/dependencies/scripts.php are reversions of what had previously been done in r61397.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11164

Follow-up to r61397, r61358.

Props westonruter, jonsurrell.
Fixes #64372.

File:

• trunk/tests/phpunit/tests/dependencies/styles.php (modified) (1 diff)

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -963 +963 @@
 
         /**
+         * Tests that duplicate query vars and fragments are preserved in styles.
+         *
+         * @ticket 64372
+         *
+         * @dataProvider data_duplicate_query_vars_and_fragments_preserved_in_styles
+         *
+         * @param string           $src          The stylesheet's source URL.
+         * @param string|bool|null $ver          The style's version.
+         * @param string           $expected_url The expected URL.
+         * @param string           $handle       Optional. The style's registered handle. Default 'test-style'.
+         */
+        public function test_duplicate_query_vars_and_fragments_preserved_in_styles( string $src, $ver, string $expected_url, string $handle = 'test-style' ): void {
+                wp_enqueue_style( $handle, $src, array(), $ver );
+                $output    = get_echo( 'wp_print_styles' );
+                $processor = new WP_HTML_Tag_Processor( $output );
+
+                $this->assertTrue( $processor->next_tag( 'link' ) );
+                $this->assertSame( $expected_url, $processor->get_attribute( 'href' ) );
+        }
+
+        /**
+         * Data provider for test_duplicate_query_vars_and_fragments_preserved_in_styles.
+         *
+         * @return array<string, array{src: string, ver: string|bool|null, expected_url: string, handle?: string}> Data provider.
+         */
+        public function data_duplicate_query_vars_and_fragments_preserved_in_styles(): array {
+                $ver = get_bloginfo( 'version' );
+
+                return array(
+                        'duplicate query vars'                => array(
+                                'src'          => 'https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap',
+                                'ver'          => '1.0',
+                                'expected_url' => 'https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap&ver=1.0',
+                        ),
+                        'duplicate query vars, null version'  => array(
+                                'src'          => 'https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap',
+                                'ver'          => null,
+                                'expected_url' => 'https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap',
+                        ),
+                        'duplicate query vars, false version' => array(
+                                'src'          => 'https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap',
+                                'ver'          => false,
+                                'expected_url' => "https://fonts.googleapis.com/css2?family=Figtree:wght@300;400;500;600;700&family=Montserrat:wght@700&display=swap&ver=$ver",
+                        ),
+                        'duplicate query vars in handle'      => array(
+                                'src'          => 'https://example.com/test-style.css',
+                                'ver'          => '1.0',
+                                'expected_url' => 'https://example.com/test-style.css?ver=1.0&a=1&a=2',
+                                'handle'       => 'test-style?a=1&a=2',
+                        ),
+                        'duplicate query vars and fragments'  => array(
+                                'src'          => 'https://example.com/style.css?arg=1&arg=2#anchor',
+                                'ver'          => '1.0',
+                                'expected_url' => 'https://example.com/style.css?arg=1&arg=2&ver=1.0#anchor',
+                        ),
+                        'zero query var in handle'            => array(
+                                'src'          => 'https://example.com/test-style.css',
+                                'ver'          => '1.0',
+                                'expected_url' => 'https://example.com/test-style.css?ver=1.0&0',
+                                'handle'       => 'test-style?0',
+                        ),
+                );
+        }
+
+        /**
          * Data provider for:
          * - test_varying_versions_added_to_handle_args_enqueued_styles