Fix: Default value for empty movedTo field (#1539)

* Fix: Default value for empty `movedTo` field

* Add changelog

* fix phpcs issues

* Add unit test

Author: pfefferle

.github/changelog/1539-from-description

@@ -0,0 +1,4 @@
+Significance: patch
+Type: fixed
+
+So not show `movedTo` attribute instead of setting it to `false` if empty.

includes/model/class-blog.php

@@ -576,6 +576,7 @@ public function get_also_known_as() {
 	 * @return string The movedTo.
 	 */
 	public function get_moved_to() {
-		return \get_option( 'activitypub_blog_user_moved_to' );
+		// phpcs:ignore Universal.Operators.DisallowShortTernary.Found
+		return \get_option( 'activitypub_blog_user_moved_to' ) ?: null;
 	}
 }

includes/model/class-user.php

@@ -446,6 +446,7 @@ public function get_also_known_as() {
 	 * @return string The movedTo.
 	 */
 	public function get_moved_to() {
-		return \get_user_option( 'activitypub_moved_to', $this->_id );
+		// phpcs:ignore Universal.Operators.DisallowShortTernary.Found
+		return \get_user_option( 'activitypub_moved_to', $this->_id ) ?: null;
 	}
 }

tests/includes/model/class-test-user.php

@@ -70,4 +70,24 @@ public function test_icon() {
 		$this->assertArrayHasKey( 'url', $icon );
 		$this->assertNotSame( wp_get_attachment_url( $attachment_id ), $icon['url'] );
 	}
+
+	/**
+	 * Tests the get_moved_to method.
+	 *
+	 * @covers ::get_moved_to
+	 */
+	public function test_get_moved_to() {
+		$user_id = self::factory()->user->create( array( 'role' => 'author' ) );
+		$user    = User::from_wp_user( $user_id );
+
+		// No value => should not even be set.
+		$this->assertArrayNotHasKey( 'movedTo', $user->to_array( false ) );
+
+		// Set movedTo.
+		\update_user_option( $user_id, 'activitypub_moved_to', 'https://example.com' );
+
+		$user = User::from_wp_user( $user_id )->to_array( false );
+		$this->assertArrayHasKey( 'movedTo', $user );
+		$this->assertSame( 'https://example.com', $user['movedTo'] );
+	}
 }