Use Status\Host::is_p2_site() instead of a new helper

Survicate calls the canonical Automattic\Jetpack\Status\Host::is_p2_site()
in src/features/survicate/class-survicate.php directly. Drops the
short-lived wpcom_is_p2_site() helper from src/utils.php — the same
package already wraps Status\Host for is_woa_site() but the dedicated
P2 helper makes its own wrapper unnecessary.

Status\Host::is_p2_site() short-circuits to false when there is no
wpcom site id, so the P2 stylesheet/WPForTeams tests now define
IS_WPCOM in their isolated process to route get_wpcom_site_id()
through get_current_blog_id() (matching the pattern in
projects/packages/status/tests/php/Host_Test.php).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: paulopmt1

projects/packages/jetpack-mu-wpcom/src/features/survicate/class-survicate.php

@@ -61,7 +61,7 @@ private function should_load() {
 		}
 
 		// Atomic powers Automattic's internal P2s; surveys must never reach them.
-		if ( wpcom_is_p2_site() ) {
+		if ( ( new \Automattic\Jetpack\Status\Host() )->is_p2_site() ) {
 			return false;
 		}
 

projects/packages/jetpack-mu-wpcom/src/utils.php

@@ -213,20 +213,3 @@ function wpcom_has_blog_sticker( $blog_sticker, $blog_id ) {
 	}
 	return false;
 }
-
-/**
- * Whether the current site is a P2.
- *
- * @return bool
- */
-function wpcom_is_p2_site() {
-	if ( str_contains( get_stylesheet(), 'pub/p2' ) ) {
-		return true;
-	}
-
-	if ( function_exists( '\WPForTeams\is_wpforteams_site' ) ) {
-		return \WPForTeams\is_wpforteams_site( get_current_blog_id() );
-	}
-
-	return false;
-}

projects/packages/jetpack-mu-wpcom/tests/php/features/survicate/Survicate_Test.php

@@ -219,19 +219,26 @@ public function test_should_load_returns_true_for_english_locales( $locale ) {
 
 	/**
 	 * Tests that should_load returns false on a P2 site detected via stylesheet.
+	 *
+	 * Status\Host::is_p2_site() short-circuits to false unless get_wpcom_site_id()
+	 * returns a value, so define IS_WPCOM to route through get_current_blog_id().
+	 *
+	 * @runInSeparateProcess
+	 * @preserveGlobalState disabled
 	 */
+	#[RunInSeparateProcess]
+	#[PreserveGlobalState( false )]
 	public function test_should_load_returns_false_on_p2_site_via_stylesheet() {
+		if ( ! defined( 'IS_WPCOM' ) ) {
+			define( 'IS_WPCOM', true );
+		}
+
+		add_filter( 'stylesheet', static fn () => 'pub/p2-2020' );
+
 		$this->set_admin_context();
 		$this->create_and_login_user();
 
-		$stylesheet_filter = static fn () => 'pub/p2-2020';
-		add_filter( 'stylesheet', $stylesheet_filter );
-
-		try {
-			$this->assertFalse( $this->call_private_method( 'should_load' ) );
-		} finally {
-			remove_filter( 'stylesheet', $stylesheet_filter );
-		}
+		$this->assertFalse( $this->call_private_method( 'should_load' ) );
 	}
 
 	/**
@@ -243,6 +250,10 @@ public function test_should_load_returns_false_on_p2_site_via_stylesheet() {
 	#[RunInSeparateProcess]
 	#[PreserveGlobalState( false )]
 	public function test_should_load_returns_false_on_p2_site_via_wpforteams() {
+		if ( ! defined( 'IS_WPCOM' ) ) {
+			define( 'IS_WPCOM', true );
+		}
+
 		require_once __DIR__ . '/fixtures/wpforteams-stub.php';
 
 		$this->set_admin_context();