Reverting part of Jitm package to use global Jetpack class

_inc/lib/class.core-rest-api-endpoints.php

@@ -497,7 +497,7 @@ public static function get_plans( $request ) {
 	public static function get_jitm_message( $request ) {
 		$jitm = new JITM_Manager();
 
-		if ( ! $jitm ) {
+		if ( ! $jitm->register() ) {
 			return array();
 		}
 
@@ -511,11 +511,9 @@ public static function get_jitm_message( $request ) {
 	 * @return bool Always True
 	 */
 	public static function delete_jitm_message( $request ) {
-		require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-jitm.php' );
-
-		$jitm = Jetpack_JITM::init();
+		$jitm = new JITM_Manager();
 
-		if ( ! $jitm ) {
+		if ( ! $jitm->register() ) {
 			return true;
 		}
 

class.jetpack.php

@@ -29,6 +29,7 @@
 use \Automattic\Jetpack\Assets\Logo as Jetpack_Logo;
 
 require_once( JETPACK__PLUGIN_DIR . '_inc/lib/class.media.php' );
+require_once( dirname( __FILE__ ) . '/_inc/lib/tracks/client.php' );
 
 class Jetpack {
 	public $xmlrpc_server = null;
@@ -689,7 +690,8 @@ private function __construct() {
 		add_filter( 'jetpack_get_default_modules', array( $this, 'handle_deprecated_modules' ), 99 );
 
 		// A filter to control all just in time messages
-		add_filter( 'jetpack_just_in_time_msgs', '__return_true', 9 );
+		add_filter( 'jetpack_just_in_time_msgs', array( $this, 'is_active_and_not_development_mode' ), 9 );
+
 		add_filter( 'jetpack_just_in_time_msg_cache', '__return_true', 9);
 
 		// If enabled, point edit post, page, and comment links to Calypso instead of WP-Admin.
@@ -7104,4 +7106,11 @@ public static function user_meta_cleanup( $user_id ) {
 			}
 		}
 	}
+
+	function is_active_and_not_development_mode( $maybe ) {
+		if ( ! \Jetpack::is_active() || \Jetpack::is_development_mode() ) {
+			return false;
+		}
+		return true;
+	}
 }

jetpack.php

@@ -241,6 +241,7 @@ function jetpack_admin_missing_autoloader() { ?>
 	require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-admin.php'     );
 	require_once( JETPACK__PLUGIN_DIR . 'class.jetpack-affiliate.php' );
 	$jitm = new Automattic\Jetpack\JITM\Manager();
+	$jitm->register();
 	jetpack_require_lib( 'debugger' );
 }
 

packages/jitm/src/Manager.php

@@ -16,17 +16,7 @@ class Manager {
 
 	const PACKAGE_VERSION = '1.0';
 
-	/**
-	 * @var Jetpack_JITM
-	 **/
-	private static $instance = null;
-
-	/**
-	 * Initializes the class, or returns the singleton
-	 *
-	 * @return Manager | false
-	 */
-	static function init() {
+	public function register() {
 		/**
 		 * Filter to turn off all just in time messages
 		 *
@@ -38,25 +28,8 @@ static function init() {
 		if ( ! apply_filters( 'jetpack_just_in_time_msgs', false ) ) {
 			return false;
 		}
-
-		if ( is_null( self::$instance ) ) {
-			self::$instance = new Manager();
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Jetpack_JITM constructor.
-	 */
-	public function __construct() {
-		/*
-		$jetpack_connection = new Jetpack_Connection();
-		if ( ! $jetpack_connection->is_active() || $jetpack_connection->is_development_mode() ) {
-			return;
-		}
-		*/
 		add_action( 'current_screen', array( $this, 'prepare_jitms' ) );
+		return true;
 	}
 
 	/**

packages/jitm/tests/php/test_Manager.php

@@ -26,7 +26,8 @@ public function test_jitm_disabled_by_filter() {
 			array( 'jetpack_just_in_time_msgs', false, false ),
 		) );
 
-		$this->assertFalse( Jetpack_JITM::init() );
+		$jitm = new Jetpack_JITM();
+		$this->assertFalse( $jitm->register() );
 
 		$this->clear_mock_filters();
 	}
@@ -36,7 +37,8 @@ public function test_jitm_enabled_by_default() {
 			array( 'jetpack_just_in_time_msgs', false, true ),
 		) );
 
-		$this->assertTrue( ! ! Jetpack_JITM::init() );
+		$jitm = new Jetpack_JITM();
+		$this->assertTrue( $jitm->register() );
 
 		$this->clear_mock_filters();
 	}