Hosting Configuration: Make the menu title under the settings the sam…

…e as the destination (#39183)

* Hosting Configuration: Rename the menu title under the settings

* changelog

* Fix lint

* Update url

* Fix tests

* changelog

* Fix wpcom_site_has_feature

* Fix tests

projects/packages/masterbar/changelog/feat-rename-hosting-config-under-settings

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+Hosting Configuration: Make the menu title under the settings the same as the destination

projects/packages/masterbar/src/admin-menu/class-atomic-admin-menu.php

@@ -423,8 +423,16 @@ public function add_options_menu() {
 			);
 		}
 
-		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Configuration', 'jetpack-masterbar' ), __( 'Hosting Configuration', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-config/' . $this->domain, null, 11 );
+		$has_feature_atomic = function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::ATOMIC );
+		add_submenu_page(
+			'options-general.php',
+			$has_feature_atomic ? esc_attr__( 'Server Settings', 'jetpack-masterbar' ) : esc_attr__( 'Hosting Features', 'jetpack-masterbar' ),
+			$has_feature_atomic ? __( 'Server Settings', 'jetpack-masterbar' ) : __( 'Hosting Features', 'jetpack-masterbar' ),
+			'manage_options',
+			$has_feature_atomic ? 'https://wordpress.com/hosting-config/' . $this->domain : 'https://wordpress.com/hosting-features/' . $this->domain,
+			null, // @phan-suppress-current-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
+			11
+		);
 
 		// Page Optimize is active by default on all Atomic sites and registers a Settings > Performance submenu which
 		// would conflict with our own Settings > Performance that links to Calypso, so we hide it it since the Calypso

projects/packages/masterbar/src/admin-menu/class-wpcom-admin-menu.php

@@ -362,7 +362,7 @@ public function add_options_menu() {
 		parent::add_options_menu();
 
 		// @phan-suppress-next-line PhanTypeMismatchArgumentProbablyReal -- Core should ideally document null for no-callback arg. https://core.trac.wordpress.org/ticket/52539.
-		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Configuration', 'jetpack-masterbar' ), __( 'Hosting Configuration', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-config/' . $this->domain, null, 10 );
+		add_submenu_page( 'options-general.php', esc_attr__( 'Hosting Features', 'jetpack-masterbar' ), __( 'Hosting Features', 'jetpack-masterbar' ), 'manage_options', 'https://wordpress.com/hosting-features/' . $this->domain, null, 10 );
 	}
 
 	/**

projects/packages/masterbar/tests/php/test-class-atomic-admin-menu.php

@@ -286,7 +286,12 @@ public function test_add_options_menu() {
 		global $submenu;
 
 		static::$admin_menu->add_options_menu();
-		$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][11][2] );
+
+		if ( function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::ATOMIC ) ) {
+			$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][11][2] );
+		} else {
+			$this->assertSame( 'https://wordpress.com/hosting-features/' . static::$domain, $submenu['options-general.php'][11][2] );
+		}
 	}
 
 	/**

projects/packages/masterbar/tests/php/test-class-wpcom-admin-menu.php

@@ -254,7 +254,7 @@ public function test_add_options_menu() {
 
 		static::$admin_menu->add_options_menu();
 
-		$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][10][2] );
+		$this->assertSame( 'https://wordpress.com/hosting-features/' . static::$domain, $submenu['options-general.php'][10][2] );
 	}
 
 	/**

projects/plugins/jetpack/changelog/feat-rename-hosting-config-under-settings

@@ -0,0 +1,4 @@
+Significance: patch
+Type: bugfix
+
+Hosting Configuration: Make the menu title under the settings the same as the destination

projects/plugins/jetpack/tests/php/modules/masterbar/test-class-atomic-admin-menu.php

@@ -252,7 +252,12 @@ public function test_add_options_menu() {
 		global $submenu;
 
 		static::$admin_menu->add_options_menu();
-		$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][11][2] );
+
+		if ( function_exists( 'wpcom_site_has_feature' ) && wpcom_site_has_feature( \WPCOM_Features::ATOMIC ) ) {
+			$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][11][2] );
+		} else {
+			$this->assertSame( 'https://wordpress.com/hosting-features/' . static::$domain, $submenu['options-general.php'][11][2] );
+		}
 	}
 
 	/**

projects/plugins/jetpack/tests/php/modules/masterbar/test-class-wpcom-admin-menu.php

@@ -276,7 +276,7 @@ public function test_add_options_menu() {
 
 		static::$admin_menu->add_options_menu();
 
-		$this->assertSame( 'https://wordpress.com/hosting-config/' . static::$domain, $submenu['options-general.php'][10][2] );
+		$this->assertSame( 'https://wordpress.com/hosting-features/' . static::$domain, $submenu['options-general.php'][10][2] );
 	}
 
 	/**