<!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>[36604] trunk: Script Loader: Fix missing script output when the groups of dependencies are different.</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 { 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/36604">36604</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/36604","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-20 22:10:01 +0000 (Sat, 20 Feb 2016)</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: Fix missing script output when the groups of dependencies are different.
Aka: Don't lose the grandchild.
Props gitlost, ocean90.
Fixes <a href="https://core.trac.wordpress.org/ticket/35873">#35873</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpdependenciesphp">trunk/src/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunktestsphpunittestsdependenciesscriptsphp">trunk/tests/phpunit/tests/dependencies/scripts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-dependencies.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-dependencies.php 2016-02-20 21:43:51 UTC (rev 36603)
+++ trunk/src/wp-includes/class.wp-dependencies.php 2016-02-20 22:10:01 UTC (rev 36604)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,11 +384,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_group( $handle, $recursion, $group ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $group = (int) $group;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $recursion )
- $group = min($this->group, $group);
- else
- $this->group = $group;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $recursion ) {
+ $group = min( $this->group, $group );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->group = $group;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset($this->groups[$handle]) && $this->groups[$handle] <= $group )
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsdependenciesscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dependencies/scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dependencies/scripts.php 2016-02-20 21:43:51 UTC (rev 36603)
+++ trunk/tests/phpunit/tests/dependencies/scripts.php 2016-02-20 22:10:01 UTC (rev 36604)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,4 +199,71 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( home_url( 'bar.js' ), $footer );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( home_url( 'baz.js' ), $footer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Test mismatch of groups in dependencies outputs all scripts in right order.
+ *
+ * @ticket 35873
+ */
+ public function test_group_mismatch_in_deps() {
+ $scripts = new WP_Scripts;
+ $scripts->add( 'one', 'one', array(), 'v1', 1 );
+ $scripts->add( 'two', 'two', array( 'one' ) );
+ $scripts->add( 'three', 'three', array( 'two' ), 'v1', 1 );
+
+ $scripts->enqueue( array( 'three' ) );
+
+ $this->expectOutputRegex( '/^(?:<script[^>]+><\/script>\\n){7}$/' );
+
+ $scripts->do_items( false, 0 );
+ $this->assertContains( 'one', $scripts->done );
+ $this->assertContains( 'two', $scripts->done );
+ $this->assertNotContains( 'three', $scripts->done );
+
+ $scripts->do_items( false, 1 );
+ $this->assertContains( 'one', $scripts->done );
+ $this->assertContains( 'two', $scripts->done );
+ $this->assertContains( 'three', $scripts->done );
+
+ $scripts = new WP_Scripts;
+ $scripts->add( 'one', 'one', array(), 'v1', 1 );
+ $scripts->add( 'two', 'two', array( 'one' ), 'v1', 1 );
+ $scripts->add( 'three', 'three', array( 'one' ) );
+ $scripts->add( 'four', 'four', array( 'two', 'three' ), 'v1', 1 );
+
+ $scripts->enqueue( array( 'four' ) );
+
+ $scripts->do_items( false, 0 );
+ $this->assertContains( 'one', $scripts->done );
+ $this->assertNotContains( 'two', $scripts->done );
+ $this->assertContains( 'three', $scripts->done );
+ $this->assertNotContains( 'four', $scripts->done );
+
+ $scripts->do_items( false, 1 );
+ $this->assertContains( 'one', $scripts->done );
+ $this->assertContains( 'two', $scripts->done );
+ $this->assertContains( 'three', $scripts->done );
+ $this->assertContains( 'four', $scripts->done );
+ }
+
+ /**
+ * @ticket 35873
+ */
+ function test_wp_register_script_with_dependencies_in_head_and_footer() {
+ wp_register_script( 'parent', '/parent.js', array( 'child' ), '1', true ); // in footer
+ wp_register_script( 'child', '/child.js', array( 'grandchild' ), '1', false ); // in head
+ wp_register_script( 'grandchild', '/grandchild.js', array(), '1', true ); // in footer
+
+ wp_enqueue_script( 'parent' );
+
+ $header = get_echo( 'wp_print_head_scripts' );
+ $footer = get_echo( 'wp_print_footer_scripts' );
+
+ $expected_header = "<script type='text/javascript' src='/grandchild.js?ver=1'></script>\n";
+ $expected_header .= "<script type='text/javascript' src='/child.js?ver=1'></script>\n";
+ $expected_footer = "<script type='text/javascript' src='/parent.js?ver=1'></script>\n";
+
+ $this->assertEquals( $expected_header, $header );
+ $this->assertEquals( $expected_footer, $footer );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>