From 029e27cc25f3ffd1c309eb6ecae716e2add32cc4 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Mon, 6 Apr 2020 11:59:31 +1200
Subject: [PATCH 1/5] add customised cart & checkout block settings to
 wc-tracker snapshot

---
 includes/class-wc-tracker.php | 93 ++++++++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index d0b978a10a4..87b5ac50f97 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -652,16 +652,103 @@ class WC_Tracker {
 		return ( '0' !== $result ) ? 'Yes' : 'No';
 	}
 
+	// @todo what's the best way to set up the array_filter in woo PHP version?
+
+	/**
+	 * Return true if specified block is checkout block.
+	 *
+	 * @param object $block Block object (as returned in array from parse_blocks()).
+	 * @return boolean
+	 */
+	public static function is_checkout_block( $block ) {
+		return 'woocommerce/checkout' === $block['blockName'];
+	}
+
+	/**
+	 * Return true if specified block is checkout block.
+	 *
+	 * @param object $block Block object (as returned in array from parse_blocks()).
+	 * @return boolean
+	 */
+	public static function is_cart_block( $block ) {
+		return 'woocommerce/cart' === $block['blockName'];
+	}
+
+	/**
+	 * Get blocks from a woocommerce page.
+	 *
+	 * @param string $woo_page_name A woocommerce page e.g. `checkout` or `cart`.
+	 * @return array Array of blocks as returned by parse_blocks().
+	 */
+	private static function get_blocks_from_page( $woo_page_name ) {
+		// Will expose this as a param later.
+		$page_id = wc_get_page_id( $woo_page_name );
+
+		$page = get_post( $page_id );
+		if ( ! $page ) {
+			return array();
+		}
+
+		// Parse blocks out of checkout page.
+		$blocks = parse_blocks( $page->post_content );
+		if ( ! $blocks ) {
+			return array();
+		}
+
+		return $blocks;
+	}
+
+	/**
+	 * Get customised attributes for the checkout block.
+	 *
+	 * Note this only returns attributes that do not have default values;
+	 * i.e. attributes that the merchant has customised.
+	 *
+	 * @return array Block attribute values.
+	 */
+	private static function get_block_attributes_from_checkout_page() {
+		$blocks = self::get_blocks_from_page( 'checkout' );
+
+		// Get checkout block(s).
+		$checkout_blocks = array_filter( $blocks, array( __CLASS__, 'is_checkout_block' ) );
+		if ( ! $checkout_blocks || ! count( $checkout_blocks ) ) {
+			return array();
+		}
+
+		// Return any customised attributes from the first block.
+		return $checkout_blocks[0]['attrs'];
+	}
+
+	/**
+	 * Get customised attributes for the cart block.
+	 *
+	 * Note this only returns attributes that do not have default values;
+	 * i.e. attributes that the merchant has customised.
+	 *
+	 * @return array Block attribute values.
+	 */
+	private static function get_block_attributes_from_cart_page() {
+		$blocks = self::get_blocks_from_page( 'cart' );
+
+		// Get cart block(s).
+		$cart_blocks = array_filter( $blocks, array( __CLASS__, 'is_cart_block' ) );
+		if ( ! $cart_blocks || ! count( $cart_blocks ) ) {
+			return array();
+		}
+
+		// Return any customised attributes from the first block.
+		return $cart_blocks[0]['attrs'];
+	}
+
 	/**
 	 * Get info about the cart & checkout pages.
 	 *
 	 * @return array
 	 */
 	public static function get_cart_checkout_info() {
-		global $wpdb;
-
 		$cart_page_id     = wc_get_page_id( 'cart' );
 		$checkout_page_id = wc_get_page_id( 'checkout' );
+
 		return array(
 			'cart_page_contains_cart_block'             => self::post_contains_text(
 				$cart_page_id,
@@ -671,6 +758,7 @@ class WC_Tracker {
 				$cart_page_id,
 				'[woocommerce_cart]'
 			),
+			'cart_block_attributes'                     => self::get_block_attributes_from_cart_page(),
 			'checkout_page_contains_checkout_block'     => self::post_contains_text(
 				$checkout_page_id,
 				'<!-- wp:woocommerce/checkout'
@@ -679,6 +767,7 @@ class WC_Tracker {
 				$checkout_page_id,
 				'[woocommerce_checkout]'
 			),
+			'checkout_block_attributes'                 => self::get_block_attributes_from_checkout_page(),
 		);
 	}
 }

From e93bb453e172675dca3897af758f676ebfe9c9a5 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Mon, 6 Apr 2020 12:08:37 +1200
Subject: [PATCH 2/5] use anonymous functions for array_filter when finding
 cart etc blocks

---
 includes/class-wc-tracker.php | 36 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 24 deletions(-)

diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 87b5ac50f97..315292a7ca3 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -652,28 +652,6 @@ class WC_Tracker {
 		return ( '0' !== $result ) ? 'Yes' : 'No';
 	}
 
-	// @todo what's the best way to set up the array_filter in woo PHP version?
-
-	/**
-	 * Return true if specified block is checkout block.
-	 *
-	 * @param object $block Block object (as returned in array from parse_blocks()).
-	 * @return boolean
-	 */
-	public static function is_checkout_block( $block ) {
-		return 'woocommerce/checkout' === $block['blockName'];
-	}
-
-	/**
-	 * Return true if specified block is checkout block.
-	 *
-	 * @param object $block Block object (as returned in array from parse_blocks()).
-	 * @return boolean
-	 */
-	public static function is_cart_block( $block ) {
-		return 'woocommerce/cart' === $block['blockName'];
-	}
-
 	/**
 	 * Get blocks from a woocommerce page.
 	 *
@@ -710,7 +688,12 @@ class WC_Tracker {
 		$blocks = self::get_blocks_from_page( 'checkout' );
 
 		// Get checkout block(s).
-		$checkout_blocks = array_filter( $blocks, array( __CLASS__, 'is_checkout_block' ) );
+		$checkout_blocks = array_filter(
+			$blocks,
+			function ( $block ) {
+				return 'woocommerce/checkout' === $block['blockName'];
+			}
+		);
 		if ( ! $checkout_blocks || ! count( $checkout_blocks ) ) {
 			return array();
 		}
@@ -731,7 +714,12 @@ class WC_Tracker {
 		$blocks = self::get_blocks_from_page( 'cart' );
 
 		// Get cart block(s).
-		$cart_blocks = array_filter( $blocks, array( __CLASS__, 'is_cart_block' ) );
+		$cart_blocks = array_filter(
+			$blocks,
+			function ( $block ) {
+				return 'woocommerce/cart' === $block['blockName'];
+			}
+		);
 		if ( ! $cart_blocks || ! count( $cart_blocks ) ) {
 			return array();
 		}

From 3f42fbbebaccc3fcf7e3923efcee3c176ecb40e3 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Mon, 6 Apr 2020 12:10:35 +1200
Subject: [PATCH 3/5] remove stale/redundant comments

---
 includes/class-wc-tracker.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 315292a7ca3..3c7c3e7375b 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -659,7 +659,6 @@ class WC_Tracker {
 	 * @return array Array of blocks as returned by parse_blocks().
 	 */
 	private static function get_blocks_from_page( $woo_page_name ) {
-		// Will expose this as a param later.
 		$page_id = wc_get_page_id( $woo_page_name );
 
 		$page = get_post( $page_id );
@@ -667,7 +666,6 @@ class WC_Tracker {
 			return array();
 		}
 
-		// Parse blocks out of checkout page.
 		$blocks = parse_blocks( $page->post_content );
 		if ( ! $blocks ) {
 			return array();

From bc8553f3d53613281815f3c4be5f9fa988de332b Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Tue, 7 Apr 2020 09:40:22 +1200
Subject: [PATCH 4/5] refactor block tracker data into standard function: - use
 parse_blocks to detect block instead of SQL match - method is now generic,
 can get data about any block on any woo page

---
 includes/class-wc-tracker.php | 84 ++++++++++++++++-------------------
 1 file changed, 38 insertions(+), 46 deletions(-)

diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index 3c7c3e7375b..e0690fc2962 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -658,7 +658,7 @@ class WC_Tracker {
 	 * @param string $woo_page_name A woocommerce page e.g. `checkout` or `cart`.
 	 * @return array Array of blocks as returned by parse_blocks().
 	 */
-	private static function get_blocks_from_page( $woo_page_name ) {
+	private static function get_all_blocks_from_page( $woo_page_name ) {
 		$page_id = wc_get_page_id( $woo_page_name );
 
 		$page = get_post( $page_id );
@@ -675,55 +675,49 @@ class WC_Tracker {
 	}
 
 	/**
-	 * Get customised attributes for the checkout block.
+	 * Get all instances of the specified block on a specific woo page
+	 * (e.g. `cart` or `checkout` page).
 	 *
-	 * Note this only returns attributes that do not have default values;
-	 * i.e. attributes that the merchant has customised.
-	 *
-	 * @return array Block attribute values.
+	 * @param string $block_name The name (id) of a block, e.g. `woocommerce/cart`.
+	 * @param string $woo_page_name The woo page to search, e.g. `cart`.
+	 * @return array Array of blocks as returned by parse_blocks().
 	 */
-	private static function get_block_attributes_from_checkout_page() {
-		$blocks = self::get_blocks_from_page( 'checkout' );
+	private static function get_blocks_from_page( $block_name, $woo_page_name ) {
+		$page_blocks = self::get_all_blocks_from_page( $woo_page_name );
 
-		// Get checkout block(s).
-		$checkout_blocks = array_filter(
-			$blocks,
+		// Get any instances of the specified block.
+		return array_filter(
+			$page_blocks,
 			function ( $block ) {
-				return 'woocommerce/checkout' === $block['blockName'];
+				return $block_name !== $block['blockName'];
 			}
 		);
-		if ( ! $checkout_blocks || ! count( $checkout_blocks ) ) {
-			return array();
-		}
-
-		// Return any customised attributes from the first block.
-		return $checkout_blocks[0]['attrs'];
 	}
 
 	/**
-	 * Get customised attributes for the cart block.
+	 * Get tracker data for a specific block type on a woocommerce page.
 	 *
-	 * Note this only returns attributes that do not have default values;
-	 * i.e. attributes that the merchant has customised.
-	 *
-	 * @return array Block attribute values.
+	 * @param string $block_name The name (id) of a block, e.g. `woocommerce/cart`.
+	 * @param string $woo_page_name The woo page to search, e.g. `cart`.
+	 * @return array Associative array of tracker data with keys:
+	 * - page_contains_block
+	 * - block_attributes
 	 */
-	private static function get_block_attributes_from_cart_page() {
-		$blocks = self::get_blocks_from_page( 'cart' );
+	public static function get_block_tracker_data( $block_name, $woo_page_name ) {
+		$blocks = self::get_blocks_from_page( $block_name, $woo_page_name );
 
-		// Get cart block(s).
-		$cart_blocks = array_filter(
-			$blocks,
-			function ( $block ) {
-				return 'woocommerce/cart' === $block['blockName'];
-			}
-		);
-		if ( ! $cart_blocks || ! count( $cart_blocks ) ) {
-			return array();
+		$block_present = false;
+		$attributes    = array();
+		if ( $blocks && count( $blocks ) ) {
+			// Return any customised attributes from the first block.
+			$block_present = true;
+			$attributes    = $blocks[0]['attrs'];
 		}
 
-		// Return any customised attributes from the first block.
-		return $cart_blocks[0]['attrs'];
+		return array(
+			'page_contains_block' => $block_present ? 'Yes' : 'No',
+			'block_attributes'    => $attributes,
+		);
 	}
 
 	/**
@@ -735,25 +729,23 @@ class WC_Tracker {
 		$cart_page_id     = wc_get_page_id( 'cart' );
 		$checkout_page_id = wc_get_page_id( 'checkout' );
 
+		$cart_block_data     = self::get_block_tracker_data( 'woocommerce/cart', 'cart' );
+		$checkout_block_data = self::get_block_tracker_data( 'woocommerce/checkout', 'checkout' );
+
 		return array(
-			'cart_page_contains_cart_block'             => self::post_contains_text(
-				$cart_page_id,
-				'<!-- wp:woocommerce/cart'
-			),
 			'cart_page_contains_cart_shortcode'         => self::post_contains_text(
 				$cart_page_id,
 				'[woocommerce_cart]'
 			),
-			'cart_block_attributes'                     => self::get_block_attributes_from_cart_page(),
-			'checkout_page_contains_checkout_block'     => self::post_contains_text(
-				$checkout_page_id,
-				'<!-- wp:woocommerce/checkout'
-			),
 			'checkout_page_contains_checkout_shortcode' => self::post_contains_text(
 				$checkout_page_id,
 				'[woocommerce_checkout]'
 			),
-			'checkout_block_attributes'                 => self::get_block_attributes_from_checkout_page(),
+
+			'cart_page_contains_cart_block'             => $cart_block_data['page_contains_block'],
+			'cart_block_attributes'                     => $cart_block_data['block_attributes'],
+			'checkout_page_contains_checkout_block'     => $checkout_block_data['page_contains_block'],
+			'checkout_block_attributes'                 => $checkout_block_data['block_attributes'],
 		);
 	}
 }

From 7b55096288fd5602e3625767fc2ea3eadf830a36 Mon Sep 17 00:00:00 2001
From: Rua Haszard <rua.haszard@automattic.com>
Date: Tue, 7 Apr 2020 10:23:03 +1200
Subject: [PATCH 5/5] fix logic errors in get_blocks_from_page: - declare
 closure use (dependency) on $block_name from surrounding func - re-index the
 filtered array so $blocks[0] returns first filtered block

---
 includes/class-wc-tracker.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/includes/class-wc-tracker.php b/includes/class-wc-tracker.php
index e0690fc2962..02f8a169a8b 100644
--- a/includes/class-wc-tracker.php
+++ b/includes/class-wc-tracker.php
@@ -686,11 +686,13 @@ class WC_Tracker {
 		$page_blocks = self::get_all_blocks_from_page( $woo_page_name );
 
 		// Get any instances of the specified block.
-		return array_filter(
-			$page_blocks,
-			function ( $block ) {
-				return $block_name !== $block['blockName'];
-			}
+		return array_values(
+			array_filter(
+				$page_blocks,
+				function ( $block ) use ( $block_name ) {
+					return ( $block_name === $block['blockName'] );
+				}
+			)
 		);
 	}