Changeset 56680 for trunk/src/wp-includes/blocks.php

Timestamp:

09/25/2023 03:34:34 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Fix a few newly introduced WPCS issues.

Follow-up to [56570], [56573], [56589], [56604], [56612], [56620], [56629], [56631], [56638], [56642], [56644], [56649].

Props jrf.
See #59161, #58831.

File:

• trunk/src/wp-includes/blocks.php (modified) (9 diffs)

trunk/src/wp-includes/blocks.php

@@ -791 +791 @@
          * `first_child`, respectively, to the serialized markup for the given block.
          *
-         * @param array $block  The block to inject the theme attribute into, and hooked blocks before.
-         * @param array $parent The parent block of the given block.
-         * @param array $prev   The previous sibling block of the given block.
+         * @param array $block        The block to inject the theme attribute into, and hooked blocks before.
+         * @param array $parent_block The parent block of the given block.
+         * @param array $prev         The previous sibling block of the given block.
          * @return string The serialized markup for the given block, with the markup for any hooked blocks prepended to it.
          */
-        return function( &$block, $parent = null, $prev = null ) use ( $context ) {
+        return function ( &$block, $parent_block = null, $prev = null ) use ( $context ) {
                 _inject_theme_attribute_in_template_part_block( $block );
 
                 $markup = '';
 
-                if ( $parent && ! $prev ) {
+                if ( $parent_block && ! $prev ) {
                         // Candidate for first-child insertion.
                         $relative_position  = 'first_child';
-                        $anchor_block_type  = $parent['blockName'];
+                        $anchor_block_type  = $parent_block['blockName'];
                         $hooked_block_types = array_keys( get_hooked_blocks( $anchor_block_type, $relative_position ) );
                         /**
@@ -857 +857 @@
          * `last_child`, respectively, to the serialized markup for the given block.
          *
-         * @param array $block  The block to inject the hooked blocks after.
-         * @param array $parent The parent block of the given block.
-         * @param array $next   The next sibling block of the given block.
+         * @param array $block        The block to inject the hooked blocks after.
+         * @param array $parent_block The parent block of the given block.
+         * @param array $next         The next sibling block of the given block.
          * @return string The serialized markup for the given block, with the markup for any hooked blocks appended to it.
          */
-        return function( &$block, $parent = null, $next = null ) use ( $context ) {
+        return function ( &$block, $parent_block = null, $next = null ) use ( $context ) {
                 $markup = '';
 
@@ -874 +874 @@
                 }
 
-                if ( $parent && ! $next ) {
+                if ( $parent_block && ! $next ) {
                         // Candidate for last-child insertion.
                         $relative_position  = 'last_child';
-                        $anchor_block_type  = $parent['blockName'];
+                        $anchor_block_type  = $parent_block['blockName'];
                         $hooked_block_types = array_keys( get_hooked_blocks( $anchor_block_type, $relative_position ) );
                         /** This filter is documented in wp-includes/blocks.php */
@@ -1060 +1060 @@
                                         ? null
                                         : $block['innerBlocks'][ $block_index - 1 ];
+
                                 $block_content .= call_user_func_array(
                                         $pre_callback,
@@ -1072 +1073 @@
                                         ? null
                                         : $block['innerBlocks'][ $block_index + 1 ];
+
                                 $block_content .= call_user_func_array(
                                         $post_callback,
@@ -1077 +1079 @@
                                 );
                         }
-                        $block_index++;
+                        ++$block_index;
                 }
         }
@@ -1131 +1133 @@
                                 ? null
                                 : $blocks[ $index - 1 ];
+
                         $result .= call_user_func_array(
                                 $pre_callback,
@@ -1136 +1139 @@
                         );
                 }
+
                 $result .= traverse_and_serialize_block( $block, $pre_callback, $post_callback );
+
                 if ( is_callable( $post_callback ) ) {
                         $next = count( $blocks ) - 1 === $index
                                 ? null
                                 : $blocks[ $index + 1 ];
+
                         $result .= call_user_func_array(
                                 $post_callback,
@@ -1147 +1153 @@
                 }
         }
+
         return $result;
 }