Skip to content

Removing the migration of rollout switch to Admin #3268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vinkmeta wants to merge 1 commit into from
Closed

Removing the migration of rollout switch to Admin #3268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions class-wc-facebookcommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class WC_Facebookcommerce extends WooCommerce\Facebook\Framework\Plugin {
/** @var WooCommerce\Facebook\Products\FBCategories instance. */
private $fb_categories;

/** @var WooCommerce\Facebook\Admin\RolloutSwitches instance. */
/** @var WooCommerce\Facebook\RolloutSwitches instance. */
private $rollout_switches;

/**
Expand Down Expand Up @@ -217,6 +217,7 @@ public function init() {
$this->sync_background_handler = new WooCommerce\Facebook\Products\Sync\Background();
$this->configuration_detection = new WooCommerce\Facebook\Feed\FeedConfigurationDetection();
$this->legacy_product_sets_sync_handler = new WooCommerce\Facebook\ProductSets\Sync();
$this->product_sets_sync_handler = new WooCommerce\Facebook\ProductSets\ProductSetSync();
$this->commerce_handler = new WooCommerce\Facebook\Commerce();
$this->fb_categories = new WooCommerce\Facebook\Products\FBCategories();
$this->external_version_update = new WooCommerce\Facebook\ExternalVersionUpdate\Update();
Expand Down Expand Up @@ -244,10 +245,12 @@ public function init() {
$this->webhook_handler = new WooCommerce\Facebook\Handlers\WebHook( $this );
$this->whatsapp_webhook_handler = new WooCommerce\Facebook\Handlers\Whatsapp_Webhook( $this );
$this->tracker = new WooCommerce\Facebook\Utilities\Tracker();
$this->rollout_switches = new WooCommerce\Facebook\RolloutSwitches( $this );

// Init jobs
$this->job_manager = new WooCommerce\Facebook\Jobs\JobManager();
add_action( 'init', [ $this->job_manager, 'init' ] );
add_action( 'admin_init', array( $this->rollout_switches, 'init' ) );
// Instantiate the debug tools.
$this->debug_tools = new DebugTools();

Expand Down Expand Up @@ -276,9 +279,7 @@ public function init_admin() {
add_action(
'admin_init',
function () {
$this->admin = new WooCommerce\Facebook\Admin();
$this->rollout_switches = new WooCommerce\Facebook\Admin\RolloutSwitches( $this );
$this->product_sets_sync_handler = new WooCommerce\Facebook\ProductSets\ProductSetSync();
$this->admin = new WooCommerce\Facebook\Admin();
},
0
);
Expand Down Expand Up @@ -833,7 +834,7 @@ public function get_asset_build_dir_url() {
/**
* Gets the connection handler.
*
* @return WooCommerce\Facebook\Admin\RolloutSwitches
* @return WooCommerce\Facebook\RolloutSwitches
*/
public function get_rollout_switches() {
return $this->rollout_switches;
Expand Down
2 changes: 1 addition & 1 deletion includes/Admin/Enhanced_Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use WooCommerce\Facebook\Framework\Helper;
use WooCommerce\Facebook\Framework\Plugin\Exception as PluginException;
use WooCommerce\Facebook\Admin\Settings_Screens\Whatsapp_Utility;
use WooCommerce\Facebook\Admin\RolloutSwitches;
use WooCommerce\Facebook\RolloutSwitches;

defined( 'ABSPATH' ) || exit;

Expand Down
2 changes: 1 addition & 1 deletion includes/Admin/Product_Sets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
defined( 'ABSPATH' ) || exit;

use WP_Term;
use WooCommerce\Facebook\Admin\RolloutSwitches;
use WooCommerce\Facebook\RolloutSwitches;

/**
* General handler for the product set admin functionality.
Expand Down
2 changes: 1 addition & 1 deletion includes/Admin/Settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
use WooCommerce\Facebook\Admin\Settings_Screens\Whatsapp_Utility;
use WooCommerce\Facebook\Framework\Helper;
use WooCommerce\Facebook\Framework\Plugin\Exception as PluginException;
use WooCommerce\Facebook\Admin\RolloutSwitches;
use WooCommerce\Facebook\RolloutSwitches;

defined( 'ABSPATH' ) || exit;

Expand Down
2 changes: 1 addition & 1 deletion includes/ProductSets/ProductSetSync.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

defined( 'ABSPATH' ) || exit;

use WooCommerce\Facebook\Admin\RolloutSwitches;
use WooCommerce\Facebook\RolloutSwitches;
use WooCommerce\Facebook\Utilities\Heartbeat;
use WC_Facebookcommerce_Utils;

Expand Down
5 changes: 2 additions & 3 deletions includes/Admin/RolloutSwitches.php → includes/RolloutSwitches.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @package FacebookCommerce
*/

namespace WooCommerce\Facebook\Admin;
namespace WooCommerce\Facebook;

use WooCommerce\Facebook\Framework\Api\Exception;
use WooCommerce\Facebook\Utilities\Heartbeat;
Expand Down Expand Up @@ -36,7 +36,6 @@ class RolloutSwitches {

public function __construct( \WC_Facebookcommerce $plugin ) {
$this->plugin = $plugin;
add_action( Heartbeat::HOURLY, array( $this, 'init' ) );
}

public function init() {
Expand All @@ -49,7 +48,7 @@ public function init() {
if ( 'yes' === get_transient( $flag_name ) ) {
return;
}
set_transient( $flag_name, 'yes', HOUR_IN_SECONDS );
set_transient( $flag_name, 'yes', 60 * MINUTE_IN_SECONDS );

try {
$external_business_id = $this->plugin->get_connection_handler()->get_external_business_id();
Expand Down
2 changes: 1 addition & 1 deletion tests/Unit/RolloutSwitchesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use WooCommerce\Facebook\Admin\Settings_Screens\Connection;
use WooCommerce\Facebook\API;
use WooCommerce\Facebook\Framework\Api\Exception as ApiException;
use WooCommerce\Facebook\Admin\RolloutSwitches;
use WooCommerce\Facebook\RolloutSwitches;

class RolloutSwitchesTest extends \WooCommerce\Facebook\Tests\AbstractWPUnitTestWithSafeFiltering {

Expand Down