Fix PHP linting

WordPress · Mar 31, 2020 · 011d0ac · 011d0ac
1 parent 824566b
commit 011d0ac
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
@@ -31,24 +31,15 @@ function render_block_core_navigation_link( $content, $block ) {
 	// block rendering using the render_block filter. It does this to gain access to
 	// innerBlocks, but at the same time this bypasses prepare_attributes_for_render.
 	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-	$attributes = $block_type->prepare_attributes_for_render( $block[ 'attrs' ] );
+	$attributes = $block_type->prepare_attributes_for_render( $block['attrs'] );
 
 	// Don't render the block's subtree if it has no label.
 	if ( empty( $attributes['label'] ) ) {
 		return '';
 	}
 
-	// TODO Font sizes and colors were previously specified on the Navigation Link
-	// $classes         = array_merge(
-	// 	$colors['css_classes'],
-	// 	$font_sizes['css_classes']
-	// );
-	// $classes[]       = 'wp-block-navigation-link';
-	// $style_attribute = ( $colors['inline_styles'] || $font_sizes['inline_styles'] )
-	// 	? sprintf( ' style="%s"', esc_attr( $colors['inline_styles'] ) . esc_attr( $font_sizes['inline_styles'] ) )
-	// 	: '';
-
-	// TODO $classes and $style_attribute below are temporary until font sizes and colors are working again.
+	// TODO $classes and $style_attribute below are temporary. Ideally the Navigation Block would
+	// have some way of passing its attributes to the Navigation Link so that these continue to work.
 	$classes         = array( 'wp-block-navigation-link' );
 	$style_attribute = '';
 
@@ -163,7 +154,7 @@ function register_block_core_navigation_link() {
 					'type' => 'string',
 				),
 			),
-		),
+		)
 	);
 }
 add_action( 'init', 'register_block_core_navigation_link' );

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
@@ -112,7 +112,7 @@ function render_block_core_navigation( $content, $block ) {
 	// block rendering using the render_block filter. It does this to gain access to
 	// innerBlocks, but at the same time this bypasses prepare_attributes_for_render.
 	$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
-	$attributes = $block_type->prepare_attributes_for_render( $block[ 'attrs' ] );
+	$attributes = $block_type->prepare_attributes_for_render( $block['attrs'] );
 
 	/**
 	 * Deprecated:
@@ -144,7 +144,7 @@ function render_block_core_navigation( $content, $block ) {
 		isset( $attributes['className'] ) ? array( $attributes['className'] ) : array(),
 		isset( $attributes['itemsJustification'] ) ? array( 'items-justified-' . $attributes['itemsJustification'] ) : array(),
 		isset( $attributes['align'] ) ? array( 'align' . $attributes['align'] ) : array(),
-		isset( $attributes['showSubmenuIcon'] ) && $attributes['showSubmenuIcon'] ? array( 'has-submenu-icon' ) : array(),
+		isset( $attributes['showSubmenuIcon'] ) && $attributes['showSubmenuIcon'] ? array( 'has-submenu-icon' ) : array()
 	);
 	$class_attribute = sprintf( ' class="%s"', esc_attr( implode( ' ', $classes ) ) );
 	$style_attribute = ( $colors['inline_styles'] || $font_sizes['inline_styles'] )