Additional tweaks to @b2c573ed8a04a8d425a73e018a450179514cbdc7

- Load API with other includes
- Register activation hook early
- Include autoloader early

cc @claudiosmweb

includes/class-wc-api.php

@@ -11,9 +11,11 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
+if ( ! class_exists( 'WC_API' ) ) :
+
 class WC_API {
 
 	/** This is the major version for the REST API and takes
@@ -264,5 +266,8 @@ class WC_API {
 			die('1');
 		}
 	}
-
 }
+
+endif;
+
+return new WC_API();

includes/class-wc-install.php

@@ -21,8 +21,6 @@ class WC_Install {
 	 * Hook in tabs.
 	 */
 	public static function init() {
-		register_activation_hook( WC_PLUGIN_FILE, array( __CLASS__, 'install' ) );
-
 		add_action( 'admin_init', array( __CLASS__, 'check_version' ), 5 );
 		add_action( 'admin_init', array( __CLASS__, 'install_actions' ) );
 		add_action( 'in_plugin_update_message-woocommerce/woocommerce.php', array( __CLASS__, 'in_plugin_update_message' ) );
@@ -85,14 +83,15 @@ class WC_Install {
 			define( 'WC_INSTALLING', true );
 		}
 
+		// Ensure needed classes are loaded
+		WC()->includes();
+		include_once( 'class-wc-post-types.php' );
+		include_once( 'admin/class-wc-admin-notices.php' );
+
 		self::create_options();
 		self::create_tables();
 		self::create_roles();
 
-		// Ensure needed classes are loaded
-		include_once( 'admin/class-wc-admin-notices.php' );
-		include_once( 'class-wc-post-types.php' );
-
 		// Register post types
 		WC_Post_types::register_post_types();
 		WC_Post_types::register_taxonomies();

includes/class-wc-query.php

@@ -10,7 +10,7 @@
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
-	exit; // Exit if accessed directly
+	exit;
 }
 
 if ( ! class_exists( 'WC_Query' ) ) :

woocommerce.php

@@ -100,7 +100,6 @@ final class WooCommerce {
 
 	/**
 	 * Cloning is forbidden.
-	 *
 	 * @since 2.1
 	 */
 	public function __clone() {
@@ -109,7 +108,6 @@ final class WooCommerce {
 
 	/**
 	 * Unserializing instances of this class is forbidden.
-	 *
 	 * @since 2.1
 	 */
 	public function __wakeup() {
@@ -132,32 +130,46 @@ final class WooCommerce {
 	 */
 	public function __construct() {
 		$this->define_constants();
+		$this->init_autoloader();
 		$this->init_hooks();
 	}
 
+	/**
+	 * Include the class autoloader
+	 * @since  2.3
+	 */
+	private function init_autoloader() {
+		include_once( 'includes/class-wc-autoloader.php' );
+	}
+
 	/**
 	 * Hook into actions and filters
 	 * @since  2.3
 	 */
-	public function init_hooks() {
+	private function init_hooks() {
+		register_activation_hook( __FILE__, array( 'WC_Install', 'install' ) );
 		add_action( 'after_setup_theme', array( $this, 'setup_environment' ) );
 		add_action( 'after_setup_theme', array( $this, 'include_template_functions' ), 11 );
 		add_action( 'init', array( $this, 'init' ), 0 );
 		add_action( 'init', array( 'WC_Shortcodes', 'init' ) );
 		add_action( 'init', array( 'WC_Emails', 'init_transactional_emails' ) );
-		add_action( 'plugins_loaded', array( $this, 'plugins_loaded' ), 5 );
+		add_action( 'plugins_loaded', array( $this, 'includes' ), 5 );
 	}
 
 	/**
-	 * Once we're sure all other plugins are loaded, we can include our files. This keeps some functions pluggable.
+	 * Define WC Constants
-	 * @since  2.3
 	 */
-	public function plugins_loaded() {
+	private function define_constants() {
-		$this->includes();
+		$upload_dir = wp_upload_dir();
 
-		$this->api = new WC_API();
+		$this->define( 'WC_PLUGIN_FILE', __FILE__ );
-
+		$this->define( 'WC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
-		do_action( 'woocommerce_loaded' );
+		$this->define( 'WC_VERSION', $this->version );
+		$this->define( 'WOOCOMMERCE_VERSION', $this->version );
+		$this->define( 'WC_ROUNDING_PRECISION', 4 );
+		$this->define( 'WC_TAX_ROUNDING_MODE', 'yes' === get_option( 'woocommerce_prices_include_tax', 'no' ) ? 2 : 1 );
+		$this->define( 'WC_DELIMITER', '|' );
+		$this->define( 'WC_LOG_DIR', $upload_dir['basedir'] . '/wc-logs/' );
 	}
 
 	/**
@@ -189,27 +201,10 @@ final class WooCommerce {
 		}
 	}
 
-	/**
-	 * Define WC Constants
-	 */
-	private function define_constants() {
-		$upload_dir = wp_upload_dir();
-
-		$this->define( 'WC_PLUGIN_FILE', __FILE__ );
-		$this->define( 'WC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
-		$this->define( 'WC_VERSION', $this->version );
-		$this->define( 'WOOCOMMERCE_VERSION', $this->version );
-		$this->define( 'WC_ROUNDING_PRECISION', 4 );
-		$this->define( 'WC_TAX_ROUNDING_MODE', 'yes' === get_option( 'woocommerce_prices_include_tax', 'no' ) ? 2 : 1 );
-		$this->define( 'WC_DELIMITER', '|' );
-		$this->define( 'WC_LOG_DIR', $upload_dir['basedir'] . '/wc-logs/' );
-	}
-
 	/**
 	 * Include required core files used in admin and on the frontend.
 	 */
-	private function includes() {
+	public function includes() {
-		include_once( 'includes/class-wc-autoloader.php' );
 		include_once( 'includes/wc-core-functions.php' );
 		include_once( 'includes/wc-widget-functions.php' );
 		include_once( 'includes/wc-webhook-functions.php' );
@@ -235,11 +230,10 @@ final class WooCommerce {
 			include_once( 'includes/class-wc-tracker.php' );
 		}
 
-		// Query class
 		$this->query = include( 'includes/class-wc-query.php' );                // The main query class
+		$this->api   = include( 'includes/class-wc-api.php' );                  // API Class
 
 		include_once( 'includes/class-wc-post-types.php' );                     // Registers post types
-		include_once( 'includes/class-wc-api.php' );                            // API Class
 		include_once( 'includes/abstracts/abstract-wc-product.php' );           // Products
 		include_once( 'includes/abstracts/abstract-wc-order.php' );             // Orders
 		include_once( 'includes/abstracts/abstract-wc-settings-api.php' );      // Settings API (for gateways, shipping, and integrations)
@@ -251,6 +245,8 @@ final class WooCommerce {
 		include_once( 'includes/class-wc-integrations.php' );                   // Loads integrations
 		include_once( 'includes/class-wc-cache-helper.php' );                   // Cache Helper
 		include_once( 'includes/class-wc-language-pack-upgrader.php' );         // Download/update languages
+
+		do_action( 'woocommerce_loaded' ); // Hook once core includes are included
 	}
 
 	/**