Skip to content

Commit 46fcd92

Browse files
SainathPoojarySainathPoojary
committed
Script Loader: Remove compression parameter from tests
1 parent 3cd6e91 commit 46fcd92

2 files changed

Lines changed: 69 additions & 69 deletions

File tree

‎src/wp-includes/script-loader.php‎

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2166,34 +2166,34 @@ function print_footer_scripts() {
21662166
* @global WP_Scripts $wp_scripts
21672167
*/
21682168
function _print_scripts() {
2169-
global $wp_scripts;
2170-
2171-
$concat = trim( $wp_scripts->concat, ', ' );
2172-
$type_attr = current_theme_supports( 'html5', 'script' ) ? '' : " type='text/javascript'";
2173-
2174-
if ( $concat ) {
2175-
if ( ! empty( $wp_scripts->print_code ) ) {
2176-
echo "\n<script{$type_attr}>\n";
2177-
echo "/* <![CDATA[ */\n"; // Not needed in HTML 5.
2178-
echo $wp_scripts->print_code;
2179-
echo "/* ]]> */\n";
2180-
echo "</script>\n";
2181-
}
2182-
2183-
$concat = str_split( $concat, 128 );
2184-
$concatenated = '';
2185-
2186-
foreach ( $concat as $key => $chunk ) {
2187-
$concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
2188-
}
2189-
2190-
$src = $wp_scripts->base_url . "/wp-admin/load-scripts.php?" . ltrim( $concatenated, '&' ) . '&ver=' . $wp_scripts->default_version;
2191-
echo "<script{$type_attr} src='" . esc_attr( $src ) . "'></script>\n";
2192-
}
2193-
2194-
if ( ! empty( $wp_scripts->print_html ) ) {
2195-
echo $wp_scripts->print_html;
2196-
}
2169+
global $wp_scripts;
2170+
2171+
$concat = trim( $wp_scripts->concat, ', ' );
2172+
$type_attr = current_theme_supports( 'html5', 'script' ) ? '' : " type='text/javascript'";
2173+
2174+
if ( $concat ) {
2175+
if ( ! empty( $wp_scripts->print_code ) ) {
2176+
echo "\n<script{$type_attr}>\n";
2177+
echo "/* <![CDATA[ */\n"; // Not needed in HTML 5.
2178+
echo $wp_scripts->print_code;
2179+
echo "/* ]]> */\n";
2180+
echo "</script>\n";
2181+
}
2182+
2183+
$concat = str_split( $concat, 128 );
2184+
$concatenated = '';
2185+
2186+
foreach ( $concat as $key => $chunk ) {
2187+
$concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
2188+
}
2189+
2190+
$src = $wp_scripts->base_url . '/wp-admin/load-scripts.php?' . ltrim( $concatenated, '&' ) . '&ver=' . $wp_scripts->default_version;
2191+
echo "<script{$type_attr} src='" . esc_attr( $src ) . "'></script>\n";
2192+
}
2193+
2194+
if ( ! empty( $wp_scripts->print_html ) ) {
2195+
echo $wp_scripts->print_html;
2196+
}
21972197
}
21982198

21992199
/**
@@ -2340,35 +2340,35 @@ function print_late_styles() {
23402340
* @since 3.3.0
23412341
*/
23422342
function _print_styles() {
2343-
$wp_styles = wp_styles();
2343+
$wp_styles = wp_styles();
23442344

2345-
$concat = trim( $wp_styles->concat, ', ' );
2346-
$type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
2345+
$concat = trim( $wp_styles->concat, ', ' );
2346+
$type_attr = current_theme_supports( 'html5', 'style' ) ? '' : ' type="text/css"';
23472347

2348-
if ( $concat ) {
2349-
$dir = $wp_styles->text_direction;
2350-
$ver = $wp_styles->default_version;
2348+
if ( $concat ) {
2349+
$dir = $wp_styles->text_direction;
2350+
$ver = $wp_styles->default_version;
23512351

2352-
$concat = str_split( $concat, 128 );
2353-
$concatenated = '';
2352+
$concat = str_split( $concat, 128 );
2353+
$concatenated = '';
23542354

2355-
foreach ( $concat as $key => $chunk ) {
2356-
$concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
2357-
}
2355+
foreach ( $concat as $key => $chunk ) {
2356+
$concatenated .= "&load%5Bchunk_{$key}%5D={$chunk}";
2357+
}
23582358

2359-
$href = $wp_styles->base_url . "/wp-admin/load-styles.php?dir={$dir}" . $concatenated . '&ver=' . $ver;
2360-
echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "'{$type_attr} media='all' />\n";
2359+
$href = $wp_styles->base_url . "/wp-admin/load-styles.php?dir={$dir}" . $concatenated . '&ver=' . $ver;
2360+
echo "<link rel='stylesheet' href='" . esc_attr( $href ) . "'{$type_attr} media='all' />\n";
23612361

2362-
if ( ! empty( $wp_styles->print_code ) ) {
2363-
echo "<style{$type_attr}>\n";
2364-
echo $wp_styles->print_code;
2365-
echo "\n</style>\n";
2366-
}
2367-
}
2362+
if ( ! empty( $wp_styles->print_code ) ) {
2363+
echo "<style{$type_attr}>\n";
2364+
echo $wp_styles->print_code;
2365+
echo "\n</style>\n";
2366+
}
2367+
}
23682368

2369-
if ( ! empty( $wp_styles->print_html ) ) {
2370-
echo $wp_styles->print_html;
2371-
}
2369+
if ( ! empty( $wp_styles->print_html ) ) {
2370+
echo $wp_styles->print_html;
2371+
}
23722372
}
23732373

23742374
/**
@@ -2379,14 +2379,14 @@ function _print_styles() {
23792379
* @global bool $concatenate_scripts
23802380
*/
23812381
function script_concat_settings() {
2382-
global $concatenate_scripts;
2383-
2384-
if ( ! isset( $concatenate_scripts ) ) {
2385-
$concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
2386-
if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
2387-
$concatenate_scripts = false;
2388-
}
2389-
}
2382+
global $concatenate_scripts;
2383+
2384+
if ( ! isset( $concatenate_scripts ) ) {
2385+
$concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
2386+
if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) {
2387+
$concatenate_scripts = false;
2388+
}
2389+
}
23902390
}
23912391

