Changeset 44261 for trunk/src/wp-includes/class-wp-block-parser.php

Timestamp:

12/17/2018 04:50:48 AM (8 years ago)

Author:

desrosj

Message:

Block Editor: Update @wordpress dependencies.

Changes of note:

• Includes the new Annotations API package.
• wp-polyfill-ecmascript.js is renamed to wp-polyfill.js.
• strip_dynamic_blocks() has been removed in favor of excerpt_remove_blocks().
• The PHP block parser is now syncing from the block-serialization-default-parser package.
• do_blocks() uses the new parser.
• The do_block filter has been removed from do_blocks(), in favor of a render_block filter in render_block().

Also, a little cleanup to render_block(). Always normalize $block['attrs’] to array in ’render_block’ filter.
Props pento, azaozz.

Merges [43884] and [43888] to trunk.

See #45145, #45190, #45264, #45282.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-block-parser.php (modified) (12 diffs)

trunk/src/wp-includes/class-wp-block-parser.php

@@ -49 +49 @@
         public $innerHTML;
 
-        function __construct( $name, $attrs, $innerBlocks, $innerHTML ) {
-                $this->blockName   = $name;
-                $this->attrs       = $attrs;
-                $this->innerBlocks = $innerBlocks;
-                $this->innerHTML   = $innerHTML;
+        /**
+         * List of string fragments and null markers where inner blocks were found
+         *
+         * @example array(
+         *   'innerHTML'    => 'BeforeInnerAfter',
+         *   'innerBlocks'  => array( block, block ),
+         *   'innerContent' => array( 'Before', null, 'Inner', null, 'After' ),
+         * )
+         *
+         * @since 4.2.0
+         * @var array
+         */
+        public $innerContent;
+
+        function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
+                $this->blockName    = $name;
+                $this->attrs        = $attrs;
+                $this->innerBlocks  = $innerBlocks;
+                $this->innerHTML    = $innerHTML;
+                $this->innerContent = $innerContent;
         }
 }
@@ -160 +175 @@
 
         /**
+         * Empty associative array, here due to PHP quirks
+         *
+         * @since 4.4.0
+         * @var array empty associative array
+         */
+        public $empty_attrs;
+
+        /**
          * Parses a document and returns a list of block structures
          *
@@ -172 +195 @@
          */
         function parse( $document ) {
-                $this->document = $document;
-                $this->offset   = 0;
-                $this->output   = array();
-                $this->stack    = array();
+                $this->document    = $document;
+                $this->offset      = 0;
+                $this->output      = array();
+                $this->stack       = array();
+                $this->empty_attrs = json_decode( '{}', true );
 
                 do {
@@ -255 +279 @@
                                         }
 
-                                        $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '' );
+                                        $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() );
                                         $this->offset   = $start_offset + $token_length;
                                         return true;
@@ -262 +286 @@
                                 // otherwise we found an inner block
                                 $this->add_inner_block(
-                                        new WP_Block_Parser_Block( $block_name, $attrs, array(), '' ),
+                                        new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
                                         $start_offset,
                                         $token_length
@@ -274 +298 @@
                                         $this->stack,
                                         new WP_Block_Parser_Frame(
-                                                new WP_Block_Parser_Block( $block_name, $attrs, array(), '' ),
+                                                new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
                                                 $start_offset,
                                                 $token_length,
@@ -311 +335 @@
                                  * block and add it as a new innerBlock to the parent
                                  */
-                                $stack_top = array_pop( $this->stack );
-
-                                $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
-                                if ( $stack_top->block->innerBlocks ) {
-                                        $stack_top->block->innerBlocks[] = (array) $this->freeform( $html );
-                                } else {
-                                        $stack_top->block->innerHTML = $html;
-                                }
-
-                                $stack_top->prev_offset = $start_offset + $token_length;
+                                $stack_top                        = array_pop( $this->stack );
+                                $html                             = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
+                                $stack_top->block->innerHTML     .= $html;
+                                $stack_top->block->innerContent[] = $html;
+                                $stack_top->prev_offset           = $start_offset + $token_length;
 
                                 $this->add_inner_block(
@@ -360 +379 @@
                  */
                 $has_match = preg_match(
-                        '/<!--\s+(?<closer>\/)?wp:(?<namespace>[a-z][a-z0-9_-]*\/)?(?<name>[a-z][a-z0-9_-]*)\s+(?<attrs>{(?:(?!}\s+-->).)+?}\s+)?(?<void>\/)?-->/s',
+                        '/<!--\s+(?<closer>\/)?wp:(?<namespace>[a-z][a-z0-9_-]*\/)?(?<name>[a-z][a-z0-9_-]*)\s+(?<attrs>{(?:[^}]+|}+(?=})|(?!}\s+-->).)*?}\s+)?(?<void>\/)?-->/s',
                         $this->document,
                         $matches,
@@ -388 +407 @@
                 $attrs = $has_attrs
                         ? json_decode( $matches['attrs'][0], /* as-associative */ true )
-                        : json_decode( '{}', /* don't ask why, just verify in PHP */ false );
+                        : $this->empty_attrs;
 
                 /*
@@ -418 +437 @@
          * @return WP_Block_Parser_Block freeform block object
          */
-        static function freeform( $innerHTML ) {
-                return new WP_Block_Parser_Block( null, array(), array(), $innerHTML );
+        function freeform( $innerHTML ) {
+                return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
         }
 
@@ -453 +472 @@
         function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
                 $parent                       = $this->stack[ count( $this->stack ) - 1 ];
-                $parent->block->innerBlocks[] = (array) $this->freeform( substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ) );
                 $parent->block->innerBlocks[] = (array) $block;
-                $parent->prev_offset          = $last_offset ? $last_offset : $token_start + $token_length;
+                $html                         = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
+
+                if ( ! empty( $html ) ) {
+                        $parent->block->innerHTML     .= $html;
+                        $parent->block->innerContent[] = $html;
+                }
+
+                $parent->block->innerContent[] = null;
+                $parent->prev_offset           = $last_offset ? $last_offset : $token_start + $token_length;
         }
 
@@ -473 +499 @@
                         : substr( $this->document, $prev_offset );
 
-                if ( $stack_top->block->innerBlocks ) {
-                        $stack_top->block->innerBlocks[] = (array) $this->freeform( $html );
-                } else {
-                        $stack_top->block->innerHTML = $html;
+                if ( ! empty( $html ) ) {
+                        $stack_top->block->innerHTML     .= $html;
+                        $stack_top->block->innerContent[] = $html;
                 }