Revert: Deprecate Soft Disconnect (#24104)

* Revert "Deprecate soft disconnect (#23991)"

This reverts commit abe478363162985c8b1d58f6efe49f0e6c62ce08.

* changelog

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/2230691061

Author: kraftbj

jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md

@@ -12,6 +12,9 @@ This is an alpha version! The changes listed here are not final.
 ### Deprecated
 - Moved the options class into Connection.
 
+### Fixed
+- Reverts #23991
+
 ## [1.39.0] - 2022-04-26
 ### Changed
 - Make remove_connection a proxy method to ensure all trackings are triggered

jetpack_vendor/automattic/jetpack-connection/src/class-manager.php

@@ -1636,6 +1636,7 @@ public function disconnect_site_wpcom( $ignore_connected_plugins = false ) {
 	 * This function will automatically perform "soft" or "hard" disconnect depending on whether other plugins are using the connection.
 	 * This is a proxy method to simplify the Connection package API.
 	 *
+	 * @see Manager::disable_plugin()
 	 * @see Manager::disconnect_site()
 	 *
 	 * @param boolean $disconnect_wpcom Should disconnect_site_wpcom be called.
@@ -1644,6 +1645,7 @@ public function disconnect_site_wpcom( $ignore_connected_plugins = false ) {
 	 */
 	public function remove_connection( $disconnect_wpcom = true, $ignore_connected_plugins = false ) {
 
+		$this->disable_plugin();
 		$this->disconnect_site( $disconnect_wpcom, $ignore_connected_plugins );
 
 		return true;
@@ -2328,25 +2330,29 @@ public function get_connected_plugins() {
 	 * Force plugin disconnect. After its called, the plugin will not be allowed to use the connection.
 	 * Note: this method does not remove any access tokens.
 	 *
-	 * @deprecated since 1.39.0
 	 * @return bool
 	 */
 	public function disable_plugin() {
-		_deprecated_function( __METHOD__, '1.39.0' );
-		return null;
+		if ( ! $this->plugin ) {
+			return false;
+		}
+
+		return $this->plugin->disable();
 	}
 
 	/**
 	 * Force plugin reconnect after user-initiated disconnect.
 	 * After its called, the plugin will be allowed to use the connection again.
 	 * Note: this method does not initialize access tokens.
 	 *
-	 * @deprecated since 1.39.0.
 	 * @return bool
 	 */
 	public function enable_plugin() {
-		_deprecated_function( __METHOD__, '1.39.0' );
-		return null;
+		if ( ! $this->plugin ) {
+			return false;
+		}
+
+		return $this->plugin->enable();
 	}
 
 	/**

jetpack_vendor/automattic/jetpack-connection/src/class-plugin-storage.php

@@ -16,12 +16,6 @@ class Plugin_Storage {
 
 	const ACTIVE_PLUGINS_OPTION_NAME = 'jetpack_connection_active_plugins';
 
-	/**
-	 * Options where disabled plugins were stored
-	 *
-	 * @deprecated since 1.39.0.
-	 * @var string
-	 */
 	const PLUGINS_DISABLED_OPTION_NAME = 'jetpack_connection_disabled_plugins';
 
 	/**
@@ -99,20 +93,18 @@ public static function get_one( $slug ) {
 	 * Even if you don't use Jetpack Config, it may be introduced later by other plugins,
 	 * so please make sure not to run the method too early in the code.
 	 *
-	 * @since 1.39.0 deprecated the $connected_only argument.
-	 *
-	 * @param null $deprecated null plugins that were explicitly disconnected. Deprecated, there's no such a thing as disconnecting only specific plugins anymore.
+	 * @param bool $connected_only Exclude plugins that were explicitly disconnected.
 	 *
 	 * @return array|WP_Error
 	 */
-	public static function get_all( $deprecated = null ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+	public static function get_all( $connected_only = false ) {
 		$maybe_error = self::ensure_configured();
 
 		if ( $maybe_error instanceof WP_Error ) {
 			return $maybe_error;
 		}
 
-		return self::$plugins;
+		return $connected_only ? array_diff_key( self::$plugins, array_flip( self::get_all_disabled_plugins() ) ) : self::$plugins;
 	}
 
 	/**
@@ -172,7 +164,6 @@ public static function configure() {
 		}
 
 		// If a plugin was activated or deactivated.
-		// self::$plugins is populated in Config::ensure_options_connection().
 		$number_of_plugins_differ = count( self::$plugins ) !== count( (array) get_option( self::ACTIVE_PLUGINS_OPTION_NAME, array() ) );
 
 		if ( $number_of_plugins_differ || true === self::$refresh_connected_plugins ) {
@@ -200,41 +191,47 @@ public static function update_active_plugins_option() {
 	/**
 	 * Add the plugin to the set of disconnected ones.
 	 *
-	 * @deprecated since 1.39.0.
-	 *
 	 * @param string $slug Plugin slug.
 	 *
 	 * @return bool
 	 */
-	public static function disable_plugin( $slug ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, '1.39.0' );
+	public static function disable_plugin( $slug ) {
+		$disconnects = self::get_all_disabled_plugins();
+
+		if ( ! in_array( $slug, $disconnects, true ) ) {
+			$disconnects[] = $slug;
+			update_option( self::PLUGINS_DISABLED_OPTION_NAME, $disconnects );
+		}
+
 		return true;
 	}
 
 	/**
 	 * Remove the plugin from the set of disconnected ones.
 	 *
-	 * @deprecated since 1.39.0.
-	 *
 	 * @param string $slug Plugin slug.
 	 *
 	 * @return bool
 	 */
-	public static function enable_plugin( $slug ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, '1.39.0' );
+	public static function enable_plugin( $slug ) {
+		$disconnects = self::get_all_disabled_plugins();
+
+		$slug_index = array_search( $slug, $disconnects, true );
+		if ( false !== $slug_index ) {
+			unset( $disconnects[ $slug_index ] );
+			update_option( self::PLUGINS_DISABLED_OPTION_NAME, $disconnects );
+		}
+
 		return true;
 	}
 
 	/**
 	 * Get all plugins that were disconnected by user.
 	 *
-	 * @deprecated since 1.39.0.
-	 *
 	 * @return array
 	 */
-	public static function get_all_disabled_plugins() { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		_deprecated_function( __METHOD__, '1.39.0' );
-		return array();
+	public static function get_all_disabled_plugins() {
+		return (array) get_option( self::PLUGINS_DISABLED_OPTION_NAME, array() );
 	}
 
 	/**

jetpack_vendor/automattic/jetpack-connection/src/class-plugin.php

@@ -91,25 +91,19 @@ public function is_only() {
 	/**
 	 * Add the plugin to the set of disconnected ones.
 	 *
-	 * @deprecated since 1.39.0.
-	 *
 	 * @return bool
 	 */
 	public function disable() {
-		_deprecated_function( __METHOD__, '1.39.0' );
-		return true;
+		return Plugin_Storage::disable_plugin( $this->slug );
 	}
 
 	/**
 	 * Remove the plugin from the set of disconnected ones.
 	 *
-	 * @deprecated since 1.39.0.
-	 *
 	 * @return bool
 	 */
 	public function enable() {
-		_deprecated_function( __METHOD__, '1.39.0' );
-		return true;
+		return Plugin_Storage::enable_plugin( $this->slug );
 	}
 
 	/**
@@ -118,7 +112,7 @@ public function enable() {
 	 * @return bool
 	 */
 	public function is_enabled() {
-		return in_array( $this->slug, Plugin_Storage::get_all(), true );
+		return ! in_array( $this->slug, Plugin_Storage::get_all_disabled_plugins(), true );
 	}
 
 }