23922392
/**

‎tests/phpunit/tests/dependencies/scripts.php‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ public function test_concatenate_with_defer_strategy() {
13411341
// Reset global before asserting.
13421342
$concatenate_scripts = $old_value;
13431343

1344-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep,two-concat-dep,three-concat-dep&amp;ver={$wp_version}'></script>\n";
1344+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one-concat-dep,two-concat-dep,three-concat-dep&amp;ver={$wp_version}'></script>\n";
13451345
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-defer-script-js' defer data-wp-strategy='defer'></script>\n";
13461346

13471347
$this->assertEqualMarkup( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered with a "defer" loading strategy. Deferred scripts should not be part of the script concat loading query.' );
@@ -1376,7 +1376,7 @@ public function test_concatenate_with_async_strategy() {
13761376
// Reset global before asserting.
13771377
$concatenate_scripts = $old_value;
13781378

1379-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-1,two-concat-dep-1,three-concat-dep-1&amp;ver={$wp_version}'></script>\n";
1379+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one-concat-dep-1,two-concat-dep-1,three-concat-dep-1&amp;ver={$wp_version}'></script>\n";
13801380
$expected .= "<script type='text/javascript' src='/main-script.js' id='main-async-script-1-js' async data-wp-strategy='async'></script>\n";
13811381

13821382
$this->assertEqualMarkup( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered with an "async" loading strategy. Async scripts should not be part of the script concat loading query.' );
@@ -1415,7 +1415,7 @@ public function test_concatenate_with_blocking_script_before_and_after_script_wi
14151415
// Reset global before asserting.
14161416
$concatenate_scripts = $old_value;
14171417

1418-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one-concat-dep-2,two-concat-dep-2,three-concat-dep-2,four-concat-dep-2,five-concat-dep-2,six-concat-dep-2&amp;ver={$wp_version}'></script>\n";
1418+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one-concat-dep-2,two-concat-dep-2,three-concat-dep-2,four-concat-dep-2,five-concat-dep-2,six-concat-dep-2&amp;ver={$wp_version}'></script>\n";
14191419
$expected .= "<script type='text/javascript' src='/main-script.js' id='deferred-script-2-js' defer data-wp-strategy='defer'></script>\n";
14201420

14211421
$this->assertEqualMarkup( $expected, $print_scripts, 'Scripts are being incorrectly concatenated when a main script is registered as deferred after other blocking scripts are registered. Deferred scripts should not be part of the script concat loader query string. ' );
@@ -1498,7 +1498,7 @@ public function test_script_concatenation() {
14981498
wp_print_scripts();
14991499
$print_scripts = get_echo( '_print_scripts' );
15001500

1501-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two,three&amp;ver={$wp_version}'></script>\n";
1501+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one,two,three&amp;ver={$wp_version}'></script>\n";
15021502

15031503
$this->assertSame( $expected, $print_scripts );
15041504
}
@@ -1944,7 +1944,7 @@ public function test_wp_add_inline_script_after_with_concat() {
19441944
wp_add_inline_script( 'two', 'console.log("after two");' );
19451945
wp_add_inline_script( 'three', 'console.log("after three");' );
19461946

1947-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one&amp;ver={$wp_version}'></script>\n";
1947+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one&amp;ver={$wp_version}'></script>\n";
19481948
$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}two.js?ver={$wp_version}' id='two-js'></script>\n";
19491949
$expected .= "<script type='text/javascript' id='two-js-after'>\nconsole.log(\"after two\");\n</script>\n";
19501950
$expected .= "<script type='text/javascript' src='{$this->default_scripts_dir}three.js?ver={$wp_version}' id='three-js'></script>\n";
@@ -1997,7 +1997,7 @@ public function test_wp_add_inline_script_after_with_concat_and_core_dependency(
19971997
$wp_scripts->base_url = '';
19981998
$wp_scripts->do_concat = true;
19991999

2000-
$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";
2000+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
20012001
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
20022002
$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
20032003

@@ -2021,7 +2021,7 @@ public function test_wp_add_inline_script_after_with_concat_and_conditional_and_
20212021
$wp_scripts->base_url = '';
20222022
$wp_scripts->do_concat = true;
20232023

2024-
$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";
2024+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
20252025
$expected .= "<!--[if gte IE 9]>\n";
20262026
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
20272027
$expected .= "<script type='text/javascript' id='test-example-js-after'>\nconsole.log(\"after\");\n</script>\n";
@@ -2049,7 +2049,7 @@ public function test_wp_add_inline_script_before_with_concat_and_core_dependency
20492049
$wp_scripts->base_url = '';
20502050
$wp_scripts->do_concat = true;
20512051

2052-
$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";
2052+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=jquery-core,jquery-migrate&amp;ver={$wp_version}'></script>\n";
20532053
$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
20542054
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
20552055

@@ -2077,7 +2077,7 @@ public function test_wp_add_inline_script_before_after_concat_with_core_dependen
20772077
$wp_scripts->base_url = '';
20782078
$wp_scripts->do_concat = true;
20792079

2080-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core,jquery-migrate,wp-dom-ready,wp-hooks&amp;ver={$wp_version}'></script>\n";
2080+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=jquery-core,jquery-migrate,wp-dom-ready,wp-hooks&amp;ver={$wp_version}'></script>\n";
20812081
$expected .= "<script type='text/javascript' id='test-example-js-before'>\nconsole.log(\"before\");\n</script>\n";
20822082
$expected .= "<script type='text/javascript' src='http://example.com' id='test-example-js'></script>\n";
20832083
$expected .= "<script type='text/javascript' src='/wp-includes/js/dist/i18n.min.js' id='wp-i18n-js'></script>\n";
@@ -2187,7 +2187,7 @@ public function test_wp_add_inline_script_before_third_core_script_prints_two_co
21872187
wp_add_inline_script( 'three', 'console.log("before three");', 'before' );
21882188
wp_enqueue_script( 'four', '/wp-includes/js/script4.js' );
21892189

2190-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=one,two&amp;ver={$wp_version}'></script>\n";
2190+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=one,two&amp;ver={$wp_version}'></script>\n";
21912191
$expected .= "<script type='text/javascript' id='three-js-before'>\nconsole.log(\"before three\");\n</script>\n";
21922192
$expected .= "<script type='text/javascript' src='/wp-includes/js/script3.js?ver={$wp_version}' id='three-js'></script>\n";
21932193
$expected .= "<script type='text/javascript' src='/wp-includes/js/script4.js?ver={$wp_version}' id='four-js'></script>\n";
@@ -2944,7 +2944,7 @@ static function () {
29442944
);
29452945

29462946
// The non-default script should end concatenation and maintain order.
2947-
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?c=0&amp;load%5Bchunk_0%5D=jquery-core&amp;ver={$wp_version}'></script>\n";
2947+
$expected = "<script type='text/javascript' src='/wp-admin/load-scripts.php?load%5Bchunk_0%5D=jquery-core&amp;ver={$wp_version}'></script>\n";
29482948
$expected .= "<script type='text/javascript' src='/plugins/wp-i18n.js' id='wp-i18n-js'></script>\n";
29492949
$expected .= "<script type='text/javascript' src='/default/common.js' id='common-js'></script>\n";
29502950

0 commit comments

Comments
 (0)