Merge pull request #3511 from the-events-calendar/fix/init-of-tc-module

Fix init of TC module

changelog/fix-init-of-tc-module

@@ -0,0 +1,4 @@
+Significance: patch
+Type: tweak
+
+Init TicketsCommerce Module as soon as possible. [ETP-972]

src/Tickets/Commerce/Hooks.php

@@ -65,8 +65,6 @@ protected function add_actions() {
 		// Compatibility Hooks
 		add_action( 'init', [ $this, 'register_event_compatibility_hooks' ] );
 
-		add_action( 'tribe_common_loaded', [ $this, 'load_commerce_module' ] );
-
 		add_action( 'template_redirect', [ $this, 'do_cart_parse_request' ] );
 		add_action( 'template_redirect', [ $this, 'do_checkout_parse_request' ] );
 
@@ -482,9 +480,11 @@ public function filter_payments_tab_settings( $settings ) {
 	 * Initializes the Module Class.
 	 *
 	 * @since 5.1.9
+	 *
+	 * @deprecated TBD
 	 */
 	public function load_commerce_module() {
-		$this->container->make( Module::class );
+		_deprecated_function( __METHOD__, 'TBD' );
 	}
 
 	/**

src/Tickets/Commerce/Provider.php

@@ -61,6 +61,9 @@ public function register() {
 		$this->container->singleton( Notice_Handler::class );
 
 		$this->container->singleton( Module::class );
+		// We need to init for the registration as a module to take place early.
+		$this->container->get( Module::class );
+
 		$this->container->singleton( Attendee::class );
 		$this->container->singleton( Order::class );
 		$this->container->singleton( Ticket::class );

tests/commerce_integration/_Load/CommerceModuleLoaded_Test.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ET;
+
+use Codeception\TestCase\WPTestCase;
+use Tribe__Tickets__Tickets as Tickets;
+use TEC\Tickets\Commerce\Module;
+
+class CommerceModuleLoaded_Test extends WPTestCase {
+	public function test_commerce_module_is_loaded_early() {
+		$this->assertArrayHasKey( Module::class, Tickets::modules() );
+	}
+}

tests/commerce_integration/_bootstrap.php

@@ -1,7 +1,6 @@
 <?php
 
 use \TEC\Tickets\Commerce\Provider as Commerce_Provider;
-use Tribe\Tickets\Promoter\Triggers\Dispatcher;
 
 $tec_support = dirname( __DIR__, 3 ) . '/the-events-calendar/tests/_support';
 Codeception\Util\Autoload::addNamespace( 'Tribe\Events\Test', $tec_support );