Avoid storing the full user object in notifications meta

admin/class-yoast-notification-center.php

@@ -716,7 +716,6 @@ private static function get_user_input( $key ) {
 	 * @return void
 	 */
 	private function retrieve_notifications_from_storage( $user_id ) {
-
 		if ( $this->notifications_retrieved ) {
 			return;
 		}
@@ -735,6 +734,14 @@ private function retrieve_notifications_from_storage( $user_id ) {
 			// Apply array_values to ensure we get a 0-indexed array.
 			$notifications = array_values( array_filter( $notifications, [ $this, 'filter_notification_current_user' ] ) );
 
+			foreach ( $notifications as $notification ) {
+				$notification_has_been_updated = $notification->user_to_user_id();
+				// Just one notification changed is enough to update the storage.
+				if ( $notification_has_been_updated ) {
+					$this->notifications_need_storage = true;
+				}
+			}
+
 			$this->notifications[ $user_id ] = $notifications;
 		}
 	}

admin/class-yoast-notification.php

@@ -72,7 +72,7 @@ class Yoast_Notification {
 	private $defaults = [
 		'type'             => self::UPDATED,
 		'id'               => '',
-		'user'             => null,
+		'user_id'          => null,
 		'nonce'            => null,
 		'priority'         => 0.5,
 		'data_json'        => [],
@@ -110,12 +110,12 @@ public function get_id() {
 	}
 
 	/**
-	 * Retrieve the user to show the notification for.
+	 * Retrieve the id of the user to show the notification for.
 	 *
-	 * @return WP_User The user to show this notification for.
+	 * @return int The user id.
 	 */
 	public function get_user() {
-		return $this->options['user'];
+		return $this->options['user_id'];
 	}
 
 	/**
@@ -127,7 +127,7 @@ public function get_user() {
 	 */
 	public function get_user_id() {
 		if ( $this->get_user() !== null ) {
-			return $this->get_user()->ID;
+			return $this->get_user();
 		}
 		return get_current_user_id();
 	}
@@ -220,7 +220,7 @@ public function display_for_current_user() {
 	 */
 	public function match_capabilities() {
 		// Super Admin can do anything.
-		if ( is_multisite() && is_super_admin( $this->options['user']->ID ) ) {
+		if ( is_multisite() && is_super_admin( $this->options['user_id'] ) ) {
 			return true;
 		}
 
@@ -280,7 +280,15 @@ public function match_capabilities() {
 	 * @return bool
 	 */
 	private function has_capability( $capability ) {
-		$user = $this->options['user'];
+		$user_id = $this->options['user_id'];
+		if ( ! is_numeric( $user_id ) ) {
+			return false;
+		}
+		$user = get_user_by( 'id', $user_id );
+		if ( ! $user ) {
+			return false;
+		}
+
 		return $user->has_cap( $capability );
 	}
 
@@ -396,9 +404,10 @@ private function normalize_options( $options ) {
 			$options['capabilities'] = [ 'wpseo_manage_options' ];
 		}
 
-		// Set to the current user if not supplied.
-		if ( $options['user'] === null ) {
-			$options['user'] = wp_get_current_user();
+		// Set to the id of the current user if not supplied.
+		if ( $options['user_id'] === null ) {
+			$user               = wp_get_current_user();
+			$options['user_id'] = (int) $user->ID;
 		}
 
 		return $options;
@@ -413,4 +422,22 @@ private function normalize_options( $options ) {
 	private function parse_attributes( &$value, $key ) {
 		$value = sprintf( '%s="%s"', sanitize_key( $key ), esc_attr( $value ) );
 	}
+
+	/**
+	 * Unsets user field if present and set user_id.
+	 *
+	 * @internal This is meant to be used by the Yoast SEO plugin only.
+	 *
+	 * @return bool If the user field was present.
+	 */
+	public function user_to_user_id() {
+		if ( array_key_exists( 'user', $this->options ) ) {
+			// No check needed as we call this once the notification has already been stored.
+			$user_id = $this->options['user']->ID;
+			unset( $this->options['user'] );
+			$this->options['user_id'] = $user_id;
+			return true;
+		}
+		return false;
+	}
 }

tests/integration/notifications/test-class-yoast-notification-center.php

@@ -806,15 +806,15 @@ public function test_add_notifications_for_multiple_users() {
 		$notification_for_user_1 = new Yoast_Notification(
 			'Hello, user 1!',
 			[
-				'user'         => $user_mock_1,
+				'user_id'      => $user_mock_1->ID,
 				'capabilities' => [ 'wpseo_manage_options' ],
 			]
 		);
 
 		$notification_for_user_2 = new Yoast_Notification(
 			'Hello, user 2!',
 			[
-				'user'         => $user_mock_2,
+				'user_id'      => $user_mock_2->ID,
 				'capabilities' => [ 'wpseo_manage_options' ],
 			]
 		);
@@ -841,13 +841,15 @@ public function test_add_notifications_only_once_for_user() {
 
 		$instance = $this->get_notification_center();
 
-		$user_mock = $this->mock_wp_user( 3, [ 'wpseo_manage_options' => true ] );
+		$user_id = $this->factory->user->create();
+		$user    = new WP_User( $user_id );
+		$user->add_cap( 'wpseo_manage_options' );
 
 		$notification = new Yoast_Notification(
 			'Hello, user 3!',
 			[
 				'id'           => 'Yoast_Notification_Test',
-				'user'         => $user_mock,
+				'user_id'      => $user_id,
 				'capabilities' => [ 'wpseo_manage_options' ],
 			]
 		);
@@ -856,7 +858,7 @@ public function test_add_notifications_only_once_for_user() {
 		$instance->add_notification( $notification );
 
 		$expected = [ $notification ];
-		$actual   = $instance->get_notifications_for_user( 3 );
+		$actual   = $instance->get_notifications_for_user( $user_id );
 
 		$this->assertEquals( $expected, $actual );
 	}

tests/integration/notifications/test-class-yoast-notification.php

@@ -12,6 +12,13 @@
  */
 class Yoast_Notification_Test extends WPSEO_UnitTestCase {
 
+	/**
+	 * User ID.
+	 *
+	 * @var int
+	 */
+	private $user_id;
+
 	/**
 	 * Test capability filters get set.
 	 *
@@ -26,6 +33,20 @@ class Yoast_Notification_Test extends WPSEO_UnitTestCase {
 	 */
 	private $verify_capability_match_filter_args = [];
 
+	/**
+	 * Create user with proper caps.
+	 */
+	public function set_up() {
+		parent::set_up();
+
+		$this->user_id = $this->factory->user->create();
+
+		$user = new WP_User( $this->user_id );
+		$user->add_cap( 'wpseo_manage_options' );
+
+		wp_set_current_user( $this->user_id );
+	}
+
 	/**
 	 * No ID is not persistent.
 	 */
@@ -40,12 +61,13 @@ public function test_not_persistent() {
 	public function test_set_defaults() {
 		$subject = new Yoast_Notification( 'message', [] );
 		$test    = $subject->to_array();
+		$user    = wp_get_current_user();
 
 		$this->assertEquals(
 			[
 				'type'             => 'updated',
 				'id'               => '',
-				'user'             => wp_get_current_user(),
+				'user_id'          => $user->ID,
 				'nonce'            => null,
 				'priority'         => 0.5,
 				'data_json'        => [],
@@ -168,6 +190,7 @@ public function test_match_any_pass() {
 			]
 		);
 
+
 		$this->assertTrue( $subject->display_for_current_user() );
 
 		$this->remove_cap( 'bla' );

tests/unit/admin/admin-features-test.php

@@ -38,9 +38,12 @@ private function get_admin_with_expectations() {
 			->with( 'https://example.org', 'dismiss-5star-upsell' )
 			->andReturn( 'https://example.org?_wpnonce=test-nonce' );
 
-			Monkey\Functions\expect( 'wp_get_current_user' )
-				->once()
-				->andReturn( Mockery::mock( WP_User::class ) );
+		$admin_user     = Mockery::mock( WP_User::class );
+		$admin_user->ID = 1;
+
+		Monkey\Functions\expect( 'wp_get_current_user' )
+			->once()
+			->andReturn( $admin_user );
 
 		return new WPSEO_Admin();
 	}

tests/unit/admin/admin-gutenberg-compatibility-notification-test.php

@@ -22,6 +22,13 @@
  */
 class WPSEO_Admin_Gutenberg_Compatibility_Notification_Test extends TestCase {
 
+	/**
+	 * Holds the admin user mock instance.
+	 *
+	 * @var WP_User
+	 */
+	private $admin_user;
+
 	/**
 	 * Holds the WPSEO_Gutenberg_Compatibility mock instance.
 	 *
@@ -49,6 +56,11 @@ class WPSEO_Admin_Gutenberg_Compatibility_Notification_Test extends TestCase {
 	public function set_up() {
 		parent::set_up();
 
+		$this->stubTranslationFunctions();
+
+		$this->admin_user     = Mockery::mock( WP_User::class );
+		$this->admin_user->ID = 1;
+
 		$this->gutenberg_compatibility_mock = Mockery::mock( WPSEO_Gutenberg_Compatibility::class )->makePartial();
 		$this->notification_center_mock     = Mockery::mock( Yoast_Notification_Center::class );
 
@@ -120,22 +132,17 @@ public function data_provider_manage_notification_remove_notification() {
 	 * @covers WPSEO_Gutenberg_Compatibility::get_installed_version
 	 */
 	public function test_manage_notification_gutenberg_show_notification() {
-		Monkey\Functions\stubs(
-			[
-				'__'                  => null,
-				'wp_get_current_user' => static function() {
-					return null;
-				},
-			]
-		);
-
 		$this->gutenberg_compatibility_mock->allows(
 			[
 				'is_installed'        => true,
 				'is_fully_compatible' => false,
 			]
 		);
 
+		Monkey\Functions\expect( 'wp_get_current_user' )
+			->once()
+			->andReturn( $this->admin_user );
+
 		$this->notification_center_mock->expects( 'add_notification' )->once()->withArgs(
 			static function ( $arg ) {
 				// Verify that the added notification is a Yoast_Notification object and has the correct id.

tests/unit/content-type-visibility/application/content-type-visibility-watcher-actions-test.php

@@ -21,6 +21,13 @@
  */
 class Content_Type_Visibility_Watcher_Actions_Test extends TestCase {
 
+	/**
+	 * Holds the admin user mock instance.
+	 *
+	 * @var WP_User
+	 */
+	private $admin_user;
+
 	/**
 	 * Holds the Options_Helper instance.
 	 *
@@ -57,6 +64,9 @@ protected function set_up() {
 
 		$this->stubTranslationFunctions();
 
+		$this->admin_user     = Mockery::mock( WP_User::class );
+		$this->admin_user->ID = 1;
+
 		$this->options                            = Mockery::mock( Options_Helper::class );
 		$this->notification_center                = Mockery::mock( Yoast_Notification_Center::class );
 		$this->content_type_dismiss_notifications = Mockery::mock( Content_Type_Visibility_Dismiss_Notifications::class );
@@ -310,10 +320,13 @@ public function test_maybe_add_notification() {
 			[
 				'esc_url'             => 'https://yoa.st/3.0-content-types',
 				'admin_url'           => 'admin.php?page=wpseo_page_settings',
-				'wp_get_current_user' => Mockery::mock( WP_User::class ),
 			]
 		);
 
+		Monkey\Functions\expect( 'wp_get_current_user' )
+			->once()
+			->andReturn( $this->admin_user );
+
 		$this->notification_center
 			->expects( 'add_notification' )
 			->once();

tests/unit/inc/addon-manager-test.php

@@ -1157,8 +1157,12 @@ public function test_create_notification( $product_name, $short_link ) {
 			]
 		);
 
+		$admin_user     = Mockery::mock( WP_User::class );
+		$admin_user->ID = 1;
+
 		Monkey\Functions\expect( 'wp_get_current_user' )
-			->twice();
+			->twice()
+			->andReturn( $admin_user );
 
 		Monkey\Functions\expect( 'YoastSEO' )
 			->once()

tests/unit/integrations/admin/indexing-notification-integration-test.php

@@ -344,8 +344,10 @@ public function test_maybe_create_notification_with_indexing_failed_reason() {
 			->once()
 			->andReturn( Indexing_Reasons::REASON_INDEXING_FAILED );
 
+		$admin_user     = Mockery::mock( WP_User::class );
+		$admin_user->ID = 1;
 		Monkey\Functions\expect( 'wp_get_current_user' )
-			->andReturn( 'user' );
+			->andReturn( $admin_user );
 
 		$this->notification_helper
 			->expects( 'restore_notification' )
@@ -400,8 +402,10 @@ public function test_maybe_create_notification_with_indexing_reasons( $reason )
 			->once()
 			->andReturn( $reason );
 
+		$admin_user     = Mockery::mock( WP_User::class );
+		$admin_user->ID = 1;
 		Monkey\Functions\expect( 'wp_get_current_user' )
-			->andReturn( 'user' );
+			->andReturn( $admin_user );
 
 		$this->notification_helper
 			->expects( 'restore_notification' )

tests/unit/integrations/third-party/wpml-wpseo-notification-test.php

@@ -120,8 +120,10 @@ public function test_notifies_when_not_installed() {
 		// Mock that the Yoast SEO Multilingual plugin is not installed and activated.
 		$this->wpml_wpseo_conditional->expects( 'is_met' )->andReturnFalse();
 
+		$admin_user     = Mockery::mock( WP_User::class );
+		$admin_user->ID = 1;
 		Monkey\Functions\expect( 'wp_get_current_user' )
-			->andReturn( 'user' );
+			->andReturn( $admin_user );
 
 		$this->notification_center
 			->expects( 'add_notification' )