iqltechnologies / brighty

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/ProductNew.php

Indentation +15 added lines, -15 removed lines

@@ -6,20 +6,20 @@
  */
 class ProductNew extends AbstractProductGrid {
 
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'product-new';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'product-new';
 
-	/**
-	 * Set args specific to this block
-	 *
-	 * @param array $query_args Query args.
-	 */
-	protected function set_block_query_args( &$query_args ) {
-		$query_args['orderby'] = 'date';
-		$query_args['order']   = 'DESC';
-	}
+    /**
+     * Set args specific to this block
+     *
+     * @param array $query_args Query args.
+     */
+    protected function set_block_query_args( &$query_args ) {
+        $query_args['orderby'] = 'date';
+        $query_args['order']   = 'DESC';
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 	 *
 	 * @param array $query_args Query args.
 	 */
-	protected function set_block_query_args( &$query_args ) {
+	protected function set_block_query_args(&$query_args) {
 		$query_args['orderby'] = 'date';
 		$query_args['order']   = 'DESC';
 	}

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/ProductSKU.php

Indentation +21 added lines, -21 removed lines

@@ -6,27 +6,27 @@
  */
 class ProductSKU extends AbstractBlock {
 
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'product-sku';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'product-sku';
 
-	/**
-	 * API version name.
-	 *
-	 * @var string
-	 */
-	protected $api_version = '2';
+    /**
+     * API version name.
+     *
+     * @var string
+     */
+    protected $api_version = '2';
 
-	/**
-	 * Register script and style assets for the block type before it is registered.
-	 *
-	 * This registers the scripts; it does not enqueue them.
-	 */
-	protected function register_block_type_assets() {
-		parent::register_block_type_assets();
-		$this->register_chunk_translations( [ $this->block_name ] );
-	}
+    /**
+     * Register script and style assets for the block type before it is registered.
+     *
+     * This registers the scripts; it does not enqueue them.
+     */
+    protected function register_block_type_assets() {
+        parent::register_block_type_assets();
+        $this->register_chunk_translations( [ $this->block_name ] );
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -51,6 +51,6 @@
 	 */
 	protected function register_block_type_assets() {
 		parent::register_block_type_assets();
-		$this->register_chunk_translations( [ $this->block_name ] );
+		$this->register_chunk_translations([$this->block_name]);
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/ProductTag.php

Indentation +57 added lines, -57 removed lines

@@ -5,66 +5,66 @@
  * ProductTag class.
  */
 class ProductTag extends AbstractProductGrid {
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'product-tag';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'product-tag';
 
-	/**
-	 * Set args specific to this block.
-	 *
-	 * @param array $query_args Query args.
-	 */
-	protected function set_block_query_args( &$query_args ) {
-		if ( ! empty( $this->attributes['tags'] ) ) {
-			$query_args['tax_query'][] = array(
-				'taxonomy' => 'product_tag',
-				'terms'    => array_map( 'absint', $this->attributes['tags'] ),
-				'field'    => 'term_id',
-				'operator' => isset( $this->attributes['tagOperator'] ) && 'any' === $this->attributes['tagOperator'] ? 'IN' : 'AND',
-			);
-		}
-	}
+    /**
+     * Set args specific to this block.
+     *
+     * @param array $query_args Query args.
+     */
+    protected function set_block_query_args( &$query_args ) {
+        if ( ! empty( $this->attributes['tags'] ) ) {
+            $query_args['tax_query'][] = array(
+                'taxonomy' => 'product_tag',
+                'terms'    => array_map( 'absint', $this->attributes['tags'] ),
+                'field'    => 'term_id',
+                'operator' => isset( $this->attributes['tagOperator'] ) && 'any' === $this->attributes['tagOperator'] ? 'IN' : 'AND',
+            );
+        }
+    }
 
-	/**
-	 * Get block attributes.
-	 *
-	 * @return array
-	 */
-	protected function get_block_type_attributes() {
-		return array(
-			'className'         => $this->get_schema_string(),
-			'columns'           => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_columns', 3 ) ),
-			'rows'              => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_rows', 3 ) ),
-			'contentVisibility' => $this->get_schema_content_visibility(),
-			'align'             => $this->get_schema_align(),
-			'alignButtons'      => $this->get_schema_boolean( false ),
-			'orderby'           => $this->get_schema_orderby(),
-			'tags'              => $this->get_schema_list_ids(),
-			'tagOperator'       => array(
-				'type'    => 'string',
-				'default' => 'any',
-			),
-			'isPreview'         => $this->get_schema_boolean( false ),
-			'stockStatus'       => array_keys( wc_get_product_stock_status_options() ),
-		);
-	}
+    /**
+     * Get block attributes.
+     *
+     * @return array
+     */
+    protected function get_block_type_attributes() {
+        return array(
+            'className'         => $this->get_schema_string(),
+            'columns'           => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_columns', 3 ) ),
+            'rows'              => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_rows', 3 ) ),
+            'contentVisibility' => $this->get_schema_content_visibility(),
+            'align'             => $this->get_schema_align(),
+            'alignButtons'      => $this->get_schema_boolean( false ),
+            'orderby'           => $this->get_schema_orderby(),
+            'tags'              => $this->get_schema_list_ids(),
+            'tagOperator'       => array(
+                'type'    => 'string',
+                'default' => 'any',
+            ),
+            'isPreview'         => $this->get_schema_boolean( false ),
+            'stockStatus'       => array_keys( wc_get_product_stock_status_options() ),
+        );
+    }
 
-	/**
-	 * Extra data passed through from server to client for block.
-	 *
-	 * @param array $attributes  Any attributes that currently are available from the block.
-	 *                           Note, this will be empty in the editor context when the block is
-	 *                           not in the post content on editor load.
-	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
+    /**
+     * Extra data passed through from server to client for block.
+     *
+     * @param array $attributes  Any attributes that currently are available from the block.
+     *                           Note, this will be empty in the editor context when the block is
+     *                           not in the post content on editor load.
+     */
+    protected function enqueue_data( array $attributes = [] ) {
+        parent::enqueue_data( $attributes );
 
-		$tag_count = wp_count_terms( 'product_tag' );
+        $tag_count = wp_count_terms( 'product_tag' );
 
-		$this->asset_data_registry->add( 'hasTags', $tag_count > 0, true );
-		$this->asset_data_registry->add( 'limitTags', $tag_count > 100, true );
-	}
+        $this->asset_data_registry->add( 'hasTags', $tag_count > 0, true );
+        $this->asset_data_registry->add( 'limitTags', $tag_count > 100, true );
+    }
 }

Spacing +14 added lines, -14 removed lines

@@ -17,13 +17,13 @@ 
 	 *
 	 * @param array $query_args Query args.
 	 */
-	protected function set_block_query_args( &$query_args ) {
-		if ( ! empty( $this->attributes['tags'] ) ) {
+	protected function set_block_query_args(&$query_args) {
+		if (!empty($this->attributes['tags'])) {
 			$query_args['tax_query'][] = array(
 				'taxonomy' => 'product_tag',
-				'terms'    => array_map( 'absint', $this->attributes['tags'] ),
+				'terms'    => array_map('absint', $this->attributes['tags']),
 				'field'    => 'term_id',
-				'operator' => isset( $this->attributes['tagOperator'] ) && 'any' === $this->attributes['tagOperator'] ? 'IN' : 'AND',
+				'operator' => isset($this->attributes['tagOperator']) && 'any' === $this->attributes['tagOperator'] ? 'IN' : 'AND',
 			);
 		}
 	}
@@ -36,19 +36,19 @@ 
 	protected function get_block_type_attributes() {
 		return array(
 			'className'         => $this->get_schema_string(),
-			'columns'           => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_columns', 3 ) ),
-			'rows'              => $this->get_schema_number( wc_get_theme_support( 'product_blocks::default_rows', 3 ) ),
+			'columns'           => $this->get_schema_number(wc_get_theme_support('product_blocks::default_columns', 3)),
+			'rows'              => $this->get_schema_number(wc_get_theme_support('product_blocks::default_rows', 3)),
 			'contentVisibility' => $this->get_schema_content_visibility(),
 			'align'             => $this->get_schema_align(),
-			'alignButtons'      => $this->get_schema_boolean( false ),
+			'alignButtons'      => $this->get_schema_boolean(false),
 			'orderby'           => $this->get_schema_orderby(),
 			'tags'              => $this->get_schema_list_ids(),
 			'tagOperator'       => array(
 				'type'    => 'string',
 				'default' => 'any',
 			),
-			'isPreview'         => $this->get_schema_boolean( false ),
-			'stockStatus'       => array_keys( wc_get_product_stock_status_options() ),
+			'isPreview'         => $this->get_schema_boolean(false),
+			'stockStatus'       => array_keys(wc_get_product_stock_status_options()),
 		);
 	}
 
@@ -59,12 +59,12 @@ 
 	 *                           Note, this will be empty in the editor context when the block is
 	 *                           not in the post content on editor load.
 	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
+	protected function enqueue_data(array $attributes = []) {
+		parent::enqueue_data($attributes);
 
-		$tag_count = wp_count_terms( 'product_tag' );
+		$tag_count = wp_count_terms('product_tag');
 
-		$this->asset_data_registry->add( 'hasTags', $tag_count > 0, true );
-		$this->asset_data_registry->add( 'limitTags', $tag_count > 100, true );
+		$this->asset_data_registry->add('hasTags', $tag_count > 0, true);
+		$this->asset_data_registry->add('limitTags', $tag_count > 100, true);
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/PriceFilter.php

Indentation +6 added lines, -6 removed lines

@@ -6,10 +6,10 @@
  */
 class PriceFilter extends AbstractBlock {
 
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'price-filter';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'price-filter';
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/Checkout.php

Indentation +382 added lines, -382 removed lines

@@ -7,100 +7,100 @@ 
  * @internal
  */
 class Checkout extends AbstractBlock {
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'checkout';
-
-	/**
-	 * Chunks build folder.
-	 *
-	 * @var string
-	 */
-	protected $chunks_folder = 'checkout-blocks';
-
-	/**
-	 * Get the editor script handle for this block type.
-	 *
-	 * @param string $key Data to get, or default to everything.
-	 * @return array|string;
-	 */
-	protected function get_block_type_editor_script( $key = null ) {
-		$script = [
-			'handle'       => 'wc-' . $this->block_name . '-block',
-			'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name ),
-			'dependencies' => [ 'wc-blocks' ],
-		];
-		return $key ? $script[ $key ] : $script;
-	}
-
-	/**
-	 * Get the frontend script handle for this block type.
-	 *
-	 * @see $this->register_block_type()
-	 * @param string $key Data to get, or default to everything.
-	 * @return array|string
-	 */
-	protected function get_block_type_script( $key = null ) {
-		$script = [
-			'handle'       => 'wc-' . $this->block_name . '-block-frontend',
-			'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name . '-frontend' ),
-			'dependencies' => [],
-		];
-		return $key ? $script[ $key ] : $script;
-	}
-
-	/**
-	 * Enqueue frontend assets for this block, just in time for rendering.
-	 *
-	 * @param array $attributes  Any attributes that currently are available from the block.
-	 */
-	protected function enqueue_assets( array $attributes ) {
-		/**
-		 * Fires before checkout block scripts are enqueued.
-		 */
-		do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_before' );
-		parent::enqueue_assets( $attributes );
-		/**
-		 * Fires after checkout block scripts are enqueued.
-		 */
-		do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_after' );
-	}
-
-	/**
-	 * Append frontend scripts when rendering the block.
-	 *
-	 * @param array  $attributes Block attributes.
-	 * @param string $content    Block content.
-	 * @return string Rendered block type output.
-	 */
-	protected function render( $attributes, $content ) {
-		if ( $this->is_checkout_endpoint() ) {
-			// Note: Currently the block only takes care of the main checkout form -- if an endpoint is set, refer to the
-			// legacy shortcode instead and do not render block.
-			return '[woocommerce_checkout]';
-		}
-
-		// Deregister core checkout scripts and styles.
-		wp_dequeue_script( 'wc-checkout' );
-		wp_dequeue_script( 'wc-password-strength-meter' );
-		wp_dequeue_script( 'selectWoo' );
-		wp_dequeue_style( 'select2' );
-
-		/**
-		 * We need to check if $content has any templates from prior iterations of the block, in order to update to the latest iteration.
-		 * We test the iteration version by searching for new blocks brought in by it.
-		 * The blocks used for testing should be always available in the block (not removable by the user).
-		 * Checkout i1's content was returning an empty div, with no data-block-name attribute
-		 */
-		$regex_for_empty_block = '/<div class="[a-zA-Z0-9_\- ]*wp-block-woocommerce-checkout[a-zA-Z0-9_\- ]*"><\/div>/mi';
-		$has_i1_template       = preg_match( $regex_for_empty_block, $content );
-
-		if ( $has_i1_template ) {
-			// This fallback needs to match the default templates defined in our Blocks.
-			$inner_blocks_html = '
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'checkout';
+
+    /**
+     * Chunks build folder.
+     *
+     * @var string
+     */
+    protected $chunks_folder = 'checkout-blocks';
+
+    /**
+     * Get the editor script handle for this block type.
+     *
+     * @param string $key Data to get, or default to everything.
+     * @return array|string;
+     */
+    protected function get_block_type_editor_script( $key = null ) {
+        $script = [
+            'handle'       => 'wc-' . $this->block_name . '-block',
+            'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name ),
+            'dependencies' => [ 'wc-blocks' ],
+        ];
+        return $key ? $script[ $key ] : $script;
+    }
+
+    /**
+     * Get the frontend script handle for this block type.
+     *
+     * @see $this->register_block_type()
+     * @param string $key Data to get, or default to everything.
+     * @return array|string
+     */
+    protected function get_block_type_script( $key = null ) {
+        $script = [
+            'handle'       => 'wc-' . $this->block_name . '-block-frontend',
+            'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name . '-frontend' ),
+            'dependencies' => [],
+        ];
+        return $key ? $script[ $key ] : $script;
+    }
+
+    /**
+     * Enqueue frontend assets for this block, just in time for rendering.
+     *
+     * @param array $attributes  Any attributes that currently are available from the block.
+     */
+    protected function enqueue_assets( array $attributes ) {
+        /**
+         * Fires before checkout block scripts are enqueued.
+         */
+        do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_before' );
+        parent::enqueue_assets( $attributes );
+        /**
+         * Fires after checkout block scripts are enqueued.
+         */
+        do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_after' );
+    }
+
+    /**
+     * Append frontend scripts when rendering the block.
+     *
+     * @param array  $attributes Block attributes.
+     * @param string $content    Block content.
+     * @return string Rendered block type output.
+     */
+    protected function render( $attributes, $content ) {
+        if ( $this->is_checkout_endpoint() ) {
+            // Note: Currently the block only takes care of the main checkout form -- if an endpoint is set, refer to the
+            // legacy shortcode instead and do not render block.
+            return '[woocommerce_checkout]';
+        }
+
+        // Deregister core checkout scripts and styles.
+        wp_dequeue_script( 'wc-checkout' );
+        wp_dequeue_script( 'wc-password-strength-meter' );
+        wp_dequeue_script( 'selectWoo' );
+        wp_dequeue_style( 'select2' );
+
+        /**
+         * We need to check if $content has any templates from prior iterations of the block, in order to update to the latest iteration.
+         * We test the iteration version by searching for new blocks brought in by it.
+         * The blocks used for testing should be always available in the block (not removable by the user).
+         * Checkout i1's content was returning an empty div, with no data-block-name attribute
+         */
+        $regex_for_empty_block = '/<div class="[a-zA-Z0-9_\- ]*wp-block-woocommerce-checkout[a-zA-Z0-9_\- ]*"><\/div>/mi';
+        $has_i1_template       = preg_match( $regex_for_empty_block, $content );
+
+        if ( $has_i1_template ) {
+            // This fallback needs to match the default templates defined in our Blocks.
+            $inner_blocks_html = '
 				<div data-block-name="woocommerce/checkout-fields-block" class="wp-block-woocommerce-checkout-fields-block">
 					<div data-block-name="woocommerce/checkout-express-payment-block" class="wp-block-woocommerce-checkout-express-payment-block"></div>
 					<div data-block-name="woocommerce/checkout-contact-information-block" class="wp-block-woocommerce-checkout-contact-information-block"></div>
@@ -108,24 +108,24 @@ 
 					<div data-block-name="woocommerce/checkout-billing-address-block" class="wp-block-woocommerce-checkout-billing-address-block"></div>
 					<div data-block-name="woocommerce/checkout-shipping-methods-block" class="wp-block-woocommerce-checkout-shipping-methods-block"></div>
 					<div data-block-name="woocommerce/checkout-payment-block" class="wp-block-woocommerce-checkout-payment-block"></div>' .
-					( isset( $attributes['showOrderNotes'] ) && false === $attributes['showOrderNotes'] ? '' : '<div data-block-name="woocommerce/checkout-order-note-block" class="wp-block-woocommerce-checkout-order-note-block"></div>' ) .
-					( isset( $attributes['showPolicyLinks'] ) && false === $attributes['showPolicyLinks'] ? '' : '<div data-block-name="woocommerce/checkout-terms-block" class="wp-block-woocommerce-checkout-terms-block"></div>' ) .
-					'<div data-block-name="woocommerce/checkout-actions-block" class="wp-block-woocommerce-checkout-actions-block"></div>
+                    ( isset( $attributes['showOrderNotes'] ) && false === $attributes['showOrderNotes'] ? '' : '<div data-block-name="woocommerce/checkout-order-note-block" class="wp-block-woocommerce-checkout-order-note-block"></div>' ) .
+                    ( isset( $attributes['showPolicyLinks'] ) && false === $attributes['showPolicyLinks'] ? '' : '<div data-block-name="woocommerce/checkout-terms-block" class="wp-block-woocommerce-checkout-terms-block"></div>' ) .
+                    '<div data-block-name="woocommerce/checkout-actions-block" class="wp-block-woocommerce-checkout-actions-block"></div>
 				</div>
 				<div data-block-name="woocommerce/checkout-totals-block" class="wp-block-woocommerce-checkout-totals-block">
 					<div data-block-name="woocommerce/checkout-order-summary-block" class="wp-block-woocommerce-checkout-order-summary-block"></div>
 				</div>
 			';
 
-			$content = str_replace( '</div>', $inner_blocks_html . '</div>', $content );
-		}
+            $content = str_replace( '</div>', $inner_blocks_html . '</div>', $content );
+        }
 
-		/**
-		 * Checkout i3 added inner blocks for Order summary.
-		 * We need to add them to Checkout i2 templates.
-		 * The order needs to match the order in which these blocks were registered.
-		 */
-		$order_summary_with_inner_blocks = '$0
+        /**
+         * Checkout i3 added inner blocks for Order summary.
+         * We need to add them to Checkout i2 templates.
+         * The order needs to match the order in which these blocks were registered.
+         */
+        $order_summary_with_inner_blocks = '$0
 			<div data-block-name="woocommerce/checkout-order-summary-cart-items-block" class="wp-block-woocommerce-checkout-order-summary-cart-items-block"></div>
 			<div data-block-name="woocommerce/checkout-order-summary-subtotal-block" class="wp-block-woocommerce-checkout-order-summary-subtotal-block"></div>
 			<div data-block-name="woocommerce/checkout-order-summary-fee-block" class="wp-block-woocommerce-checkout-order-summary-fee-block"></div>
@@ -134,281 +134,281 @@ 
 			<div data-block-name="woocommerce/checkout-order-summary-shipping-block" class="wp-block-woocommerce-checkout-order-summary-shipping-block"></div>
 			<div data-block-name="woocommerce/checkout-order-summary-taxes-block" class="wp-block-woocommerce-checkout-order-summary-taxes-block"></div>
 		';
-		// Order summary subtotal block was added in i3, so we search for it to see if we have a Checkout i2 template.
-		$regex_for_order_summary_subtotal = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-subtotal-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
-		$regex_for_order_summary          = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
-		$has_i2_template                  = ! preg_match( $regex_for_order_summary_subtotal, $content );
-
-		if ( $has_i2_template ) {
-			$content = preg_replace( $regex_for_order_summary, $order_summary_with_inner_blocks, $content );
-		}
-
-		return $content;
-	}
-
-	/**
-	 * Check if we're viewing a checkout page endpoint, rather than the main checkout page itself.
-	 *
-	 * @return boolean
-	 */
-	protected function is_checkout_endpoint() {
-		return is_wc_endpoint_url( 'order-pay' ) || is_wc_endpoint_url( 'order-received' );
-	}
-
-	/**
-	 * Extra data passed through from server to client for block.
-	 *
-	 * @param array $attributes  Any attributes that currently are available from the block.
-	 *                           Note, this will be empty in the editor context when the block is
-	 *                           not in the post content on editor load.
-	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
-
-		$this->asset_data_registry->add(
-			'allowedCountries',
-			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_allowed_countries() );
-			},
-			true
-		);
-		$this->asset_data_registry->add(
-			'allowedStates',
-			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_allowed_country_states() );
-			},
-			true
-		);
-		$this->asset_data_registry->add(
-			'shippingCountries',
-			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_shipping_countries() );
-			},
-			true
-		);
-		$this->asset_data_registry->add(
-			'shippingStates',
-			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_shipping_country_states() );
-			},
-			true
-		);
-		$this->asset_data_registry->add(
-			'countryLocale',
-			function() {
-				// Merge country and state data to work around https://github.com/woocommerce/woocommerce/issues/28944.
-				$country_locale = wc()->countries->get_country_locale();
-				$states         = wc()->countries->get_states();
-
-				foreach ( $states as $country => $states ) {
-					if ( empty( $states ) ) {
-						$country_locale[ $country ]['state']['required'] = false;
-						$country_locale[ $country ]['state']['hidden']   = true;
-					}
-				}
-				return $country_locale;
-			},
-			true
-		);
-		$this->asset_data_registry->add( 'baseLocation', wc_get_base_location(), true );
-		$this->asset_data_registry->add(
-			'checkoutAllowsGuest',
-			false === filter_var(
-				wc()->checkout()->is_registration_required(),
-				FILTER_VALIDATE_BOOLEAN
-			),
-			true
-		);
-		$this->asset_data_registry->add(
-			'checkoutAllowsSignup',
-			filter_var(
-				wc()->checkout()->is_registration_enabled(),
-				FILTER_VALIDATE_BOOLEAN
-			),
-			true
-		);
-		$this->asset_data_registry->add( 'checkoutShowLoginReminder', filter_var( get_option( 'woocommerce_enable_checkout_login_reminder' ), FILTER_VALIDATE_BOOLEAN ), true );
-		$this->asset_data_registry->add( 'displayCartPricesIncludingTax', 'incl' === get_option( 'woocommerce_tax_display_cart' ), true );
-		$this->asset_data_registry->add( 'displayItemizedTaxes', 'itemized' === get_option( 'woocommerce_tax_total_display' ), true );
-		$this->asset_data_registry->add( 'taxesEnabled', wc_tax_enabled(), true );
-		$this->asset_data_registry->add( 'couponsEnabled', wc_coupons_enabled(), true );
-		$this->asset_data_registry->add( 'shippingEnabled', wc_shipping_enabled(), true );
-		$this->asset_data_registry->add( 'hasDarkEditorStyleSupport', current_theme_supports( 'dark-editor-style' ), true );
-		$this->asset_data_registry->register_page_id( isset( $attributes['cartPageId'] ) ? $attributes['cartPageId'] : 0 );
-
-		$is_block_editor = $this->is_block_editor();
-
-		// Hydrate the following data depending on admin or frontend context.
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'shippingMethodsExist' ) ) {
-			$methods_exist = wc_get_shipping_method_count( false, true ) > 0;
-			$this->asset_data_registry->add( 'shippingMethodsExist', $methods_exist );
-		}
-
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalShippingMethods' ) ) {
-			$shipping_methods           = WC()->shipping()->get_shipping_methods();
-			$formatted_shipping_methods = array_reduce(
-				$shipping_methods,
-				function( $acc, $method ) {
-					if ( $method->supports( 'settings' ) ) {
-						$acc[] = [
-							'id'          => $method->id,
-							'title'       => $method->method_title,
-							'description' => $method->method_description,
-						];
-					}
-					return $acc;
-				},
-				[]
-			);
-			$this->asset_data_registry->add( 'globalShippingMethods', $formatted_shipping_methods );
-		}
-
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'activeShippingZones' ) && class_exists( '\WC_Shipping_Zones' ) ) {
-			$shipping_zones             = \WC_Shipping_Zones::get_zones();
-			$formatted_shipping_zones   = array_reduce(
-				$shipping_zones,
-				function( $acc, $zone ) {
-					$acc[] = [
-						'id'          => $zone['id'],
-						'title'       => $zone['zone_name'],
-						'description' => $zone['formatted_zone_location'],
-					];
-					return $acc;
-				},
-				[]
-			);
-			$formatted_shipping_zones[] = [
-				'id'          => 0,
-				'title'       => __( 'International', 'woocommerce' ),
-				'description' => __( 'Locations outside all other zones', 'woocommerce' ),
-			];
-			$this->asset_data_registry->add( 'activeShippingZones', $formatted_shipping_zones );
-		}
-
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalPaymentMethods' ) ) {
-			$payment_methods           = WC()->payment_gateways->payment_gateways();
-			$formatted_payment_methods = array_reduce(
-				$payment_methods,
-				function( $acc, $method ) {
-					if ( 'yes' === $method->enabled ) {
-						$acc[] = [
-							'id'          => $method->id,
-							'title'       => $method->method_title,
-							'description' => $method->method_description,
-						];
-					}
-					return $acc;
-				},
-				[]
-			);
-			$this->asset_data_registry->add( 'globalPaymentMethods', $formatted_payment_methods );
-		}
-
-		if ( ! is_admin() && ! WC()->is_rest_api_request() ) {
-			$this->hydrate_from_api();
-			$this->hydrate_customer_payment_methods();
-		}
-
-		/**
-		 * Fires after checkout block data is registered.
-		 */
-		do_action( 'woocommerce_blocks_checkout_enqueue_data' );
-	}
-
-	/**
-	 * Are we currently on the admin block editor screen?
-	 */
-	protected function is_block_editor() {
-		if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
-			return false;
-		}
-		$screen = get_current_screen();
-
-		return $screen && $screen->is_block_editor();
-	}
-
-	/**
-	 * Removes accents from an array of values, sorts by the values, then returns the original array values sorted.
-	 *
-	 * @param array $array Array of values to sort.
-	 * @return array Sorted array.
-	 */
-	protected function deep_sort_with_accents( $array ) {
-		if ( ! is_array( $array ) || empty( $array ) ) {
-			return $array;
-		}
-
-		if ( is_array( reset( $array ) ) ) {
-			return array_map( [ $this, 'deep_sort_with_accents' ], $array );
-		}
-
-		$array_without_accents = array_map( 'remove_accents', array_map( 'wc_strtolower', array_map( 'html_entity_decode', $array ) ) );
-		asort( $array_without_accents );
-		return array_replace( $array_without_accents, $array );
-	}
-
-	/**
-	 * Get customer payment methods for use in checkout.
-	 */
-	protected function hydrate_customer_payment_methods() {
-		if ( ! is_user_logged_in() || $this->asset_data_registry->exists( 'customerPaymentMethods' ) ) {
-			return;
-		}
-		add_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
-		$this->asset_data_registry->add(
-			'customerPaymentMethods',
-			wc_get_customer_saved_methods_list( get_current_user_id() )
-		);
-		remove_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
-	}
-
-	/**
-	 * Hydrate the checkout block with data from the API.
-	 */
-	protected function hydrate_from_api() {
-		$this->asset_data_registry->hydrate_api_request( '/wc/store/v1/cart' );
-
-		// Print existing notices now, otherwise they are caught by the Cart
-		// Controller and converted to exceptions.
-		wc_print_notices();
-		add_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
-
-		$rest_preload_api_requests = rest_preload_api_request( [], '/wc/store/v1/checkout' );
-		$this->asset_data_registry->add( 'checkoutData', $rest_preload_api_requests['/wc/store/v1/checkout']['body'] ?? [] );
-
-		remove_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
-	}
-
-	/**
-	 * Callback for woocommerce_payment_methods_list_item filter to add token id
-	 * to the generated list.
-	 *
-	 * @param array     $list_item The current list item for the saved payment method.
-	 * @param \WC_Token $token     The token for the current list item.
-	 *
-	 * @return array The list item with the token id added.
-	 */
-	public static function include_token_id_with_payment_methods( $list_item, $token ) {
-		$list_item['tokenId'] = $token->get_id();
-		$brand                = ! empty( $list_item['method']['brand'] ) ?
-			strtolower( $list_item['method']['brand'] ) :
-			'';
-		// phpcs:ignore WordPress.WP.I18n.TextDomainMismatch -- need to match on translated value from core.
-		if ( ! empty( $brand ) && esc_html__( 'Credit card', 'woocommerce' ) !== $brand ) {
-			$list_item['method']['brand'] = wc_get_credit_card_type_label( $brand );
-		}
-		return $list_item;
-	}
-	/**
-	 * Register script and style assets for the block type before it is registered.
-	 *
-	 * This registers the scripts; it does not enqueue them.
-	 */
-	protected function register_block_type_assets() {
-		parent::register_block_type_assets();
-		$chunks        = $this->get_chunks_paths( $this->chunks_folder );
-		$vendor_chunks = $this->get_chunks_paths( 'vendors--cart-blocks' );
-		$shared_chunks = [ 'cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping-frontend' ];
-		$this->register_chunk_translations( array_merge( $chunks, $vendor_chunks, $shared_chunks ) );
-	}
+        // Order summary subtotal block was added in i3, so we search for it to see if we have a Checkout i2 template.
+        $regex_for_order_summary_subtotal = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-subtotal-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
+        $regex_for_order_summary          = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
+        $has_i2_template                  = ! preg_match( $regex_for_order_summary_subtotal, $content );
+
+        if ( $has_i2_template ) {
+            $content = preg_replace( $regex_for_order_summary, $order_summary_with_inner_blocks, $content );
+        }
+
+        return $content;
+    }
+
+    /**
+     * Check if we're viewing a checkout page endpoint, rather than the main checkout page itself.
+     *
+     * @return boolean
+     */
+    protected function is_checkout_endpoint() {
+        return is_wc_endpoint_url( 'order-pay' ) || is_wc_endpoint_url( 'order-received' );
+    }
+
+    /**
+     * Extra data passed through from server to client for block.
+     *
+     * @param array $attributes  Any attributes that currently are available from the block.
+     *                           Note, this will be empty in the editor context when the block is
+     *                           not in the post content on editor load.
+     */
+    protected function enqueue_data( array $attributes = [] ) {
+        parent::enqueue_data( $attributes );
+
+        $this->asset_data_registry->add(
+            'allowedCountries',
+            function() {
+                return $this->deep_sort_with_accents( WC()->countries->get_allowed_countries() );
+            },
+            true
+        );
+        $this->asset_data_registry->add(
+            'allowedStates',
+            function() {
+                return $this->deep_sort_with_accents( WC()->countries->get_allowed_country_states() );
+            },
+            true
+        );
+        $this->asset_data_registry->add(
+            'shippingCountries',
+            function() {
+                return $this->deep_sort_with_accents( WC()->countries->get_shipping_countries() );
+            },
+            true
+        );
+        $this->asset_data_registry->add(
+            'shippingStates',
+            function() {
+                return $this->deep_sort_with_accents( WC()->countries->get_shipping_country_states() );
+            },
+            true
+        );
+        $this->asset_data_registry->add(
+            'countryLocale',
+            function() {
+                // Merge country and state data to work around https://github.com/woocommerce/woocommerce/issues/28944.
+                $country_locale = wc()->countries->get_country_locale();
+                $states         = wc()->countries->get_states();
+
+                foreach ( $states as $country => $states ) {
+                    if ( empty( $states ) ) {
+                        $country_locale[ $country ]['state']['required'] = false;
+                        $country_locale[ $country ]['state']['hidden']   = true;
+                    }
+                }
+                return $country_locale;
+            },
+            true
+        );
+        $this->asset_data_registry->add( 'baseLocation', wc_get_base_location(), true );
+        $this->asset_data_registry->add(
+            'checkoutAllowsGuest',
+            false === filter_var(
+                wc()->checkout()->is_registration_required(),
+                FILTER_VALIDATE_BOOLEAN
+            ),
+            true
+        );
+        $this->asset_data_registry->add(
+            'checkoutAllowsSignup',
+            filter_var(
+                wc()->checkout()->is_registration_enabled(),
+                FILTER_VALIDATE_BOOLEAN
+            ),
+            true
+        );
+        $this->asset_data_registry->add( 'checkoutShowLoginReminder', filter_var( get_option( 'woocommerce_enable_checkout_login_reminder' ), FILTER_VALIDATE_BOOLEAN ), true );
+        $this->asset_data_registry->add( 'displayCartPricesIncludingTax', 'incl' === get_option( 'woocommerce_tax_display_cart' ), true );
+        $this->asset_data_registry->add( 'displayItemizedTaxes', 'itemized' === get_option( 'woocommerce_tax_total_display' ), true );
+        $this->asset_data_registry->add( 'taxesEnabled', wc_tax_enabled(), true );
+        $this->asset_data_registry->add( 'couponsEnabled', wc_coupons_enabled(), true );
+        $this->asset_data_registry->add( 'shippingEnabled', wc_shipping_enabled(), true );
+        $this->asset_data_registry->add( 'hasDarkEditorStyleSupport', current_theme_supports( 'dark-editor-style' ), true );
+        $this->asset_data_registry->register_page_id( isset( $attributes['cartPageId'] ) ? $attributes['cartPageId'] : 0 );
+
+        $is_block_editor = $this->is_block_editor();
+
+        // Hydrate the following data depending on admin or frontend context.
+        if ( $is_block_editor && ! $this->asset_data_registry->exists( 'shippingMethodsExist' ) ) {
+            $methods_exist = wc_get_shipping_method_count( false, true ) > 0;
+            $this->asset_data_registry->add( 'shippingMethodsExist', $methods_exist );
+        }
+
+        if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalShippingMethods' ) ) {
+            $shipping_methods           = WC()->shipping()->get_shipping_methods();
+            $formatted_shipping_methods = array_reduce(
+                $shipping_methods,
+                function( $acc, $method ) {
+                    if ( $method->supports( 'settings' ) ) {
+                        $acc[] = [
+                            'id'          => $method->id,
+                            'title'       => $method->method_title,
+                            'description' => $method->method_description,
+                        ];
+                    }
+                    return $acc;
+                },
+                []
+            );
+            $this->asset_data_registry->add( 'globalShippingMethods', $formatted_shipping_methods );
+        }
+
+        if ( $is_block_editor && ! $this->asset_data_registry->exists( 'activeShippingZones' ) && class_exists( '\WC_Shipping_Zones' ) ) {
+            $shipping_zones             = \WC_Shipping_Zones::get_zones();
+            $formatted_shipping_zones   = array_reduce(
+                $shipping_zones,
+                function( $acc, $zone ) {
+                    $acc[] = [
+                        'id'          => $zone['id'],
+                        'title'       => $zone['zone_name'],
+                        'description' => $zone['formatted_zone_location'],
+                    ];
+                    return $acc;
+                },
+                []
+            );
+            $formatted_shipping_zones[] = [
+                'id'          => 0,
+                'title'       => __( 'International', 'woocommerce' ),
+                'description' => __( 'Locations outside all other zones', 'woocommerce' ),
+            ];
+            $this->asset_data_registry->add( 'activeShippingZones', $formatted_shipping_zones );
+        }
+
+        if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalPaymentMethods' ) ) {
+            $payment_methods           = WC()->payment_gateways->payment_gateways();
+            $formatted_payment_methods = array_reduce(
+                $payment_methods,
+                function( $acc, $method ) {
+                    if ( 'yes' === $method->enabled ) {
+                        $acc[] = [
+                            'id'          => $method->id,
+                            'title'       => $method->method_title,
+                            'description' => $method->method_description,
+                        ];
+                    }
+                    return $acc;
+                },
+                []
+            );
+            $this->asset_data_registry->add( 'globalPaymentMethods', $formatted_payment_methods );
+        }
+
+        if ( ! is_admin() && ! WC()->is_rest_api_request() ) {
+            $this->hydrate_from_api();
+            $this->hydrate_customer_payment_methods();
+        }
+
+        /**
+         * Fires after checkout block data is registered.
+         */
+        do_action( 'woocommerce_blocks_checkout_enqueue_data' );
+    }
+
+    /**
+     * Are we currently on the admin block editor screen?
+     */
+    protected function is_block_editor() {
+        if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
+            return false;
+        }
+        $screen = get_current_screen();
+
+        return $screen && $screen->is_block_editor();
+    }
+
+    /**
+     * Removes accents from an array of values, sorts by the values, then returns the original array values sorted.
+     *
+     * @param array $array Array of values to sort.
+     * @return array Sorted array.
+     */
+    protected function deep_sort_with_accents( $array ) {
+        if ( ! is_array( $array ) || empty( $array ) ) {
+            return $array;
+        }
+
+        if ( is_array( reset( $array ) ) ) {
+            return array_map( [ $this, 'deep_sort_with_accents' ], $array );
+        }
+
+        $array_without_accents = array_map( 'remove_accents', array_map( 'wc_strtolower', array_map( 'html_entity_decode', $array ) ) );
+        asort( $array_without_accents );
+        return array_replace( $array_without_accents, $array );
+    }
+
+    /**
+     * Get customer payment methods for use in checkout.
+     */
+    protected function hydrate_customer_payment_methods() {
+        if ( ! is_user_logged_in() || $this->asset_data_registry->exists( 'customerPaymentMethods' ) ) {
+            return;
+        }
+        add_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
+        $this->asset_data_registry->add(
+            'customerPaymentMethods',
+            wc_get_customer_saved_methods_list( get_current_user_id() )
+        );
+        remove_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
+    }
+
+    /**
+     * Hydrate the checkout block with data from the API.
+     */
+    protected function hydrate_from_api() {
+        $this->asset_data_registry->hydrate_api_request( '/wc/store/v1/cart' );
+
+        // Print existing notices now, otherwise they are caught by the Cart
+        // Controller and converted to exceptions.
+        wc_print_notices();
+        add_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
+
+        $rest_preload_api_requests = rest_preload_api_request( [], '/wc/store/v1/checkout' );
+        $this->asset_data_registry->add( 'checkoutData', $rest_preload_api_requests['/wc/store/v1/checkout']['body'] ?? [] );
+
+        remove_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
+    }
+
+    /**
+     * Callback for woocommerce_payment_methods_list_item filter to add token id
+     * to the generated list.
+     *
+     * @param array     $list_item The current list item for the saved payment method.
+     * @param \WC_Token $token     The token for the current list item.
+     *
+     * @return array The list item with the token id added.
+     */
+    public static function include_token_id_with_payment_methods( $list_item, $token ) {
+        $list_item['tokenId'] = $token->get_id();
+        $brand                = ! empty( $list_item['method']['brand'] ) ?
+            strtolower( $list_item['method']['brand'] ) :
+            '';
+        // phpcs:ignore WordPress.WP.I18n.TextDomainMismatch -- need to match on translated value from core.
+        if ( ! empty( $brand ) && esc_html__( 'Credit card', 'woocommerce' ) !== $brand ) {
+            $list_item['method']['brand'] = wc_get_credit_card_type_label( $brand );
+        }
+        return $list_item;
+    }
+    /**
+     * Register script and style assets for the block type before it is registered.
+     *
+     * This registers the scripts; it does not enqueue them.
+     */
+    protected function register_block_type_assets() {
+        parent::register_block_type_assets();
+        $chunks        = $this->get_chunks_paths( $this->chunks_folder );
+        $vendor_chunks = $this->get_chunks_paths( 'vendors--cart-blocks' );
+        $shared_chunks = [ 'cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping-frontend' ];
+        $this->register_chunk_translations( array_merge( $chunks, $vendor_chunks, $shared_chunks ) );
+    }
 }

Spacing +89 added lines, -90 removed lines

@@ -27,13 +27,13 @@ 
 	 * @param string $key Data to get, or default to everything.
 	 * @return array|string;
 	 */
-	protected function get_block_type_editor_script( $key = null ) {
+	protected function get_block_type_editor_script($key = null) {
 		$script = [
 			'handle'       => 'wc-' . $this->block_name . '-block',
-			'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name ),
-			'dependencies' => [ 'wc-blocks' ],
+			'path'         => $this->asset_api->get_block_asset_build_path($this->block_name),
+			'dependencies' => ['wc-blocks'],
 		];
-		return $key ? $script[ $key ] : $script;
+		return $key ? $script[$key] : $script;
 	}
 
 	/**
@@ -43,13 +43,13 @@ 
 	 * @param string $key Data to get, or default to everything.
 	 * @return array|string
 	 */
-	protected function get_block_type_script( $key = null ) {
+	protected function get_block_type_script($key = null) {
 		$script = [
 			'handle'       => 'wc-' . $this->block_name . '-block-frontend',
-			'path'         => $this->asset_api->get_block_asset_build_path( $this->block_name . '-frontend' ),
+			'path'         => $this->asset_api->get_block_asset_build_path($this->block_name . '-frontend'),
 			'dependencies' => [],
 		];
-		return $key ? $script[ $key ] : $script;
+		return $key ? $script[$key] : $script;
 	}
 
 	/**
@@ -57,16 +57,16 @@ 
 	 *
 	 * @param array $attributes  Any attributes that currently are available from the block.
 	 */
-	protected function enqueue_assets( array $attributes ) {
+	protected function enqueue_assets(array $attributes) {
 		/**
 		 * Fires before checkout block scripts are enqueued.
 		 */
-		do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_before' );
-		parent::enqueue_assets( $attributes );
+		do_action('woocommerce_blocks_enqueue_checkout_block_scripts_before');
+		parent::enqueue_assets($attributes);
 		/**
 		 * Fires after checkout block scripts are enqueued.
 		 */
-		do_action( 'woocommerce_blocks_enqueue_checkout_block_scripts_after' );
+		do_action('woocommerce_blocks_enqueue_checkout_block_scripts_after');
 	}
 
 	/**
@@ -76,18 +76,18 @@ 
 	 * @param string $content    Block content.
 	 * @return string Rendered block type output.
 	 */
-	protected function render( $attributes, $content ) {
-		if ( $this->is_checkout_endpoint() ) {
+	protected function render($attributes, $content) {
+		if ($this->is_checkout_endpoint()) {
 			// Note: Currently the block only takes care of the main checkout form -- if an endpoint is set, refer to the
 			// legacy shortcode instead and do not render block.
 			return '[woocommerce_checkout]';
 		}
 
 		// Deregister core checkout scripts and styles.
-		wp_dequeue_script( 'wc-checkout' );
-		wp_dequeue_script( 'wc-password-strength-meter' );
-		wp_dequeue_script( 'selectWoo' );
-		wp_dequeue_style( 'select2' );
+		wp_dequeue_script('wc-checkout');
+		wp_dequeue_script('wc-password-strength-meter');
+		wp_dequeue_script('selectWoo');
+		wp_dequeue_style('select2');
 
 		/**
 		 * We need to check if $content has any templates from prior iterations of the block, in order to update to the latest iteration.
@@ -96,9 +96,9 @@ 
 		 * Checkout i1's content was returning an empty div, with no data-block-name attribute
 		 */
 		$regex_for_empty_block = '/<div class="[a-zA-Z0-9_\- ]*wp-block-woocommerce-checkout[a-zA-Z0-9_\- ]*"><\/div>/mi';
-		$has_i1_template       = preg_match( $regex_for_empty_block, $content );
+		$has_i1_template       = preg_match($regex_for_empty_block, $content);
 
-		if ( $has_i1_template ) {
+		if ($has_i1_template) {
 			// This fallback needs to match the default templates defined in our Blocks.
 			$inner_blocks_html = '
 				<div data-block-name="woocommerce/checkout-fields-block" class="wp-block-woocommerce-checkout-fields-block">
@@ -108,8 +108,8 @@ 
 					<div data-block-name="woocommerce/checkout-billing-address-block" class="wp-block-woocommerce-checkout-billing-address-block"></div>
 					<div data-block-name="woocommerce/checkout-shipping-methods-block" class="wp-block-woocommerce-checkout-shipping-methods-block"></div>
 					<div data-block-name="woocommerce/checkout-payment-block" class="wp-block-woocommerce-checkout-payment-block"></div>' .
-					( isset( $attributes['showOrderNotes'] ) && false === $attributes['showOrderNotes'] ? '' : '<div data-block-name="woocommerce/checkout-order-note-block" class="wp-block-woocommerce-checkout-order-note-block"></div>' ) .
-					( isset( $attributes['showPolicyLinks'] ) && false === $attributes['showPolicyLinks'] ? '' : '<div data-block-name="woocommerce/checkout-terms-block" class="wp-block-woocommerce-checkout-terms-block"></div>' ) .
+					(isset($attributes['showOrderNotes']) && false === $attributes['showOrderNotes'] ? '' : '<div data-block-name="woocommerce/checkout-order-note-block" class="wp-block-woocommerce-checkout-order-note-block"></div>') .
+					(isset($attributes['showPolicyLinks']) && false === $attributes['showPolicyLinks'] ? '' : '<div data-block-name="woocommerce/checkout-terms-block" class="wp-block-woocommerce-checkout-terms-block"></div>') .
 					'<div data-block-name="woocommerce/checkout-actions-block" class="wp-block-woocommerce-checkout-actions-block"></div>
 				</div>
 				<div data-block-name="woocommerce/checkout-totals-block" class="wp-block-woocommerce-checkout-totals-block">
@@ -117,7 +117,7 @@ 
 				</div>
 			';
 
-			$content = str_replace( '</div>', $inner_blocks_html . '</div>', $content );
+			$content = str_replace('</div>', $inner_blocks_html . '</div>', $content);
 		}
 
 		/**
@@ -137,10 +137,10 @@ 
 		// Order summary subtotal block was added in i3, so we search for it to see if we have a Checkout i2 template.
 		$regex_for_order_summary_subtotal = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-subtotal-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
 		$regex_for_order_summary          = '/<div[\n\r\s\ta-zA-Z0-9_\-=\'"]*data-block-name="woocommerce\/checkout-order-summary-block"[\n\r\s\ta-zA-Z0-9_\-=\'"]*>/mi';
-		$has_i2_template                  = ! preg_match( $regex_for_order_summary_subtotal, $content );
+		$has_i2_template                  = !preg_match($regex_for_order_summary_subtotal, $content);
 
-		if ( $has_i2_template ) {
-			$content = preg_replace( $regex_for_order_summary, $order_summary_with_inner_blocks, $content );
+		if ($has_i2_template) {
+			$content = preg_replace($regex_for_order_summary, $order_summary_with_inner_blocks, $content);
 		}
 
 		return $content;
@@ -152,7 +152,7 @@ 
 	 * @return boolean
 	 */
 	protected function is_checkout_endpoint() {
-		return is_wc_endpoint_url( 'order-pay' ) || is_wc_endpoint_url( 'order-received' );
+		return is_wc_endpoint_url('order-pay') || is_wc_endpoint_url('order-received');
 	}
 
 	/**
@@ -162,34 +162,34 @@ 
 	 *                           Note, this will be empty in the editor context when the block is
 	 *                           not in the post content on editor load.
 	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
+	protected function enqueue_data(array $attributes = []) {
+		parent::enqueue_data($attributes);
 
 		$this->asset_data_registry->add(
 			'allowedCountries',
 			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_allowed_countries() );
+				return $this->deep_sort_with_accents(WC()->countries->get_allowed_countries());
 			},
 			true
 		);
 		$this->asset_data_registry->add(
 			'allowedStates',
 			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_allowed_country_states() );
+				return $this->deep_sort_with_accents(WC()->countries->get_allowed_country_states());
 			},
 			true
 		);
 		$this->asset_data_registry->add(
 			'shippingCountries',
 			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_shipping_countries() );
+				return $this->deep_sort_with_accents(WC()->countries->get_shipping_countries());
 			},
 			true
 		);
 		$this->asset_data_registry->add(
 			'shippingStates',
 			function() {
-				return $this->deep_sort_with_accents( WC()->countries->get_shipping_country_states() );
+				return $this->deep_sort_with_accents(WC()->countries->get_shipping_country_states());
 			},
 			true
 		);
@@ -200,17 +200,17 @@ 
 				$country_locale = wc()->countries->get_country_locale();
 				$states         = wc()->countries->get_states();
 
-				foreach ( $states as $country => $states ) {
-					if ( empty( $states ) ) {
-						$country_locale[ $country ]['state']['required'] = false;
-						$country_locale[ $country ]['state']['hidden']   = true;
+				foreach ($states as $country => $states) {
+					if (empty($states)) {
+						$country_locale[$country]['state']['required'] = false;
+						$country_locale[$country]['state']['hidden']   = true;
 					}
 				}
 				return $country_locale;
 			},
 			true
 		);
-		$this->asset_data_registry->add( 'baseLocation', wc_get_base_location(), true );
+		$this->asset_data_registry->add('baseLocation', wc_get_base_location(), true);
 		$this->asset_data_registry->add(
 			'checkoutAllowsGuest',
 			false === filter_var(
@@ -227,29 +227,29 @@ 
 			),
 			true
 		);
-		$this->asset_data_registry->add( 'checkoutShowLoginReminder', filter_var( get_option( 'woocommerce_enable_checkout_login_reminder' ), FILTER_VALIDATE_BOOLEAN ), true );
-		$this->asset_data_registry->add( 'displayCartPricesIncludingTax', 'incl' === get_option( 'woocommerce_tax_display_cart' ), true );
-		$this->asset_data_registry->add( 'displayItemizedTaxes', 'itemized' === get_option( 'woocommerce_tax_total_display' ), true );
-		$this->asset_data_registry->add( 'taxesEnabled', wc_tax_enabled(), true );
-		$this->asset_data_registry->add( 'couponsEnabled', wc_coupons_enabled(), true );
-		$this->asset_data_registry->add( 'shippingEnabled', wc_shipping_enabled(), true );
-		$this->asset_data_registry->add( 'hasDarkEditorStyleSupport', current_theme_supports( 'dark-editor-style' ), true );
-		$this->asset_data_registry->register_page_id( isset( $attributes['cartPageId'] ) ? $attributes['cartPageId'] : 0 );
+		$this->asset_data_registry->add('checkoutShowLoginReminder', filter_var(get_option('woocommerce_enable_checkout_login_reminder'), FILTER_VALIDATE_BOOLEAN), true);
+		$this->asset_data_registry->add('displayCartPricesIncludingTax', 'incl' === get_option('woocommerce_tax_display_cart'), true);
+		$this->asset_data_registry->add('displayItemizedTaxes', 'itemized' === get_option('woocommerce_tax_total_display'), true);
+		$this->asset_data_registry->add('taxesEnabled', wc_tax_enabled(), true);
+		$this->asset_data_registry->add('couponsEnabled', wc_coupons_enabled(), true);
+		$this->asset_data_registry->add('shippingEnabled', wc_shipping_enabled(), true);
+		$this->asset_data_registry->add('hasDarkEditorStyleSupport', current_theme_supports('dark-editor-style'), true);
+		$this->asset_data_registry->register_page_id(isset($attributes['cartPageId']) ? $attributes['cartPageId'] : 0);
 
 		$is_block_editor = $this->is_block_editor();
 
 		// Hydrate the following data depending on admin or frontend context.
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'shippingMethodsExist' ) ) {
-			$methods_exist = wc_get_shipping_method_count( false, true ) > 0;
-			$this->asset_data_registry->add( 'shippingMethodsExist', $methods_exist );
+		if ($is_block_editor && !$this->asset_data_registry->exists('shippingMethodsExist')) {
+			$methods_exist = wc_get_shipping_method_count(false, true) > 0;
+			$this->asset_data_registry->add('shippingMethodsExist', $methods_exist);
 		}
 
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalShippingMethods' ) ) {
+		if ($is_block_editor && !$this->asset_data_registry->exists('globalShippingMethods')) {
 			$shipping_methods           = WC()->shipping()->get_shipping_methods();
 			$formatted_shipping_methods = array_reduce(
 				$shipping_methods,
-				function( $acc, $method ) {
-					if ( $method->supports( 'settings' ) ) {
+				function($acc, $method) {
+					if ($method->supports('settings')) {
 						$acc[] = [
 							'id'          => $method->id,
 							'title'       => $method->method_title,
@@ -260,14 +260,14 @@ 
 				},
 				[]
 			);
-			$this->asset_data_registry->add( 'globalShippingMethods', $formatted_shipping_methods );
+			$this->asset_data_registry->add('globalShippingMethods', $formatted_shipping_methods);
 		}
 
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'activeShippingZones' ) && class_exists( '\WC_Shipping_Zones' ) ) {
+		if ($is_block_editor && !$this->asset_data_registry->exists('activeShippingZones') && class_exists('\WC_Shipping_Zones')) {
 			$shipping_zones             = \WC_Shipping_Zones::get_zones();
 			$formatted_shipping_zones   = array_reduce(
 				$shipping_zones,
-				function( $acc, $zone ) {
+				function($acc, $zone) {
 					$acc[] = [
 						'id'          => $zone['id'],
 						'title'       => $zone['zone_name'],
@@ -279,18 +279,18 @@ 
 			);
 			$formatted_shipping_zones[] = [
 				'id'          => 0,
-				'title'       => __( 'International', 'woocommerce' ),
-				'description' => __( 'Locations outside all other zones', 'woocommerce' ),
+				'title'       => __('International', 'woocommerce'),
+				'description' => __('Locations outside all other zones', 'woocommerce'),
 			];
-			$this->asset_data_registry->add( 'activeShippingZones', $formatted_shipping_zones );
+			$this->asset_data_registry->add('activeShippingZones', $formatted_shipping_zones);
 		}
 
-		if ( $is_block_editor && ! $this->asset_data_registry->exists( 'globalPaymentMethods' ) ) {
+		if ($is_block_editor && !$this->asset_data_registry->exists('globalPaymentMethods')) {
 			$payment_methods           = WC()->payment_gateways->payment_gateways();
 			$formatted_payment_methods = array_reduce(
 				$payment_methods,
-				function( $acc, $method ) {
-					if ( 'yes' === $method->enabled ) {
+				function($acc, $method) {
+					if ('yes' === $method->enabled) {
 						$acc[] = [
 							'id'          => $method->id,
 							'title'       => $method->method_title,
@@ -301,10 +301,10 @@ 
 				},
 				[]
 			);
-			$this->asset_data_registry->add( 'globalPaymentMethods', $formatted_payment_methods );
+			$this->asset_data_registry->add('globalPaymentMethods', $formatted_payment_methods);
 		}
 
-		if ( ! is_admin() && ! WC()->is_rest_api_request() ) {
+		if (!is_admin() && !WC()->is_rest_api_request()) {
 			$this->hydrate_from_api();
 			$this->hydrate_customer_payment_methods();
 		}
@@ -312,14 +312,14 @@ 
 		/**
 		 * Fires after checkout block data is registered.
 		 */
-		do_action( 'woocommerce_blocks_checkout_enqueue_data' );
+		do_action('woocommerce_blocks_checkout_enqueue_data');
 	}
 
 	/**
 	 * Are we currently on the admin block editor screen?
 	 */
 	protected function is_block_editor() {
-		if ( ! is_admin() || ! function_exists( 'get_current_screen' ) ) {
+		if (!is_admin() || !function_exists('get_current_screen')) {
 			return false;
 		}
 		$screen = get_current_screen();
@@ -333,50 +333,50 @@ 
 	 * @param array $array Array of values to sort.
 	 * @return array Sorted array.
 	 */
-	protected function deep_sort_with_accents( $array ) {
-		if ( ! is_array( $array ) || empty( $array ) ) {
+	protected function deep_sort_with_accents($array) {
+		if (!is_array($array) || empty($array)) {
 			return $array;
 		}
 
-		if ( is_array( reset( $array ) ) ) {
-			return array_map( [ $this, 'deep_sort_with_accents' ], $array );
+		if (is_array(reset($array))) {
+			return array_map([$this, 'deep_sort_with_accents'], $array);
 		}
 
-		$array_without_accents = array_map( 'remove_accents', array_map( 'wc_strtolower', array_map( 'html_entity_decode', $array ) ) );
-		asort( $array_without_accents );
-		return array_replace( $array_without_accents, $array );
+		$array_without_accents = array_map('remove_accents', array_map('wc_strtolower', array_map('html_entity_decode', $array)));
+		asort($array_without_accents);
+		return array_replace($array_without_accents, $array);
 	}
 
 	/**
 	 * Get customer payment methods for use in checkout.
 	 */
 	protected function hydrate_customer_payment_methods() {
-		if ( ! is_user_logged_in() || $this->asset_data_registry->exists( 'customerPaymentMethods' ) ) {
+		if (!is_user_logged_in() || $this->asset_data_registry->exists('customerPaymentMethods')) {
 			return;
 		}
-		add_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
+		add_filter('woocommerce_payment_methods_list_item', [$this, 'include_token_id_with_payment_methods'], 10, 2);
 		$this->asset_data_registry->add(
 			'customerPaymentMethods',
-			wc_get_customer_saved_methods_list( get_current_user_id() )
+			wc_get_customer_saved_methods_list(get_current_user_id())
 		);
-		remove_filter( 'woocommerce_payment_methods_list_item', [ $this, 'include_token_id_with_payment_methods' ], 10, 2 );
+		remove_filter('woocommerce_payment_methods_list_item', [$this, 'include_token_id_with_payment_methods'], 10, 2);
 	}
 
 	/**
 	 * Hydrate the checkout block with data from the API.
 	 */
 	protected function hydrate_from_api() {
-		$this->asset_data_registry->hydrate_api_request( '/wc/store/v1/cart' );
+		$this->asset_data_registry->hydrate_api_request('/wc/store/v1/cart');
 
 		// Print existing notices now, otherwise they are caught by the Cart
 		// Controller and converted to exceptions.
 		wc_print_notices();
-		add_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
+		add_filter('woocommerce_store_api_disable_nonce_check', '__return_true');
 
-		$rest_preload_api_requests = rest_preload_api_request( [], '/wc/store/v1/checkout' );
-		$this->asset_data_registry->add( 'checkoutData', $rest_preload_api_requests['/wc/store/v1/checkout']['body'] ?? [] );
+		$rest_preload_api_requests = rest_preload_api_request([], '/wc/store/v1/checkout');
+		$this->asset_data_registry->add('checkoutData', $rest_preload_api_requests['/wc/store/v1/checkout']['body'] ?? []);
 
-		remove_filter( 'woocommerce_store_api_disable_nonce_check', '__return_true' );
+		remove_filter('woocommerce_store_api_disable_nonce_check', '__return_true');
 	}
 
 	/**
@@ -388,14 +388,13 @@ 
 	 *
 	 * @return array The list item with the token id added.
 	 */
-	public static function include_token_id_with_payment_methods( $list_item, $token ) {
+	public static function include_token_id_with_payment_methods($list_item, $token) {
 		$list_item['tokenId'] = $token->get_id();
-		$brand                = ! empty( $list_item['method']['brand'] ) ?
-			strtolower( $list_item['method']['brand'] ) :
-			'';
+		$brand                = !empty($list_item['method']['brand']) ?
+			strtolower($list_item['method']['brand']) : '';
 		// phpcs:ignore WordPress.WP.I18n.TextDomainMismatch -- need to match on translated value from core.
-		if ( ! empty( $brand ) && esc_html__( 'Credit card', 'woocommerce' ) !== $brand ) {
-			$list_item['method']['brand'] = wc_get_credit_card_type_label( $brand );
+		if (!empty($brand) && esc_html__('Credit card', 'woocommerce') !== $brand) {
+			$list_item['method']['brand'] = wc_get_credit_card_type_label($brand);
 		}
 		return $list_item;
 	}
@@ -406,9 +405,9 @@ 
 	 */
 	protected function register_block_type_assets() {
 		parent::register_block_type_assets();
-		$chunks        = $this->get_chunks_paths( $this->chunks_folder );
-		$vendor_chunks = $this->get_chunks_paths( 'vendors--cart-blocks' );
-		$shared_chunks = [ 'cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping-frontend' ];
-		$this->register_chunk_translations( array_merge( $chunks, $vendor_chunks, $shared_chunks ) );
+		$chunks        = $this->get_chunks_paths($this->chunks_folder);
+		$vendor_chunks = $this->get_chunks_paths('vendors--cart-blocks');
+		$shared_chunks = ['cart-blocks/order-summary-shipping--checkout-blocks/order-summary-shipping-frontend'];
+		$this->register_chunk_translations(array_merge($chunks, $vendor_chunks, $shared_chunks));
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/AtomicBlock.php

Indentation +34 added lines, -34 removed lines

@@ -7,41 +7,41 @@
  * @internal
  */
 class AtomicBlock extends AbstractBlock {
-	/**
-	 * Get the editor script data for this block type.
-	 *
-	 * @param string $key Data to get, or default to everything.
-	 * @return null
-	 */
-	protected function get_block_type_editor_script( $key = null ) {
-		return null;
-	}
+    /**
+     * Get the editor script data for this block type.
+     *
+     * @param string $key Data to get, or default to everything.
+     * @return null
+     */
+    protected function get_block_type_editor_script( $key = null ) {
+        return null;
+    }
 
-	/**
-	 * Get the editor style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_editor_style() {
-		return null;
-	}
+    /**
+     * Get the editor style handle for this block type.
+     *
+     * @return null
+     */
+    protected function get_block_type_editor_style() {
+        return null;
+    }
 
-	/**
-	 * Get the frontend script handle for this block type.
-	 *
-	 * @param string $key Data to get, or default to everything.
-	 * @return null
-	 */
-	protected function get_block_type_script( $key = null ) {
-		return null;
-	}
+    /**
+     * Get the frontend script handle for this block type.
+     *
+     * @param string $key Data to get, or default to everything.
+     * @return null
+     */
+    protected function get_block_type_script( $key = null ) {
+        return null;
+    }
 
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
+    /**
+     * Get the frontend style handle for this block type.
+     *
+     * @return null
+     */
+    protected function get_block_type_style() {
+        return null;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 	 * @param string $key Data to get, or default to everything.
 	 * @return null
 	 */
-	protected function get_block_type_editor_script( $key = null ) {
+	protected function get_block_type_editor_script($key = null) {
 		return null;
 	}
 
@@ -32,7 +32,7 @@ 
 	 * @param string $key Data to get, or default to everything.
 	 * @return null
 	 */
-	protected function get_block_type_script( $key = null ) {
+	protected function get_block_type_script($key = null) {
 		return null;
 	}
 

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/ProductCategories.php

Indentation +330 added lines, -330 removed lines

@@ -9,215 +9,215 @@ 
 class ProductCategories extends AbstractDynamicBlock {
 
 
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'product-categories';
-
-	/**
-	 * Default attribute values, should match what's set in JS `registerBlockType`.
-	 *
-	 * @var array
-	 */
-	protected $defaults = array(
-		'hasCount'       => true,
-		'hasImage'       => false,
-		'hasEmpty'       => false,
-		'isDropdown'     => false,
-		'isHierarchical' => true,
-	);
-
-	/**
-	 * Get block attributes.
-	 *
-	 * @return array
-	 */
-	protected function get_block_type_attributes() {
-		return array_merge(
-			parent::get_block_type_attributes(),
-			array(
-				'align'          => $this->get_schema_align(),
-				'className'      => $this->get_schema_string(),
-				'hasCount'       => $this->get_schema_boolean( true ),
-				'hasImage'       => $this->get_schema_boolean( false ),
-				'hasEmpty'       => $this->get_schema_boolean( false ),
-				'isDropdown'     => $this->get_schema_boolean( false ),
-				'isHierarchical' => $this->get_schema_boolean( true ),
-				'textColor'      => $this->get_schema_string(),
-				'fontSize'       => $this->get_schema_string(),
-				'lineHeight'     => $this->get_schema_string(),
-				'style'          => array( 'type' => 'object' ),
-			)
-		);
-	}
-
-	/**
-	 * Render the Product Categories List block.
-	 *
-	 * @param array  $attributes Block attributes.
-	 * @param string $content    Block content.
-	 * @return string Rendered block type output.
-	 */
-	protected function render( $attributes, $content ) {
-		$uid        = uniqid( 'product-categories-' );
-		$categories = $this->get_categories( $attributes );
-
-		if ( empty( $categories ) ) {
-			return '';
-		}
-
-		if ( ! empty( $content ) ) {
-			// Deal with legacy attributes (before this was an SSR block) that differ from defaults.
-			if ( strstr( $content, 'data-has-count="false"' ) ) {
-				$attributes['hasCount'] = false;
-			}
-			if ( strstr( $content, 'data-is-dropdown="true"' ) ) {
-				$attributes['isDropdown'] = true;
-			}
-			if ( strstr( $content, 'data-is-hierarchical="false"' ) ) {
-				$attributes['isHierarchical'] = false;
-			}
-			if ( strstr( $content, 'data-has-empty="true"' ) ) {
-				$attributes['hasEmpty'] = true;
-			}
-		}
-
-		$classes_and_styles = StyleAttributesUtils::get_classes_and_styles_by_attributes(
-			$attributes,
-			array( 'line_height', 'text_color', 'font_size' )
-		);
-
-		$classes = $this->get_container_classes( $attributes ) . ' ' . $classes_and_styles['classes'];
-		$styles  = $classes_and_styles['styles'];
-
-		$output  = '<div class="wp-block-woocommerce-product-categories ' . esc_attr( $classes ) . '" style="' . esc_attr( $styles ) . '">';
-		$output .= ! empty( $attributes['isDropdown'] ) ? $this->renderDropdown( $categories, $attributes, $uid ) : $this->renderList( $categories, $attributes, $uid );
-		$output .= '</div>';
-
-		return $output;
-	}
-
-	/**
-	 * Get the list of classes to apply to this block.
-	 *
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @return string space-separated list of classes.
-	 */
-	protected function get_container_classes( $attributes = array() ) {
-
-		$classes = array( 'wc-block-product-categories' );
-
-		if ( isset( $attributes['align'] ) ) {
-			$classes[] = "align{$attributes['align']}";
-		}
-
-		if ( ! empty( $attributes['className'] ) ) {
-			$classes[] = $attributes['className'];
-		}
-
-		if ( $attributes['isDropdown'] ) {
-			$classes[] = 'is-dropdown';
-		} else {
-			$classes[] = 'is-list';
-		}
-
-		return implode( ' ', $classes );
-	}
-
-	/**
-	 * Get categories (terms) from the db.
-	 *
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @return array
-	 */
-	protected function get_categories( $attributes ) {
-		$hierarchical = wc_string_to_bool( $attributes['isHierarchical'] );
-		$categories   = get_terms(
-			'product_cat',
-			[
-				'hide_empty'   => ! $attributes['hasEmpty'],
-				'pad_counts'   => true,
-				'hierarchical' => true,
-			]
-		);
-
-		if ( ! is_array( $categories ) || empty( $categories ) ) {
-			return [];
-		}
-
-		// This ensures that no categories with a product count of 0 is rendered.
-		if ( ! $attributes['hasEmpty'] ) {
-			$categories = array_filter(
-				$categories,
-				function( $category ) {
-					return 0 !== $category->count;
-				}
-			);
-		}
-
-		return $hierarchical ? $this->build_category_tree( $categories ) : $categories;
-	}
-
-	/**
-	 * Build hierarchical tree of categories.
-	 *
-	 * @param array $categories List of terms.
-	 * @return array
-	 */
-	protected function build_category_tree( $categories ) {
-		$categories_by_parent = [];
-
-		foreach ( $categories as $category ) {
-			if ( ! isset( $categories_by_parent[ 'cat-' . $category->parent ] ) ) {
-				$categories_by_parent[ 'cat-' . $category->parent ] = [];
-			}
-			$categories_by_parent[ 'cat-' . $category->parent ][] = $category;
-		}
-
-		$tree = $categories_by_parent['cat-0'];
-		unset( $categories_by_parent['cat-0'] );
-
-		foreach ( $tree as $category ) {
-			if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
-				$category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
-			}
-		}
-
-		return $tree;
-	}
-
-	/**
-	 * Build hierarchical tree of categories by appending children in the tree.
-	 *
-	 * @param array $categories List of terms.
-	 * @param array $categories_by_parent List of terms grouped by parent.
-	 * @return array
-	 */
-	protected function fill_category_children( $categories, $categories_by_parent ) {
-		foreach ( $categories as $category ) {
-			if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
-				$category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
-			}
-		}
-		return $categories;
-	}
-
-	/**
-	 * Render the category list as a dropdown.
-	 *
-	 * @param array $categories List of terms.
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
-	 * @return string Rendered output.
-	 */
-	protected function renderDropdown( $categories, $attributes, $uid ) {
-		$aria_label = empty( $attributes['hasCount'] ) ?
-			__( 'List of categories', 'woocommerce' ) :
-			__( 'List of categories with their product counts', 'woocommerce' );
-
-		$output = '
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'product-categories';
+
+    /**
+     * Default attribute values, should match what's set in JS `registerBlockType`.
+     *
+     * @var array
+     */
+    protected $defaults = array(
+        'hasCount'       => true,
+        'hasImage'       => false,
+        'hasEmpty'       => false,
+        'isDropdown'     => false,
+        'isHierarchical' => true,
+    );
+
+    /**
+     * Get block attributes.
+     *
+     * @return array
+     */
+    protected function get_block_type_attributes() {
+        return array_merge(
+            parent::get_block_type_attributes(),
+            array(
+                'align'          => $this->get_schema_align(),
+                'className'      => $this->get_schema_string(),
+                'hasCount'       => $this->get_schema_boolean( true ),
+                'hasImage'       => $this->get_schema_boolean( false ),
+                'hasEmpty'       => $this->get_schema_boolean( false ),
+                'isDropdown'     => $this->get_schema_boolean( false ),
+                'isHierarchical' => $this->get_schema_boolean( true ),
+                'textColor'      => $this->get_schema_string(),
+                'fontSize'       => $this->get_schema_string(),
+                'lineHeight'     => $this->get_schema_string(),
+                'style'          => array( 'type' => 'object' ),
+            )
+        );
+    }
+
+    /**
+     * Render the Product Categories List block.
+     *
+     * @param array  $attributes Block attributes.
+     * @param string $content    Block content.
+     * @return string Rendered block type output.
+     */
+    protected function render( $attributes, $content ) {
+        $uid        = uniqid( 'product-categories-' );
+        $categories = $this->get_categories( $attributes );
+
+        if ( empty( $categories ) ) {
+            return '';
+        }
+
+        if ( ! empty( $content ) ) {
+            // Deal with legacy attributes (before this was an SSR block) that differ from defaults.
+            if ( strstr( $content, 'data-has-count="false"' ) ) {
+                $attributes['hasCount'] = false;
+            }
+            if ( strstr( $content, 'data-is-dropdown="true"' ) ) {
+                $attributes['isDropdown'] = true;
+            }
+            if ( strstr( $content, 'data-is-hierarchical="false"' ) ) {
+                $attributes['isHierarchical'] = false;
+            }
+            if ( strstr( $content, 'data-has-empty="true"' ) ) {
+                $attributes['hasEmpty'] = true;
+            }
+        }
+
+        $classes_and_styles = StyleAttributesUtils::get_classes_and_styles_by_attributes(
+            $attributes,
+            array( 'line_height', 'text_color', 'font_size' )
+        );
+
+        $classes = $this->get_container_classes( $attributes ) . ' ' . $classes_and_styles['classes'];
+        $styles  = $classes_and_styles['styles'];
+
+        $output  = '<div class="wp-block-woocommerce-product-categories ' . esc_attr( $classes ) . '" style="' . esc_attr( $styles ) . '">';
+        $output .= ! empty( $attributes['isDropdown'] ) ? $this->renderDropdown( $categories, $attributes, $uid ) : $this->renderList( $categories, $attributes, $uid );
+        $output .= '</div>';
+
+        return $output;
+    }
+
+    /**
+     * Get the list of classes to apply to this block.
+     *
+     * @param array $attributes Block attributes. Default empty array.
+     * @return string space-separated list of classes.
+     */
+    protected function get_container_classes( $attributes = array() ) {
+
+        $classes = array( 'wc-block-product-categories' );
+
+        if ( isset( $attributes['align'] ) ) {
+            $classes[] = "align{$attributes['align']}";
+        }
+
+        if ( ! empty( $attributes['className'] ) ) {
+            $classes[] = $attributes['className'];
+        }
+
+        if ( $attributes['isDropdown'] ) {
+            $classes[] = 'is-dropdown';
+        } else {
+            $classes[] = 'is-list';
+        }
+
+        return implode( ' ', $classes );
+    }
+
+    /**
+     * Get categories (terms) from the db.
+     *
+     * @param array $attributes Block attributes. Default empty array.
+     * @return array
+     */
+    protected function get_categories( $attributes ) {
+        $hierarchical = wc_string_to_bool( $attributes['isHierarchical'] );
+        $categories   = get_terms(
+            'product_cat',
+            [
+                'hide_empty'   => ! $attributes['hasEmpty'],
+                'pad_counts'   => true,
+                'hierarchical' => true,
+            ]
+        );
+
+        if ( ! is_array( $categories ) || empty( $categories ) ) {
+            return [];
+        }
+
+        // This ensures that no categories with a product count of 0 is rendered.
+        if ( ! $attributes['hasEmpty'] ) {
+            $categories = array_filter(
+                $categories,
+                function( $category ) {
+                    return 0 !== $category->count;
+                }
+            );
+        }
+
+        return $hierarchical ? $this->build_category_tree( $categories ) : $categories;
+    }
+
+    /**
+     * Build hierarchical tree of categories.
+     *
+     * @param array $categories List of terms.
+     * @return array
+     */
+    protected function build_category_tree( $categories ) {
+        $categories_by_parent = [];
+
+        foreach ( $categories as $category ) {
+            if ( ! isset( $categories_by_parent[ 'cat-' . $category->parent ] ) ) {
+                $categories_by_parent[ 'cat-' . $category->parent ] = [];
+            }
+            $categories_by_parent[ 'cat-' . $category->parent ][] = $category;
+        }
+
+        $tree = $categories_by_parent['cat-0'];
+        unset( $categories_by_parent['cat-0'] );
+
+        foreach ( $tree as $category ) {
+            if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
+                $category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
+            }
+        }
+
+        return $tree;
+    }
+
+    /**
+     * Build hierarchical tree of categories by appending children in the tree.
+     *
+     * @param array $categories List of terms.
+     * @param array $categories_by_parent List of terms grouped by parent.
+     * @return array
+     */
+    protected function fill_category_children( $categories, $categories_by_parent ) {
+        foreach ( $categories as $category ) {
+            if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
+                $category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
+            }
+        }
+        return $categories;
+    }
+
+    /**
+     * Render the category list as a dropdown.
+     *
+     * @param array $categories List of terms.
+     * @param array $attributes Block attributes. Default empty array.
+     * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
+     * @return string Rendered output.
+     */
+    protected function renderDropdown( $categories, $attributes, $uid ) {
+        $aria_label = empty( $attributes['hasCount'] ) ?
+            __( 'List of categories', 'woocommerce' ) :
+            __( 'List of categories with their product counts', 'woocommerce' );
+
+        $output = '
 			<div class="wc-block-product-categories__dropdown">
 				<label
 				class="screen-reader-text"
@@ -252,23 +252,23 @@ 
 				</svg>
 			</button>
 		';
-		return $output;
-	}
-
-	/**
-	 * Render dropdown options list.
-	 *
-	 * @param array $categories List of terms.
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
-	 * @param int   $depth Current depth.
-	 * @return string Rendered output.
-	 */
-	protected function renderDropdownOptions( $categories, $attributes, $uid, $depth = 0 ) {
-		$output = '';
-
-		foreach ( $categories as $category ) {
-			$output .= '
+        return $output;
+    }
+
+    /**
+     * Render dropdown options list.
+     *
+     * @param array $categories List of terms.
+     * @param array $attributes Block attributes. Default empty array.
+     * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
+     * @param int   $depth Current depth.
+     * @return string Rendered output.
+     */
+    protected function renderDropdownOptions( $categories, $attributes, $uid, $depth = 0 ) {
+        $output = '';
+
+        foreach ( $categories as $category ) {
+            $output .= '
 				<option value="' . esc_attr( get_term_link( $category->term_id, 'product_cat' ) ) . '">
 					' . str_repeat( '&minus;', $depth ) . '
 					' . esc_html( $category->name ) . '
@@ -276,112 +276,112 @@ 
 				</option>
 				' . ( ! empty( $category->children ) ? $this->renderDropdownOptions( $category->children, $attributes, $uid, $depth + 1 ) : '' ) . '
 			';
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Render the category list as a list.
-	 *
-	 * @param array $categories List of terms.
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
-	 * @param int   $depth Current depth.
-	 * @return string Rendered output.
-	 */
-	protected function renderList( $categories, $attributes, $uid, $depth = 0 ) {
-		$classes = [
-			'wc-block-product-categories-list',
-			'wc-block-product-categories-list--depth-' . absint( $depth ),
-		];
-		if ( ! empty( $attributes['hasImage'] ) ) {
-			$classes[] = 'wc-block-product-categories-list--has-images';
-		}
-		$output = '<ul class="' . esc_attr( implode( ' ', $classes ) ) . '">' . $this->renderListItems( $categories, $attributes, $uid, $depth ) . '</ul>';
-
-		return $output;
-	}
-
-	/**
-	 * Render a list of terms.
-	 *
-	 * @param array $categories List of terms.
-	 * @param array $attributes Block attributes. Default empty array.
-	 * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
-	 * @param int   $depth Current depth.
-	 * @return string Rendered output.
-	 */
-	protected function renderListItems( $categories, $attributes, $uid, $depth = 0 ) {
-		$output = '';
-
-		$link_color_class_and_style = StyleAttributesUtils::get_link_color_class_and_style( $attributes );
-
-		$link_color_style = isset( $link_color_class_and_style['style'] ) ? $link_color_class_and_style['style'] : '';
-
-		foreach ( $categories as $category ) {
-			$output .= '
+        }
+
+        return $output;
+    }
+
+    /**
+     * Render the category list as a list.
+     *
+     * @param array $categories List of terms.
+     * @param array $attributes Block attributes. Default empty array.
+     * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
+     * @param int   $depth Current depth.
+     * @return string Rendered output.
+     */
+    protected function renderList( $categories, $attributes, $uid, $depth = 0 ) {
+        $classes = [
+            'wc-block-product-categories-list',
+            'wc-block-product-categories-list--depth-' . absint( $depth ),
+        ];
+        if ( ! empty( $attributes['hasImage'] ) ) {
+            $classes[] = 'wc-block-product-categories-list--has-images';
+        }
+        $output = '<ul class="' . esc_attr( implode( ' ', $classes ) ) . '">' . $this->renderListItems( $categories, $attributes, $uid, $depth ) . '</ul>';
+
+        return $output;
+    }
+
+    /**
+     * Render a list of terms.
+     *
+     * @param array $categories List of terms.
+     * @param array $attributes Block attributes. Default empty array.
+     * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
+     * @param int   $depth Current depth.
+     * @return string Rendered output.
+     */
+    protected function renderListItems( $categories, $attributes, $uid, $depth = 0 ) {
+        $output = '';
+
+        $link_color_class_and_style = StyleAttributesUtils::get_link_color_class_and_style( $attributes );
+
+        $link_color_style = isset( $link_color_class_and_style['style'] ) ? $link_color_class_and_style['style'] : '';
+
+        foreach ( $categories as $category ) {
+            $output .= '
 				<li class="wc-block-product-categories-list-item">
 					<a style="' . esc_attr( $link_color_style ) . '" href="' . esc_attr( get_term_link( $category->term_id, 'product_cat' ) ) . '">'
-						. $this->get_image_html( $category, $attributes )
-						. '<span class="wc-block-product-categories-list-item__name">' . esc_html( $category->name ) . '</span>'
-					. '</a>'
-					. $this->getCount( $category, $attributes )
-					. ( ! empty( $category->children ) ? $this->renderList( $category->children, $attributes, $uid, $depth + 1 ) : '' ) . '
+                        . $this->get_image_html( $category, $attributes )
+                        . '<span class="wc-block-product-categories-list-item__name">' . esc_html( $category->name ) . '</span>'
+                    . '</a>'
+                    . $this->getCount( $category, $attributes )
+                    . ( ! empty( $category->children ) ? $this->renderList( $category->children, $attributes, $uid, $depth + 1 ) : '' ) . '
 				</li>
 			';
-		}
-
-		return preg_replace( '/\r|\n/', '', $output );
-	}
-
-	/**
-	 * Returns the category image html
-	 *
-	 * @param \WP_Term $category Term object.
-	 * @param array    $attributes Block attributes. Default empty array.
-	 * @param string   $size Image size, defaults to 'woocommerce_thumbnail'.
-	 * @return string
-	 */
-	public function get_image_html( $category, $attributes, $size = 'woocommerce_thumbnail' ) {
-		if ( empty( $attributes['hasImage'] ) ) {
-			return '';
-		}
-
-		$image_id = get_term_meta( $category->term_id, 'thumbnail_id', true );
-
-		if ( ! $image_id ) {
-			return '<span class="wc-block-product-categories-list-item__image wc-block-product-categories-list-item__image--placeholder">' . wc_placeholder_img( 'woocommerce_thumbnail' ) . '</span>';
-		}
-
-		return '<span class="wc-block-product-categories-list-item__image">' . wp_get_attachment_image( $image_id, 'woocommerce_thumbnail' ) . '</span>';
-	}
-
-	/**
-	 * Get the count, if displaying.
-	 *
-	 * @param object $category Term object.
-	 * @param array  $attributes Block attributes. Default empty array.
-	 * @return string
-	 */
-	protected function getCount( $category, $attributes ) {
-		if ( empty( $attributes['hasCount'] ) ) {
-			return '';
-		}
-
-		if ( $attributes['isDropdown'] ) {
-			return '(' . absint( $category->count ) . ')';
-		}
-
-		$screen_reader_text = sprintf(
-			/* translators: %s number of products in cart. */
-			_n( '%d product', '%d products', absint( $category->count ), 'woocommerce' ),
-			absint( $category->count )
-		);
-
-		return '<span class="wc-block-product-categories-list-item-count">'
-			. '<span aria-hidden="true">' . absint( $category->count ) . '</span>'
-			. '<span class="screen-reader-text">' . esc_html( $screen_reader_text ) . '</span>'
-		. '</span>';
-	}
+        }
+
+        return preg_replace( '/\r|\n/', '', $output );
+    }
+
+    /**
+     * Returns the category image html
+     *
+     * @param \WP_Term $category Term object.
+     * @param array    $attributes Block attributes. Default empty array.
+     * @param string   $size Image size, defaults to 'woocommerce_thumbnail'.
+     * @return string
+     */
+    public function get_image_html( $category, $attributes, $size = 'woocommerce_thumbnail' ) {
+        if ( empty( $attributes['hasImage'] ) ) {
+            return '';
+        }
+
+        $image_id = get_term_meta( $category->term_id, 'thumbnail_id', true );
+
+        if ( ! $image_id ) {
+            return '<span class="wc-block-product-categories-list-item__image wc-block-product-categories-list-item__image--placeholder">' . wc_placeholder_img( 'woocommerce_thumbnail' ) . '</span>';
+        }
+
+        return '<span class="wc-block-product-categories-list-item__image">' . wp_get_attachment_image( $image_id, 'woocommerce_thumbnail' ) . '</span>';
+    }
+
+    /**
+     * Get the count, if displaying.
+     *
+     * @param object $category Term object.
+     * @param array  $attributes Block attributes. Default empty array.
+     * @return string
+     */
+    protected function getCount( $category, $attributes ) {
+        if ( empty( $attributes['hasCount'] ) ) {
+            return '';
+        }
+
+        if ( $attributes['isDropdown'] ) {
+            return '(' . absint( $category->count ) . ')';
+        }
+
+        $screen_reader_text = sprintf(
+            /* translators: %s number of products in cart. */
+            _n( '%d product', '%d products', absint( $category->count ), 'woocommerce' ),
+            absint( $category->count )
+        );
+
+        return '<span class="wc-block-product-categories-list-item-count">'
+            . '<span aria-hidden="true">' . absint( $category->count ) . '</span>'
+            . '<span class="screen-reader-text">' . esc_html( $screen_reader_text ) . '</span>'
+        . '</span>';
+    }
 }

Spacing +90 added lines, -91 removed lines

@@ -40,15 +40,15 @@ 
 			array(
 				'align'          => $this->get_schema_align(),
 				'className'      => $this->get_schema_string(),
-				'hasCount'       => $this->get_schema_boolean( true ),
-				'hasImage'       => $this->get_schema_boolean( false ),
-				'hasEmpty'       => $this->get_schema_boolean( false ),
-				'isDropdown'     => $this->get_schema_boolean( false ),
-				'isHierarchical' => $this->get_schema_boolean( true ),
+				'hasCount'       => $this->get_schema_boolean(true),
+				'hasImage'       => $this->get_schema_boolean(false),
+				'hasEmpty'       => $this->get_schema_boolean(false),
+				'isDropdown'     => $this->get_schema_boolean(false),
+				'isHierarchical' => $this->get_schema_boolean(true),
 				'textColor'      => $this->get_schema_string(),
 				'fontSize'       => $this->get_schema_string(),
 				'lineHeight'     => $this->get_schema_string(),
-				'style'          => array( 'type' => 'object' ),
+				'style'          => array('type' => 'object'),
 			)
 		);
 	}
@@ -60,40 +60,40 @@ 
 	 * @param string $content    Block content.
 	 * @return string Rendered block type output.
 	 */
-	protected function render( $attributes, $content ) {
-		$uid        = uniqid( 'product-categories-' );
-		$categories = $this->get_categories( $attributes );
+	protected function render($attributes, $content) {
+		$uid        = uniqid('product-categories-');
+		$categories = $this->get_categories($attributes);
 
-		if ( empty( $categories ) ) {
+		if (empty($categories)) {
 			return '';
 		}
 
-		if ( ! empty( $content ) ) {
+		if (!empty($content)) {
 			// Deal with legacy attributes (before this was an SSR block) that differ from defaults.
-			if ( strstr( $content, 'data-has-count="false"' ) ) {
+			if (strstr($content, 'data-has-count="false"')) {
 				$attributes['hasCount'] = false;
 			}
-			if ( strstr( $content, 'data-is-dropdown="true"' ) ) {
+			if (strstr($content, 'data-is-dropdown="true"')) {
 				$attributes['isDropdown'] = true;
 			}
-			if ( strstr( $content, 'data-is-hierarchical="false"' ) ) {
+			if (strstr($content, 'data-is-hierarchical="false"')) {
 				$attributes['isHierarchical'] = false;
 			}
-			if ( strstr( $content, 'data-has-empty="true"' ) ) {
+			if (strstr($content, 'data-has-empty="true"')) {
 				$attributes['hasEmpty'] = true;
 			}
 		}
 
 		$classes_and_styles = StyleAttributesUtils::get_classes_and_styles_by_attributes(
 			$attributes,
-			array( 'line_height', 'text_color', 'font_size' )
+			array('line_height', 'text_color', 'font_size')
 		);
 
-		$classes = $this->get_container_classes( $attributes ) . ' ' . $classes_and_styles['classes'];
+		$classes = $this->get_container_classes($attributes) . ' ' . $classes_and_styles['classes'];
 		$styles  = $classes_and_styles['styles'];
 
-		$output  = '<div class="wp-block-woocommerce-product-categories ' . esc_attr( $classes ) . '" style="' . esc_attr( $styles ) . '">';
-		$output .= ! empty( $attributes['isDropdown'] ) ? $this->renderDropdown( $categories, $attributes, $uid ) : $this->renderList( $categories, $attributes, $uid );
+		$output  = '<div class="wp-block-woocommerce-product-categories ' . esc_attr($classes) . '" style="' . esc_attr($styles) . '">';
+		$output .= !empty($attributes['isDropdown']) ? $this->renderDropdown($categories, $attributes, $uid) : $this->renderList($categories, $attributes, $uid);
 		$output .= '</div>';
 
 		return $output;
@@ -105,25 +105,25 @@ 
 	 * @param array $attributes Block attributes. Default empty array.
 	 * @return string space-separated list of classes.
 	 */
-	protected function get_container_classes( $attributes = array() ) {
+	protected function get_container_classes($attributes = array()) {
 
-		$classes = array( 'wc-block-product-categories' );
+		$classes = array('wc-block-product-categories');
 
-		if ( isset( $attributes['align'] ) ) {
+		if (isset($attributes['align'])) {
 			$classes[] = "align{$attributes['align']}";
 		}
 
-		if ( ! empty( $attributes['className'] ) ) {
+		if (!empty($attributes['className'])) {
 			$classes[] = $attributes['className'];
 		}
 
-		if ( $attributes['isDropdown'] ) {
+		if ($attributes['isDropdown']) {
 			$classes[] = 'is-dropdown';
 		} else {
 			$classes[] = 'is-list';
 		}
 
-		return implode( ' ', $classes );
+		return implode(' ', $classes);
 	}
 
 	/**
@@ -132,32 +132,32 @@ 
 	 * @param array $attributes Block attributes. Default empty array.
 	 * @return array
 	 */
-	protected function get_categories( $attributes ) {
-		$hierarchical = wc_string_to_bool( $attributes['isHierarchical'] );
+	protected function get_categories($attributes) {
+		$hierarchical = wc_string_to_bool($attributes['isHierarchical']);
 		$categories   = get_terms(
 			'product_cat',
 			[
-				'hide_empty'   => ! $attributes['hasEmpty'],
+				'hide_empty'   => !$attributes['hasEmpty'],
 				'pad_counts'   => true,
 				'hierarchical' => true,
 			]
 		);
 
-		if ( ! is_array( $categories ) || empty( $categories ) ) {
+		if (!is_array($categories) || empty($categories)) {
 			return [];
 		}
 
 		// This ensures that no categories with a product count of 0 is rendered.
-		if ( ! $attributes['hasEmpty'] ) {
+		if (!$attributes['hasEmpty']) {
 			$categories = array_filter(
 				$categories,
-				function( $category ) {
+				function($category) {
 					return 0 !== $category->count;
 				}
 			);
 		}
 
-		return $hierarchical ? $this->build_category_tree( $categories ) : $categories;
+		return $hierarchical ? $this->build_category_tree($categories) : $categories;
 	}
 
 	/**
@@ -166,22 +166,22 @@ 
 	 * @param array $categories List of terms.
 	 * @return array
 	 */
-	protected function build_category_tree( $categories ) {
+	protected function build_category_tree($categories) {
 		$categories_by_parent = [];
 
-		foreach ( $categories as $category ) {
-			if ( ! isset( $categories_by_parent[ 'cat-' . $category->parent ] ) ) {
-				$categories_by_parent[ 'cat-' . $category->parent ] = [];
+		foreach ($categories as $category) {
+			if (!isset($categories_by_parent['cat-' . $category->parent])) {
+				$categories_by_parent['cat-' . $category->parent] = [];
 			}
-			$categories_by_parent[ 'cat-' . $category->parent ][] = $category;
+			$categories_by_parent['cat-' . $category->parent][] = $category;
 		}
 
 		$tree = $categories_by_parent['cat-0'];
-		unset( $categories_by_parent['cat-0'] );
+		unset($categories_by_parent['cat-0']);
 
-		foreach ( $tree as $category ) {
-			if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
-				$category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
+		foreach ($tree as $category) {
+			if (!empty($categories_by_parent['cat-' . $category->term_id])) {
+				$category->children = $this->fill_category_children($categories_by_parent['cat-' . $category->term_id], $categories_by_parent);
 			}
 		}
 
@@ -195,10 +195,10 @@ 
 	 * @param array $categories_by_parent List of terms grouped by parent.
 	 * @return array
 	 */
-	protected function fill_category_children( $categories, $categories_by_parent ) {
-		foreach ( $categories as $category ) {
-			if ( ! empty( $categories_by_parent[ 'cat-' . $category->term_id ] ) ) {
-				$category->children = $this->fill_category_children( $categories_by_parent[ 'cat-' . $category->term_id ], $categories_by_parent );
+	protected function fill_category_children($categories, $categories_by_parent) {
+		foreach ($categories as $category) {
+			if (!empty($categories_by_parent['cat-' . $category->term_id])) {
+				$category->children = $this->fill_category_children($categories_by_parent['cat-' . $category->term_id], $categories_by_parent);
 			}
 		}
 		return $categories;
@@ -212,31 +212,30 @@ 
 	 * @param int   $uid Unique ID for the rendered block, used for HTML IDs.
 	 * @return string Rendered output.
 	 */
-	protected function renderDropdown( $categories, $attributes, $uid ) {
-		$aria_label = empty( $attributes['hasCount'] ) ?
-			__( 'List of categories', 'woocommerce' ) :
-			__( 'List of categories with their product counts', 'woocommerce' );
+	protected function renderDropdown($categories, $attributes, $uid) {
+		$aria_label = empty($attributes['hasCount']) ?
+			__('List of categories', 'woocommerce') : __('List of categories with their product counts', 'woocommerce');
 
 		$output = '
 			<div class="wc-block-product-categories__dropdown">
 				<label
 				class="screen-reader-text"
-					for="' . esc_attr( $uid ) . '-select"
+					for="' . esc_attr($uid) . '-select"
 				>
-					' . esc_html__( 'Select a category', 'woocommerce' ) . '
+					' . esc_html__('Select a category', 'woocommerce') . '
 				</label>
-				<select aria-label="' . esc_attr( $aria_label ) . '" id="' . esc_attr( $uid ) . '-select">
+				<select aria-label="' . esc_attr($aria_label) . '" id="' . esc_attr($uid) . '-select">
 					<option value="false" hidden>
-						' . esc_html__( 'Select a category', 'woocommerce' ) . '
+						' . esc_html__('Select a category', 'woocommerce') . '
 					</option>
-					' . $this->renderDropdownOptions( $categories, $attributes, $uid ) . '
+					' . $this->renderDropdownOptions($categories, $attributes, $uid) . '
 				</select>
 			</div>
 			<button
 				type="button"
 				class="wc-block-product-categories__button"
-				aria-label="' . esc_html__( 'Go to category', 'woocommerce' ) . '"
-				onclick="const url = document.getElementById( \'' . esc_attr( $uid ) . '-select\' ).value; if ( \'false\' !== url ) document.location.href = url;"
+				aria-label="' . esc_html__('Go to category', 'woocommerce') . '"
+				onclick="const url = document.getElementById( \'' . esc_attr($uid) . '-select\' ).value; if ( \'false\' !== url ) document.location.href = url;"
 			>
 				<svg
 					aria-hidden="true"
@@ -264,17 +263,17 @@ 
 	 * @param int   $depth Current depth.
 	 * @return string Rendered output.
 	 */
-	protected function renderDropdownOptions( $categories, $attributes, $uid, $depth = 0 ) {
+	protected function renderDropdownOptions($categories, $attributes, $uid, $depth = 0) {
 		$output = '';
 
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$output .= '
-				<option value="' . esc_attr( get_term_link( $category->term_id, 'product_cat' ) ) . '">
-					' . str_repeat( '&minus;', $depth ) . '
-					' . esc_html( $category->name ) . '
-					' . $this->getCount( $category, $attributes ) . '
+				<option value="' . esc_attr(get_term_link($category->term_id, 'product_cat')) . '">
+					' . str_repeat('&minus;', $depth) . '
+					' . esc_html($category->name) . '
+					' . $this->getCount($category, $attributes) . '
 				</option>
-				' . ( ! empty( $category->children ) ? $this->renderDropdownOptions( $category->children, $attributes, $uid, $depth + 1 ) : '' ) . '
+				' . (!empty($category->children) ? $this->renderDropdownOptions($category->children, $attributes, $uid, $depth + 1) : '') . '
 			';
 		}
 
@@ -290,15 +289,15 @@ 
 	 * @param int   $depth Current depth.
 	 * @return string Rendered output.
 	 */
-	protected function renderList( $categories, $attributes, $uid, $depth = 0 ) {
+	protected function renderList($categories, $attributes, $uid, $depth = 0) {
 		$classes = [
 			'wc-block-product-categories-list',
-			'wc-block-product-categories-list--depth-' . absint( $depth ),
+			'wc-block-product-categories-list--depth-' . absint($depth),
 		];
-		if ( ! empty( $attributes['hasImage'] ) ) {
+		if (!empty($attributes['hasImage'])) {
 			$classes[] = 'wc-block-product-categories-list--has-images';
 		}
-		$output = '<ul class="' . esc_attr( implode( ' ', $classes ) ) . '">' . $this->renderListItems( $categories, $attributes, $uid, $depth ) . '</ul>';
+		$output = '<ul class="' . esc_attr(implode(' ', $classes)) . '">' . $this->renderListItems($categories, $attributes, $uid, $depth) . '</ul>';
 
 		return $output;
 	}
@@ -312,27 +311,27 @@ 
 	 * @param int   $depth Current depth.
 	 * @return string Rendered output.
 	 */
-	protected function renderListItems( $categories, $attributes, $uid, $depth = 0 ) {
+	protected function renderListItems($categories, $attributes, $uid, $depth = 0) {
 		$output = '';
 
-		$link_color_class_and_style = StyleAttributesUtils::get_link_color_class_and_style( $attributes );
+		$link_color_class_and_style = StyleAttributesUtils::get_link_color_class_and_style($attributes);
 
-		$link_color_style = isset( $link_color_class_and_style['style'] ) ? $link_color_class_and_style['style'] : '';
+		$link_color_style = isset($link_color_class_and_style['style']) ? $link_color_class_and_style['style'] : '';
 
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$output .= '
 				<li class="wc-block-product-categories-list-item">
-					<a style="' . esc_attr( $link_color_style ) . '" href="' . esc_attr( get_term_link( $category->term_id, 'product_cat' ) ) . '">'
-						. $this->get_image_html( $category, $attributes )
-						. '<span class="wc-block-product-categories-list-item__name">' . esc_html( $category->name ) . '</span>'
+					<a style="' . esc_attr($link_color_style) . '" href="' . esc_attr(get_term_link($category->term_id, 'product_cat')) . '">'
+						. $this->get_image_html($category, $attributes)
+						. '<span class="wc-block-product-categories-list-item__name">' . esc_html($category->name) . '</span>'
 					. '</a>'
-					. $this->getCount( $category, $attributes )
-					. ( ! empty( $category->children ) ? $this->renderList( $category->children, $attributes, $uid, $depth + 1 ) : '' ) . '
+					. $this->getCount($category, $attributes)
+					. (!empty($category->children) ? $this->renderList($category->children, $attributes, $uid, $depth + 1) : '') . '
 				</li>
 			';
 		}
 
-		return preg_replace( '/\r|\n/', '', $output );
+		return preg_replace('/\r|\n/', '', $output);
 	}
 
 	/**
@@ -343,18 +342,18 @@ 
 	 * @param string   $size Image size, defaults to 'woocommerce_thumbnail'.
 	 * @return string
 	 */
-	public function get_image_html( $category, $attributes, $size = 'woocommerce_thumbnail' ) {
-		if ( empty( $attributes['hasImage'] ) ) {
+	public function get_image_html($category, $attributes, $size = 'woocommerce_thumbnail') {
+		if (empty($attributes['hasImage'])) {
 			return '';
 		}
 
-		$image_id = get_term_meta( $category->term_id, 'thumbnail_id', true );
+		$image_id = get_term_meta($category->term_id, 'thumbnail_id', true);
 
-		if ( ! $image_id ) {
-			return '<span class="wc-block-product-categories-list-item__image wc-block-product-categories-list-item__image--placeholder">' . wc_placeholder_img( 'woocommerce_thumbnail' ) . '</span>';
+		if (!$image_id) {
+			return '<span class="wc-block-product-categories-list-item__image wc-block-product-categories-list-item__image--placeholder">' . wc_placeholder_img('woocommerce_thumbnail') . '</span>';
 		}
 
-		return '<span class="wc-block-product-categories-list-item__image">' . wp_get_attachment_image( $image_id, 'woocommerce_thumbnail' ) . '</span>';
+		return '<span class="wc-block-product-categories-list-item__image">' . wp_get_attachment_image($image_id, 'woocommerce_thumbnail') . '</span>';
 	}
 
 	/**
@@ -364,24 +363,24 @@ 
 	 * @param array  $attributes Block attributes. Default empty array.
 	 * @return string
 	 */
-	protected function getCount( $category, $attributes ) {
-		if ( empty( $attributes['hasCount'] ) ) {
+	protected function getCount($category, $attributes) {
+		if (empty($attributes['hasCount'])) {
 			return '';
 		}
 
-		if ( $attributes['isDropdown'] ) {
-			return '(' . absint( $category->count ) . ')';
+		if ($attributes['isDropdown']) {
+			return '(' . absint($category->count) . ')';
 		}
 
 		$screen_reader_text = sprintf(
 			/* translators: %s number of products in cart. */
-			_n( '%d product', '%d products', absint( $category->count ), 'woocommerce' ),
-			absint( $category->count )
+			_n('%d product', '%d products', absint($category->count), 'woocommerce'),
+			absint($category->count)
 		);
 
 		return '<span class="wc-block-product-categories-list-item-count">'
-			. '<span aria-hidden="true">' . absint( $category->count ) . '</span>'
-			. '<span class="screen-reader-text">' . esc_html( $screen_reader_text ) . '</span>'
+			. '<span aria-hidden="true">' . absint($category->count) . '</span>'
+			. '<span class="screen-reader-text">' . esc_html($screen_reader_text) . '</span>'
 		. '</span>';
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/AllReviews.php

Indentation +33 added lines, -33 removed lines

@@ -5,39 +5,39 @@
  * AllReviews class.
  */
 class AllReviews extends AbstractBlock {
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'all-reviews';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'all-reviews';
 
-	/**
-	 * Get the frontend script handle for this block type.
-	 *
-	 * @see $this->register_block_type()
-	 * @param string $key Data to get, or default to everything.
-	 * @return array|string
-	 */
-	protected function get_block_type_script( $key = null ) {
-		$script = [
-			'handle'       => 'wc-reviews-block-frontend',
-			'path'         => $this->asset_api->get_block_asset_build_path( 'reviews-frontend' ),
-			'dependencies' => [],
-		];
-		return $key ? $script[ $key ] : $script;
-	}
+    /**
+     * Get the frontend script handle for this block type.
+     *
+     * @see $this->register_block_type()
+     * @param string $key Data to get, or default to everything.
+     * @return array|string
+     */
+    protected function get_block_type_script( $key = null ) {
+        $script = [
+            'handle'       => 'wc-reviews-block-frontend',
+            'path'         => $this->asset_api->get_block_asset_build_path( 'reviews-frontend' ),
+            'dependencies' => [],
+        ];
+        return $key ? $script[ $key ] : $script;
+    }
 
-	/**
-	 * Extra data passed through from server to client for block.
-	 *
-	 * @param array $attributes  Any attributes that currently are available from the block.
-	 *                           Note, this will be empty in the editor context when the block is
-	 *                           not in the post content on editor load.
-	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
-		$this->asset_data_registry->add( 'reviewRatingsEnabled', wc_review_ratings_enabled(), true );
-		$this->asset_data_registry->add( 'showAvatars', '1' === get_option( 'show_avatars' ), true );
-	}
+    /**
+     * Extra data passed through from server to client for block.
+     *
+     * @param array $attributes  Any attributes that currently are available from the block.
+     *                           Note, this will be empty in the editor context when the block is
+     *                           not in the post content on editor load.
+     */
+    protected function enqueue_data( array $attributes = [] ) {
+        parent::enqueue_data( $attributes );
+        $this->asset_data_registry->add( 'reviewRatingsEnabled', wc_review_ratings_enabled(), true );
+        $this->asset_data_registry->add( 'showAvatars', '1' === get_option( 'show_avatars' ), true );
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -19,13 +19,13 @@ 
 	 * @param string $key Data to get, or default to everything.
 	 * @return array|string
 	 */
-	protected function get_block_type_script( $key = null ) {
+	protected function get_block_type_script($key = null) {
 		$script = [
 			'handle'       => 'wc-reviews-block-frontend',
-			'path'         => $this->asset_api->get_block_asset_build_path( 'reviews-frontend' ),
+			'path'         => $this->asset_api->get_block_asset_build_path('reviews-frontend'),
 			'dependencies' => [],
 		];
-		return $key ? $script[ $key ] : $script;
+		return $key ? $script[$key] : $script;
 	}
 
 	/**
@@ -35,9 +35,9 @@ 
 	 *                           Note, this will be empty in the editor context when the block is
 	 *                           not in the post content on editor load.
 	 */
-	protected function enqueue_data( array $attributes = [] ) {
-		parent::enqueue_data( $attributes );
-		$this->asset_data_registry->add( 'reviewRatingsEnabled', wc_review_ratings_enabled(), true );
-		$this->asset_data_registry->add( 'showAvatars', '1' === get_option( 'show_avatars' ), true );
+	protected function enqueue_data(array $attributes = []) {
+		parent::enqueue_data($attributes);
+		$this->asset_data_registry->add('reviewRatingsEnabled', wc_review_ratings_enabled(), true);
+		$this->asset_data_registry->add('showAvatars', '1' === get_option('show_avatars'), true);
 	}
 }

plugins/woocommerce/packages/woocommerce-blocks/src/BlockTypes/ProductOnSale.php

Indentation +28 added lines, -28 removed lines

@@ -6,33 +6,33 @@
  */
 class ProductOnSale extends AbstractProductGrid {
 
-	/**
-	 * Block name.
-	 *
-	 * @var string
-	 */
-	protected $block_name = 'product-on-sale';
+    /**
+     * Block name.
+     *
+     * @var string
+     */
+    protected $block_name = 'product-on-sale';
 
-	/**
-	 * Set args specific to this block
-	 *
-	 * @param array $query_args Query args.
-	 */
-	protected function set_block_query_args( &$query_args ) {
-		$query_args['post__in'] = array_merge( array( 0 ), wc_get_product_ids_on_sale() );
-	}
-	/**
-	 * Get block attributes.
-	 *
-	 * @return array
-	 */
-	protected function get_block_type_attributes() {
-		return array_merge(
-			parent::get_block_type_attributes(),
-			array(
-				'className' => $this->get_schema_string(),
-				'orderby'   => $this->get_schema_orderby(),
-			)
-		);
-	}
+    /**
+     * Set args specific to this block
+     *
+     * @param array $query_args Query args.
+     */
+    protected function set_block_query_args( &$query_args ) {
+        $query_args['post__in'] = array_merge( array( 0 ), wc_get_product_ids_on_sale() );
+    }
+    /**
+     * Get block attributes.
+     *
+     * @return array
+     */
+    protected function get_block_type_attributes() {
+        return array_merge(
+            parent::get_block_type_attributes(),
+            array(
+                'className' => $this->get_schema_string(),
+                'orderby'   => $this->get_schema_orderby(),
+            )
+        );
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -18,8 +18,8 @@
 	 *
 	 * @param array $query_args Query args.
 	 */
-	protected function set_block_query_args( &$query_args ) {
-		$query_args['post__in'] = array_merge( array( 0 ), wc_get_product_ids_on_sale() );
+	protected function set_block_query_args(&$query_args) {
+		$query_args['post__in'] = array_merge(array(0), wc_get_product_ids_on_sale());
 	}
 	/**
 	 * Get block attributes.