PHPCS improvements (#2914)

Update PHPCS and WPCS, and update Gutenberg's PHP code to conform to the updated rules.

blocks/library/categories/index.php

@@ -30,20 +30,20 @@ function gutenberg_render_block_core_categories( $attributes ) {
  );
 
  if ( ! empty( $attributes['displayAsDropdown'] ) ) {
- $id = 'wp-block-categories-' . $block_id;
- $args['id'] = $id;
+ $id  = 'wp-block-categories-' . $block_id;
+ $args['id']  = $id;
  $args['show_option_none'] = __( 'Select Category', 'gutenberg' );
- $wrapper_markup = '<div class="%1$s">%2$s</div>';
- $items_markup = wp_dropdown_categories( $args );
- $type = 'dropdown';
+ $wrapper_markup  = '<div class="%1$s">%2$s</div>';
+ $items_markup  = wp_dropdown_categories( $args );
+ $type  = 'dropdown';
 
  if ( ! is_admin() ) {
  $wrapper_markup .= gutenberg_build_dropdown_script_block_core_categories( $id );
  }
  } else {
  $wrapper_markup = '<div class="%1$s"><ul>%2$s</ul></div>';
- $items_markup = wp_list_categories( $args );
- $type = 'list';
+ $items_markup  = wp_list_categories( $args );
+ $type  = 'list';
  }
 
  $class = "wp-block-categories wp-block-categories-{$type} align{$align}";

blocks/library/latest-posts/index.php

@@ -63,28 +63,27 @@ function gutenberg_render_block_core_latest_posts( $attributes ) {
 }
 
 register_block_type( 'core/latest-posts', array(
- 'attributes' => array(
- 'postsToShow' => array(
- 'type' => 'number',
+ 'attributes'  => array(
+ 'postsToShow'  => array(
+ 'type'  => 'number',
  'default' => 5,
  ),
  'displayPostDate' => array(
- 'type' => 'boolean',
+ 'type'  => 'boolean',
  'default' => false,
  ),
- 'layout' => array(
- 'type' => 'string',
+ 'layout'  => array(
+ 'type'  => 'string',
  'default' => 'list',
  ),
- 'columns' => array(
- 'type' => 'number',
+ 'columns'  => array(
+ 'type'  => 'number',
  'default' => 3,
  ),
- 'align' => array(
- 'type' => 'string',
+ 'align'  => array(
+ 'type'  => 'string',
  'default' => 'center',
  ),
  ),
-
  'render_callback' => 'gutenberg_render_block_core_latest_posts',
 ) );

lib/blocks.php

@@ -73,8 +73,8 @@ function do_blocks( $content ) {
  $content_after_blocks = '';
 
  foreach ( $blocks as $block ) {
- $block_name = isset( $block['blockName'] ) ? $block['blockName'] : null;
- $attributes = is_array( $block['attrs'] ) ? $block['attrs'] : array();
+ $block_name  = isset( $block['blockName'] ) ? $block['blockName'] : null;
+ $attributes  = is_array( $block['attrs'] ) ? $block['attrs'] : array();
  $raw_content = isset( $block['rawContent'] ) ? $block['rawContent'] : null;
 
  if ( $block_name ) {

lib/class-wp-block-type-registry.php

@@ -53,7 +53,7 @@ public function register( $name, $args = array() ) {
  $block_type = null;
  if ( is_a( $name, 'WP_Block_Type' ) ) {
  $block_type = $name;
- $name = $block_type->name;
+ $name  = $block_type->name;
  }
 
  if ( ! is_string( $name ) ) {

lib/class-wp-rest-reusable-blocks-controller.php

@@ -97,7 +97,7 @@ public function get_items( $request ) {
  $collection = array();
 
  foreach ( $reusable_blocks as $reusable_block ) {
- $response = $this->prepare_item_for_response( $reusable_block, $request );
+ $response  = $this->prepare_item_for_response( $reusable_block, $request );
  $collection[] = $this->prepare_response_for_collection( $response );
  }
 
@@ -219,7 +219,7 @@ protected function prepare_item_for_database( $request ) {
  $prepared_reusable_block->ID = $existing_reusable_block->ID;
  }
 
- $prepared_reusable_block->post_type = 'gb_reusable_block';
+ $prepared_reusable_block->post_type  = 'gb_reusable_block';
  $prepared_reusable_block->post_status = 'publish';
 
  // ID. We already validated this in self::update_item().
@@ -258,8 +258,8 @@ protected function prepare_item_for_database( $request ) {
  */
  public function prepare_item_for_response( $reusable_block, $request ) {
  $data = array(
- 'id' => $reusable_block->post_name,
- 'name' => $reusable_block->post_title,
+ 'id'  => $reusable_block->post_name,
+ 'name'  => $reusable_block->post_title,
  'content' => $reusable_block->post_content,
  );
 
@@ -289,27 +289,27 @@ public function prepare_response_for_collection( $response ) {
  */
  public function get_item_schema() {
  return array(
- '$schema'  => 'http:https://json-schema.org/schema#',
- 'title'  => 'reusable-block',
- 'type'  => 'object',
- 'properties'  => array(
- 'id'  => array(
- 'description'  => __( 'UUID that identifies this reusable block.', 'gutenberg' ),
- 'type'  => 'string',
- 'context'  => array( 'view', 'edit' ),
- 'readonly'  => true,
+ '$schema' => 'http:https://json-schema.org/schema#',
+ 'title' => 'reusable-block',
+ 'type' => 'object',
+ 'properties' => array(
+ 'id' => array(
+ 'description' => __( 'UUID that identifies this reusable block.', 'gutenberg' ),
+ 'type' => 'string',
+ 'context' => array( 'view', 'edit' ),
+ 'readonly' => true,
  ),
- 'name'  => array(
- 'description'  => __( 'Name that identifies this reusable block', 'gutenberg' ),
- 'type'  => 'string',
- 'context'  => array( 'view', 'edit' ),
- 'required'  => true,
+ 'name' => array(
+ 'description' => __( 'Name that identifies this reusable block', 'gutenberg' ),
+ 'type' => 'string',
+ 'context' => array( 'view', 'edit' ),
+ 'required' => true,
  ),
- 'content'  => array(
- 'description'  => __( 'The block\'s HTML content.', 'gutenberg' ),
- 'type'  => 'object',
- 'context'  => array( 'view', 'edit' ),
- 'required'  => true,
+ 'content' => array(
+ 'description' => __( 'The block\'s HTML content.', 'gutenberg' ),
+ 'type' => 'object',
+ 'context' => array( 'view', 'edit' ),
+ 'required' => true,
  ),
  ),
  );
@@ -328,7 +328,7 @@ public function get_item_schema() {
  private function get_reusable_block( $uuid ) {
  $reusable_blocks = get_posts( array(
  'post_type' => 'gb_reusable_block',
- 'name' => $uuid,
+ 'name'  => $uuid,
  ) );
 
  return array_shift( $reusable_blocks );