<!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>[44117] trunk/src/wp-includes/class-wp-block-parser.php: PHPCS: Fix errors.</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 { white-space: pre-line; 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/44117">44117</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/44117","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>desrosj</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-12-13 17:51:31 +0000 (Thu, 13 Dec 2018)</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'>PHPCS: Fix errors.

Fixes errors introduced in <a href="https://core.trac.wordpress.org/changeset/44116">[44116]</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpblockparserphp">trunk/src/wp-includes/class-wp-block-parser.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpblockparserphp"></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-block-parser.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-block-parser.php   2018-12-13 17:39:59 UTC (rev 44116)
+++ trunk/src/wp-includes/class-wp-block-parser.php     2018-12-13 17:51:31 UTC (rev 44117)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,15 +245,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                 */
</span><span class="cx" style="display: block; padding: 0 10px">                                if ( 0 === $stack_depth ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                        if ( isset( $leading_html_start ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                                $this->output[] = (array) self::freeform( substr(
-                                                       $this->document,
-                                                       $leading_html_start,
-                                                       $start_offset - $leading_html_start
-                                               ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                         $this->output[] = (array) self::freeform(
+                                                       substr(
+                                                               $this->document,
+                                                               $leading_html_start,
+                                                               $start_offset - $leading_html_start
+                                                       )
+                                               );
</ins><span class="cx" style="display: block; padding: 0 10px">                                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                        $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        $this->offset = $start_offset + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 $this->offset   = $start_offset + $token_length;
</ins><span class="cx" style="display: block; padding: 0 10px">                                         return true;
</span><span class="cx" style="display: block; padding: 0 10px">                                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,13 +270,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        case 'block-opener':
</span><span class="cx" style="display: block; padding: 0 10px">                                // track all newly-opened blocks on the stack
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                array_push( $this->stack, new WP_Block_Parser_Frame(
-                                       new WP_Block_Parser_Block( $block_name, $attrs, array(), '' ),
-                                       $start_offset,
-                                       $token_length,
-                                       $start_offset + $token_length,
-                                       $leading_html_start
-                               ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         array_push(
+                                       $this->stack,
+                                       new WP_Block_Parser_Frame(
+                                               new WP_Block_Parser_Block( $block_name, $attrs, array(), '' ),
+                                               $start_offset,
+                                               $token_length,
+                                               $start_offset + $token_length,
+                                               $leading_html_start
+                                       )
+                               );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $this->offset = $start_offset + $token_length;
</span><span class="cx" style="display: block; padding: 0 10px">                                return true;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,9 +310,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                 * otherwise we're nested and we have to close out the current
</span><span class="cx" style="display: block; padding: 0 10px">                                 * block and add it as a new innerBlock to the parent
</span><span class="cx" style="display: block; padding: 0 10px">                                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $stack_top = array_pop( $this->stack );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $stack_top                    = array_pop( $this->stack );
</ins><span class="cx" style="display: block; padding: 0 10px">                                 $stack_top->block->innerHTML .= substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                $stack_top->prev_offset = $start_offset + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         $stack_top->prev_offset       = $start_offset + $token_length;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                $this->add_inner_block(
</span><span class="cx" style="display: block; padding: 0 10px">                                        $stack_top->block,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,15 +364,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        return array( 'no-more-tokens', null, null, null, null );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                list( $match, $started_at ) = $matches[ 0 ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         list( $match, $started_at ) = $matches[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $length    = strlen( $match );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ];
-               $is_void   = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ];
-               $namespace = $matches[ 'namespace' ];
-               $namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/';
-               $name      = $namespace . $matches[ 'name' ][ 0 ];
-               $has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1];
+               $is_void   = isset( $matches['void'] ) && -1 !== $matches['void'][1];
+               $namespace = $matches['namespace'];
+               $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
+               $name      = $namespace . $matches['name'][0];
+               $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1];
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /*
</span><span class="cx" style="display: block; padding: 0 10px">                 * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * are associative arrays. If we use `array()` we get a JSON `[]`
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><span class="cx" style="display: block; padding: 0 10px">                $attrs = $has_attrs
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        ? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 ? json_decode( $matches['attrs'][0], /* as-associative */ true )
</ins><span class="cx" style="display: block; padding: 0 10px">                         : json_decode( '{}', /* don't ask why, just verify in PHP */ false );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,10 +444,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">         * @param int|null $last_offset last byte offset into document if continuing form earlier output
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $parent = $this->stack[ count( $this->stack ) - 1 ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $parent                       = $this->stack[ count( $this->stack ) - 1 ];
</ins><span class="cx" style="display: block; padding: 0 10px">                 $parent->block->innerBlocks[] = $block;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $parent->block->innerHTML .= substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
-               $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $parent->block->innerHTML    .= substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
+               $parent->prev_offset          = $last_offset ? $last_offset : $token_start + $token_length;
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,11 +466,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        : substr( $this->document, $prev_offset );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( isset( $stack_top->leading_html_start ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $this->output[] = (array) self::freeform( substr(
-                               $this->document,
-                               $stack_top->leading_html_start,
-                               $stack_top->token_start - $stack_top->leading_html_start
-                       ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $this->output[] = (array) self::freeform(
+                               substr(
+                                       $this->document,
+                                       $stack_top->leading_html_start,
+                                       $stack_top->token_start - $stack_top->leading_html_start
+                               )
+                       );
</ins><span class="cx" style="display: block; padding: 0 10px">                 }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $this->output[] = (array) $stack_top->block;
</span></span></pre>
</div>
</div>

</body>
</html>