Changeset 60948 for trunk/tests/phpunit/tests/dependencies/scripts.php

Timestamp:

10/16/2025 07:59:11 PM (4 months ago)

Author:

joedolson

Message:

General: Remove support for IE conditional comments.

Remove the ability to enqueue scripts and styles wrapped in IE conditional comment tags. Conditional comment support was removed from IE in version 10 in 2012, and no core supported browser renders them in any way. IE9 has global usage approaching zero. WordPress dropped support for IE10 and below in version 4.8.

Patch adds a deprecation notice if the conditional data argument is added. Scripts and styles are not printed, and neither are their dependencies if they are not required by other non-conditional scripts. Conditional dependencies are removed from core enqueues.

Props jonsurrell, joedolson, shailu25, siliconforks, dmsnell, sabernhardt, rollybueno.
Fixes #63821.

File:

• trunk/tests/phpunit/tests/dependencies/scripts.php (modified) (5 diffs)

trunk/tests/phpunit/tests/dependencies/scripts.php

@@ -1960 +1960 @@
      * Testing `wp_script_add_data` with the conditional key.
      *
+     * @expectedDeprecated WP_Dependencies->add_data()
+     *
+     * @since 6.9.0 Conditional comments should now return an empty string.
+     *
      * @ticket 16024
      */
@@ -1966 +1970 @@
         wp_enqueue_script( 'test-only-conditional', 'example.com', array(), null );
         wp_script_add_data( 'test-only-conditional', 'conditional', 'gt IE 7' );
-        $expected = "<!--[if gt IE 7]>\n<script type=\"text/javascript\" src=\"http://example.com\" id=\"test-only-conditional-js\"></script>\n<![endif]-->\n";
-
-        // Go!
-        $this->assertEqualHTML( $expected, get_echo( 'wp_print_scripts' ) );
-
-        // No scripts left to print.
-        $this->assertSame( '', get_echo( 'wp_print_scripts' ) );
-    }
-
-    /**
-     * Testing `wp_script_add_data` with both the data & conditional keys.
-     *
-     * @ticket 16024
-     */
-    public function test_wp_script_add_data_with_data_and_conditional_keys() {
-        // Enqueue and add data plus conditional comments for both.
-        wp_enqueue_script( 'test-conditional-with-data', 'example.com', array(), null );
-        wp_script_add_data( 'test-conditional-with-data', 'data', 'testing' );
-        wp_script_add_data( 'test-conditional-with-data', 'conditional', 'lt IE 9' );
-        $expected  = "<!--[if lt IE 9]>\n<script type='text/javascript' id='test-conditional-with-data-js-extra'>\n/* <![CDATA[ */\ntesting\n//# sourceURL=test-conditional-with-data-js-extra\n/* ]]> */\n</script>\n<![endif]-->\n";
-        $expected .= "<!--[if lt IE 9]>\n<script type='text/javascript' src='http://example.com' id='test-conditional-with-data-js'></script>\n<![endif]-->\n";
-        $expected  = str_replace( "'", '"', $expected );
-
-        // Go!
-        $this->assertEqualHTML( $expected, get_echo( 'wp_print_scripts' ) );
-
         // No scripts left to print.
         $this->assertSame( '', get_echo( 'wp_print_scripts' ) );
@@ -2404 +2382 @@
 
     /**
+     * @expectedDeprecated WP_Dependencies->add_data()
+     *
      * @ticket 14853
+     * @ticket 63821
      */
     public function test_wp_add_inline_script_after_and_before_with_concat_and_conditional() {
@@ -2412 +2393 @@
         $wp_scripts->default_dirs = array( '/wp-admin/js/', '/wp-includes/js/' ); // Default dirs as in wp-includes/script-loader.php.
 
-        $expected_localized  = "<!--[if gte IE 9]>\n";
-        $expected_localized .= "<script type='text/javascript' id='test-example-js-extra'>\n/* <![CDATA[ */\nvar testExample = {\"foo\":\"bar\"};\n/* ]]> */\n</script>\n";
-        $expected_localized .= "<![endif]-->\n";
-        $expected_localized  = str_replace( "'", '"', $expected_localized );
-
-        $expected  = "<!--[if gte IE 9]>\n";
-        $expected .= "<script type='text/javascript' id='test-example-js-before'>\n/* <![CDATA[ */\nconsole.log(\"before\");\n//# sourceURL=test-example-js-before\n/* ]]> */\n</script>\n";
-        $expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
-        $expected .= "<script type='text/javascript' id='test-example-js-after'>\n/* <![CDATA[ */\nconsole.log(\"after\");\n//# sourceURL=test-example-js-after\n/* ]]> */\n</script>\n";
-        $expected .= "<![endif]-->\n";
-        $expected  = str_replace( "'", '"', $expected );
+        // Conditional scripts should not output.
+        $expected_localized = '';
+        $expected           = '';
 
         wp_enqueue_script( 'test-example', 'example.com', array(), null );
@@ -2460 +2433 @@
 
     /**
+     * @expectedDeprecated WP_Dependencies->add_data()
+     *
      * @ticket 36392
+     * @ticket 63821
      */
     public function test_wp_add_inline_script_after_with_concat_and_conditional_and_core_dependency() {
-        global $wp_scripts, $wp_version;
-
+        global $wp_scripts;
         wp_default_scripts( $wp_scripts );
 
         $wp_scripts->base_url  = '';
         $wp_scripts->do_concat = true;
-
-        $expected  = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
-        $expected .= "<!--[if gte IE 9]>\n";
-        $expected .= "<script type=\"text/javascript\" src=\"http://example.com\" id=\"test-example-js\"></script>\n";
-        $expected .= "<script type=\"text/javascript\" id=\"test-example-js-after\">\n/* <![CDATA[ */\nconsole.log(\"after\");\n//# sourceURL=test-example-js-after\n/* ]]> */\n</script>\n";
-        $expected .= "<![endif]-->\n";
+        $expected              = '';
 
         wp_enqueue_script( 'test-example', 'http://example.com', array( 'jquery' ), null );