phan

Author: bindlegirl

projects/plugins/wpcomsh/connection/class-atomic-storage-provider.php

@@ -53,10 +53,12 @@ public function get( $option_name ) {
 					return intval( $persistent_data->JETPACK_BLOG_ID ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
 
 				case 'master_user':
-					return $this->get_master_user_id( $persistent_data->JETPACK_CONNECTION_OWNER_TOKEN ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					$token = $persistent_data->JETPACK_CONNECTION_OWNER_TOKEN; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					return $token ? $this->get_master_user_id( $token ) : false;
 
 				case 'user_tokens':
-					return $this->get_user_tokens( $persistent_data->JETPACK_CONNECTION_OWNER_TOKEN ); // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					$token = $persistent_data->JETPACK_CONNECTION_OWNER_TOKEN; // phpcs:ignore WordPress.NamingConventions.ValidVariableName.UsedPropertyNotSnakeCase
+					return $token ? $this->get_user_tokens( $token ) : false;
 			}
 
 			return null;

projects/plugins/wpcomsh/tests/AtomicStorageProviderTest.php

@@ -26,9 +26,6 @@ class AtomicStorageProviderTest extends WP_UnitTestCase {
 	public function set_up() {
 		parent::set_up();
 
-		// Reset mock data
-		Atomic_Persistent_Data::$data = array();
-
 		// Create provider instance
 		$this->provider = new Atomic_Storage_Provider();
 
@@ -174,9 +171,6 @@ public function test_get_user_tokens_existing_matching() {
 		$user_id       = static::factory()->user->create( array( 'user_email' => '[email protected]' ) );
 		$other_user_id = static::factory()->user->create( array( 'user_email' => '[email protected]' ) );
 
-		// Set master_user directly in database
-		update_option( 'master_user', $user_id );
-
 		// Set existing tokens with other users
 		$existing_tokens = array(
 			$user_id       => 'token.secret.' . $user_id,