Move conflict check to init action (#534)

Checking the feature plugin version on `init` ensures the constant is defined before we get to it, which is not guaranteed in `__construct` due to potential different load orders.

Author: ryelle

assets/php/class-wgpb-block-library.php

@@ -37,17 +37,24 @@ public static function get_instance() {
 	 * Constructor.
 	 */
 	public function __construct() {
+		if ( function_exists( 'register_block_type' ) ) {
+			add_action( 'init', array( 'WGPB_Block_Library', 'init' ) );
+		}
+	}
+
+	/**
+	 * Initialize block library features.
+	 */
+	public static function init() {
 		// Shortcut out if we see the feature plugin, v1.4 or below.
 		// note: `FP_VERSION` is transformed to `WGPB_VERSION` in the grunt copy task.
 		if ( defined( 'FP_VERSION' ) && version_compare( FP_VERSION, '1.4.0', '<=' ) ) {
 			return;
 		}
-		if ( function_exists( 'register_block_type' ) ) {
-			add_action( 'init', array( 'WGPB_Block_Library', 'register_blocks' ) );
-			add_action( 'init', array( 'WGPB_Block_Library', 'register_assets' ) );
-			add_filter( 'block_categories', array( 'WGPB_Block_Library', 'add_block_category' ) );
-			add_action( 'admin_print_footer_scripts', array( 'WGPB_Block_Library', 'print_script_settings' ), 1 );
-		}
+		self::register_blocks();
+		self::register_assets();
+		add_filter( 'block_categories', array( 'WGPB_Block_Library', 'add_block_category' ) );
+		add_action( 'admin_print_footer_scripts', array( 'WGPB_Block_Library', 'print_script_settings' ), 1 );
 	}
 
 	/**

woocommerce-gutenberg-products-block.php

@@ -25,11 +25,8 @@
 function wgpb_initialize() {
 	require_once plugin_dir_path( __FILE__ ) . 'assets/php/class-wgpb-block-library.php';
 
-	// Remove core hooks in favor of our local feature plugin handlers.
-	remove_action( 'init', array( 'WC_Block_Library', 'register_blocks' ) );
-	remove_action( 'init', array( 'WC_Block_Library', 'register_assets' ) );
-	remove_filter( 'block_categories', array( 'WC_Block_Library', 'add_block_category' ) );
-	remove_action( 'admin_print_footer_scripts', array( 'WC_Block_Library', 'print_script_settings' ), 1 );
+	// Remove core hook in favor of our local feature plugin handler.
+	remove_action( 'init', array( 'WC_Block_Library', 'init' ) );
 
 	$files_exist = file_exists( plugin_dir_path( __FILE__ ) . '/build/featured-product.js' );
 	if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG && ! $files_exist ) {