diff --git a/composer.json b/composer.json index db72a466..2b058bfa 100644 --- a/composer.json +++ b/composer.json @@ -5,17 +5,17 @@ "license": "GPL-2.0-or-later", "require": { "automattic/jetpack-admin-ui": "^0.2.23-alpha", - "automattic/jetpack-assets": "^1.18.10", - "automattic/jetpack-connection": "^1.57.4", - "automattic/jetpack-jitm": "^2.3.18", - "automattic/jetpack-licensing": "^1.8.3", + "automattic/jetpack-assets": "^1.18.11-alpha", + "automattic/jetpack-connection": "^1.57.5-alpha", + "automattic/jetpack-jitm": "^2.3.19-alpha", + "automattic/jetpack-licensing": "^1.8.4-alpha", "automattic/jetpack-plugins-installer": "^0.2.5", - "automattic/jetpack-redirect": "^1.7.26", + "automattic/jetpack-redirect": "^1.7.27-alpha", "automattic/jetpack-constants": "^1.6.23" }, "require-dev": { "yoast/phpunit-polyfills": "1.1.0", - "automattic/jetpack-changelogger": "^3.3.8", + "automattic/jetpack-changelogger": "^3.3.9-alpha", "automattic/wordbless": "@dev", "automattic/jetpack-videopress": "^0.17.0-alpha" }, diff --git a/src/class-initializer.php b/src/class-initializer.php index 5e272a45..dc583392 100644 --- a/src/class-initializer.php +++ b/src/class-initializer.php @@ -9,15 +9,15 @@ use Automattic\Jetpack\Admin_UI\Admin_Menu; use Automattic\Jetpack\Assets; -use Automattic\Jetpack\Connection\Client as Client; +use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Connection\Initial_State as Connection_Initial_State; use Automattic\Jetpack\Connection\Manager as Connection_Manager; use Automattic\Jetpack\Connection\Rest_Authentication as Connection_Rest_Authentication; use Automattic\Jetpack\Constants as Jetpack_Constants; -use Automattic\Jetpack\JITMS\JITM as JITM; +use Automattic\Jetpack\JITMS\JITM; use Automattic\Jetpack\Licensing; use Automattic\Jetpack\Plugins_Installer; -use Automattic\Jetpack\Status as Status; +use Automattic\Jetpack\Status; use Automattic\Jetpack\Terms_Of_Service; use Automattic\Jetpack\Tracking; @@ -345,5 +345,4 @@ public static function has_file_system_write_access() { public static function get_idc_container_id() { return static::IDC_CONTAINER_ID; } - } diff --git a/src/class-products.php b/src/class-products.php index b0f6f6e0..7e10b403 100644 --- a/src/class-products.php +++ b/src/class-products.php @@ -180,5 +180,4 @@ public static function extend_plugins_action_links() { $class_name::extend_plugin_action_links(); } } - } diff --git a/src/class-rest-ai.php b/src/class-rest-ai.php index aa233522..39698107 100644 --- a/src/class-rest-ai.php +++ b/src/class-rest-ai.php @@ -7,7 +7,7 @@ namespace Automattic\Jetpack\My_Jetpack; -use Automattic\Jetpack\Connection\Client as Client; +use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Connection\Manager as Connection_Manager; use Jetpack_Options; use WP_Error; diff --git a/src/class-rest-purchases.php b/src/class-rest-purchases.php index d964665b..6668a879 100644 --- a/src/class-rest-purchases.php +++ b/src/class-rest-purchases.php @@ -7,7 +7,7 @@ namespace Automattic\Jetpack\My_Jetpack; -use Automattic\Jetpack\Connection\Client as Client; +use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Connection\Manager as Connection_Manager; /** diff --git a/src/class-rest-zendesk-chat.php b/src/class-rest-zendesk-chat.php index be5d2f66..e64a7e55 100644 --- a/src/class-rest-zendesk-chat.php +++ b/src/class-rest-zendesk-chat.php @@ -7,7 +7,7 @@ namespace Automattic\Jetpack\My_Jetpack; -use Automattic\Jetpack\Connection\Client as Client; +use Automattic\Jetpack\Connection\Client; /** * Registers the REST routes for Zendesk Chat. diff --git a/src/class-wpcom-products.php b/src/class-wpcom-products.php index 9f79d87f..a673895b 100644 --- a/src/class-wpcom-products.php +++ b/src/class-wpcom-products.php @@ -7,7 +7,7 @@ namespace Automattic\Jetpack\My_Jetpack; -use Automattic\Jetpack\Connection\Client as Client; +use Automattic\Jetpack\Connection\Client; use Automattic\Jetpack\Status\Visitor; use Jetpack_Options; use WP_Error; diff --git a/src/products/class-module-product.php b/src/products/class-module-product.php index 444f26b8..763eca82 100644 --- a/src/products/class-module-product.php +++ b/src/products/class-module-product.php @@ -130,5 +130,4 @@ public static function deactivate() { } return Jetpack::deactivate_module( static::$module_name ); } - } diff --git a/src/products/class-product.php b/src/products/class-product.php index b72e21ef..015f7e96 100644 --- a/src/products/class-product.php +++ b/src/products/class-product.php @@ -554,5 +554,4 @@ public static function extend_plugin_action_links() { } } } - } diff --git a/src/products/class-search.php b/src/products/class-search.php index a3bca361..7d201301 100644 --- a/src/products/class-search.php +++ b/src/products/class-search.php @@ -327,5 +327,4 @@ public static function get_post_activation_url() { public static function get_manage_url() { return admin_url( 'admin.php?page=jetpack-search' ); } - } diff --git a/src/products/class-videopress.php b/src/products/class-videopress.php index e3245b14..f3bf5f1e 100644 --- a/src/products/class-videopress.php +++ b/src/products/class-videopress.php @@ -156,5 +156,4 @@ public static function get_manage_url() { return admin_url( 'admin.php?page=jetpack#/settings?term=videopress' ); } } - }