From ecee75de02d4e25049243cf3499ffb8b84624bdd Mon Sep 17 00:00:00 2001
From: bindlegirl <1242807+bindlegirl@users.noreply.github.com>
Date: Thu, 13 Feb 2025 18:18:45 +0100
Subject: [PATCH] Fix phan warnings

---
 projects/packages/connection/src/class-plugin.php        | 9 ++++++++-
 .../packages/connection/src/sso/class-user-admin.php     | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/projects/packages/connection/src/class-plugin.php b/projects/packages/connection/src/class-plugin.php
index 19d66829ccde4..0054cfe9d37c5 100644
--- a/projects/packages/connection/src/class-plugin.php
+++ b/projects/packages/connection/src/class-plugin.php
@@ -31,6 +31,13 @@ class Plugin {
 	 */
 	private $slug;
 
+	/**
+	 * Users Connection Admin instance.
+	 *
+	 * @var Users_Connection_Admin
+	 */
+	private $users_connection_admin;
+
 	/**
 	 * Initialize the plugin manager.
 	 *
@@ -41,7 +48,7 @@ public function __construct( $slug ) {
 
 		// Always initialize Users_Connection_Admin - it will handle its own conditional loading
 		if ( is_admin() ) {
-			new Users_Connection_Admin();
+			$this->users_connection_admin = new Users_Connection_Admin();
 		}
 	}
 
diff --git a/projects/packages/connection/src/sso/class-user-admin.php b/projects/packages/connection/src/sso/class-user-admin.php
index b929cf77316aa..bc5d7e6655ab9 100644
--- a/projects/packages/connection/src/sso/class-user-admin.php
+++ b/projects/packages/connection/src/sso/class-user-admin.php
@@ -1207,7 +1207,7 @@ public function jetpack_show_connection_status( $val, $col, $user_id ) {
 	 * Creates error notices and redirects the user to the previous page.
 	 *
 	 * @param array $query_params - query parameters added to redirection URL.
-	 * @return string|void The redirect URL or void on failure.
+	 * @return void
 	 */
 	public function create_error_notice_and_redirect( $query_params ) {
 		$ref = wp_get_referer();
@@ -1219,7 +1219,8 @@ public function create_error_notice_and_redirect( $query_params ) {
 			$query_params,
 			$ref
 		);
-		return wp_safe_redirect( $url );
+		wp_safe_redirect( $url );
+		exit;
 	}
 
 	/**