Skip to content

Commit

Permalink
Upgrade jetpack packages to version compatible with WCShipping
Browse files Browse the repository at this point in the history
  • Loading branch information
samnajian committed Aug 6, 2024
1 parent f6078dd commit 9ee53fb
Show file tree
Hide file tree
Showing 3 changed files with 309 additions and 198 deletions.
6 changes: 3 additions & 3 deletions classes/class-wc-connect-jetpack.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public static function is_active() {
public static function is_staging_site() {
$jetpack_status = new Status();

return $jetpack_status->is_staging_site();
return $jetpack_status->in_safe_mode();
}

/**
Expand Down Expand Up @@ -123,7 +123,7 @@ public static function is_current_user_connection_owner() {
*/
public static function is_connected() {
return self::get_connection_manager()->is_connected() &&
self::get_connection_manager()->has_connected_owner();
self::get_connection_manager()->has_connected_owner();
}

/**
Expand All @@ -149,7 +149,7 @@ public static function connect_site( $redirect_url ) {
// phpcs:ignore WordPress.Security.SafeRedirect.wp_redirect_wp_redirect -- URL generated by the Jetpack Connection package.
wp_redirect(
add_query_arg(
[ 'from' => self::JETPACK_PLUGIN_SLUG ],
array( 'from' => self::JETPACK_PLUGIN_SLUG ),
$connection_manager->get_authorization_url( null, $redirect_url )
)
);
Expand Down
22 changes: 11 additions & 11 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
"woocommerce/qit-cli": "^0.5.3",
"woocommerce/woocommerce-sniffs": "^0.0.2"
},
"require": {
"automattic/jetpack-connection": "^2.1.0",
"automattic/jetpack-config": "^2.0.0",
"automattic/jetpack-autoloader": "^3.0.2",
"automattic/jetpack-status": "^2.0.2"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"automattic/jetpack-autoloader": true
}
"require": {
"automattic/jetpack-connection": "^2.11.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-autoloader": "^3.0.9",
"automattic/jetpack-status": "^3.3.2"
},
"config": {
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true,
"automattic/jetpack-autoloader": true
}
},
"scripts": {
"test": [
Expand Down
Loading

0 comments on commit 9ee53fb

Please sign in to comment.