Navigation Block: Fix warning error when no ref (#47479)

* Navigation Block: Fix warning error when no ref * Nest checks using inner_blocks, independent of the wp_navigation post data * FIx unit tests * Add extra safety to block_core_navigation_block_contains_core_navigation
WordPress · Jan 31, 2023 · e6ccc25 · e6ccc25 · github-actions · Jan 31, 2023
1 parent c73da69
commit e6ccc25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -413,15 +413,15 @@ function( $block ) {
 /**
  * Returns true if the navigation block contains a nested navigation block.
  *
- * @param array $parsed_blocks the parsed blocks to be normalized.
+ * @param WP_Block_List $inner_blocks Inner block instance to be normalized.
  * @return bool true if the navigation block contains a nested navigation block.
  */
-function block_core_navigation_block_contains_core_navigation( $parsed_blocks ) {
-	foreach ( $parsed_blocks as $block ) {
-		if ( 'core/navigation' === $block['blockName'] ) {
+function block_core_navigation_block_contains_core_navigation( $inner_blocks ) {
+	foreach ( $inner_blocks as $block ) {
+		if ( 'core/navigation' === $block->name ) {
 			return true;
 		}
-		if ( block_core_navigation_block_contains_core_navigation( $block['innerBlocks'] ) ) {
+		if ( $block->inner_blocks && block_core_navigation_block_contains_core_navigation( $block->inner_blocks ) ) {
 			return true;
 		}
 	}
@@ -643,8 +643,7 @@ function render_block_core_navigation( $attributes, $content, $block ) {
 		$inner_blocks = new WP_Block_List( $fallback_blocks, $attributes );
 	}
 
-	$parsed_blocks = parse_blocks( $navigation_post->post_content );
-	if ( block_core_navigation_block_contains_core_navigation( $parsed_blocks ) ) {
+	if ( block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
 		return '';
 	}
 

diff --git a/phpunit/blocks/render-block-navigation-test.php b/phpunit/blocks/render-block-navigation-test.php
@@ -70,17 +70,20 @@ public function test_block_core_navigation_get_post_ids_from_block_with_submenu(
 	 */
 	public function test_gutenberg_block_core_navigation_block_contains_core_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:navigation /-->' );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $parsed_blocks ) );
+		$inner_blocks  = new WP_Block_List( $parsed_blocks );
+		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
 	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_deep() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- /wp:group --><!-- wp:group --><!-- wp:group --><!-- wp:navigation /--><!-- /wp:group --><!-- /wp:group -->' );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $parsed_blocks ) );
+		$inner_blocks  = new WP_Block_List( $parsed_blocks );
+		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
 	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_no_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- wp:group --><!-- /wp:group --><!-- /wp:group -->' );
-		$this->assertFalse( gutenberg_block_core_navigation_block_contains_core_navigation( $parsed_blocks ) );
+		$inner_blocks  = new WP_Block_List( $parsed_blocks );
+		$this->assertFalse( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
 }