Merge branch 'master' into 630-fix-uninstall

WordPress · Sep 18, 2024 · 077c220 · 077c220
2 parents 86bc007 + acd9e9c
commit 077c220
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 24 deletions.
diff --git a/class-two-factor-core.php b/class-two-factor-core.php
@@ -1262,6 +1262,7 @@ public static function current_user_can_update_two_factor_options( $context = 'd
 		 * Return a falsey value (false, 0) if you wish to never require revalidation.
 		 *
 		 * @param int    $two_factor_revalidate_time The grace time between last validation time and when it'll be accepted. Default 10 minutes (in seconds).
+		 * @param int    $user_id                    The user ID.
 		 * @param string $context                    The context in use, 'display' or 'save'. Save has twice the grace time.
 		 */
 		$two_factor_revalidate_time = apply_filters( 'two_factor_revalidate_time', 10 * MINUTE_IN_SECONDS, $user_id, $context );

diff --git a/providers/class-two-factor-backup-codes.php b/providers/class-two-factor-backup-codes.php
@@ -40,7 +40,7 @@ protected function __construct() {
 		add_action( 'two_factor_user_options_' . __CLASS__, array( $this, 'user_options' ) );
 		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
 
-		return parent::__construct();
+		parent::__construct();
 	}
 
 	/**

diff --git a/providers/class-two-factor-dummy.php b/providers/class-two-factor-dummy.php
@@ -21,7 +21,7 @@ class Two_Factor_Dummy extends Two_Factor_Provider {
 	 */
 	protected function __construct() {
 		add_action( 'two_factor_user_options_' . __CLASS__, array( $this, 'user_options' ) );
-		return parent::__construct();
+		parent::__construct();
 	}
 
 	/**

diff --git a/providers/class-two-factor-email.php b/providers/class-two-factor-email.php
@@ -42,7 +42,7 @@ class Two_Factor_Email extends Two_Factor_Provider {
 	 */
 	protected function __construct() {
 		add_action( 'two_factor_user_options_' . __CLASS__, array( $this, 'user_options' ) );
-		return parent::__construct();
+		parent::__construct();
 	}
 
 	/**

diff --git a/providers/class-two-factor-fido-u2f-admin.php b/providers/class-two-factor-fido-u2f-admin.php
@@ -230,7 +230,7 @@ public static function show_user_profile( $user ) {
 	 * @static
 	 *
 	 * @param int $user_id User ID.
-	 * @return false
+	 * @return void|never
 	 */
 	public static function catch_submission( $user_id ) {
 		if ( ! empty( $_REQUEST['do_new_security_key'] ) ) {
@@ -243,7 +243,7 @@ public static function catch_submission( $user_id ) {
 
 				Two_Factor_FIDO_U2F::add_security_key( $user_id, $reg );
 			} catch ( Exception $e ) {
-				return false;
+				return;
 			}
 
 			delete_user_meta( $user_id, self::REGISTER_DATA_USER_META_KEY );

diff --git a/providers/class-two-factor-fido-u2f.php b/providers/class-two-factor-fido-u2f.php
@@ -65,7 +65,7 @@ protected function __construct() {
 
 		add_action( 'two_factor_user_options_' . __CLASS__, array( $this, 'user_options' ) );
 
-		return parent::__construct();
+		parent::__construct();
 	}
 
 	/**
@@ -143,7 +143,7 @@ public static function enqueue_scripts() {
 	 * @since 0.1-dev
 	 *
 	 * @param WP_User $user WP_User object of the logged-in user.
-	 * @return null
+	 * @return void
 	 */
 	public function authentication_page( $user ) {
 		require_once ABSPATH . '/wp-admin/includes/template.php';
@@ -165,7 +165,7 @@ public function authentication_page( $user ) {
 			?>
 			<p><?php esc_html_e( 'An error occurred while creating authentication data.', 'two-factor' ); ?></p>
 			<?php
-			return null;
+			return;
 		}
 
 		wp_localize_script(

diff --git a/providers/class-two-factor-totp.php b/providers/class-two-factor-totp.php
@@ -48,7 +48,7 @@ protected function __construct() {
 		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_assets' ) );
 		add_action( 'two_factor_user_options_' . __CLASS__, array( $this, 'user_two_factor_options' ) );
 
-		return parent::__construct();
+		parent::__construct();
 	}
 
 	/**
@@ -142,7 +142,7 @@ public function enqueue_assets( $hook_suffix ) {
 	/**
 	 * Rest API endpoint for handling deactivation of TOTP.
 	 *
-	 * @param WP_Rest_Request $request The Rest Request object.
+	 * @param WP_REST_Request $request The Rest Request object.
 	 * @return array Success array.
 	 */
 	public function rest_delete_totp( $request ) {
@@ -164,7 +164,7 @@ public function rest_delete_totp( $request ) {
 	/**
 	 * REST API endpoint for setting up TOTP.
 	 *
-	 * @param WP_Rest_Request $request The Rest Request object.
+	 * @param WP_REST_Request $request The Rest Request object.
 	 * @return WP_Error|array Array of data on success, WP_Error on error.
 	 */
 	public function rest_setup_totp( $request ) {
@@ -203,8 +203,8 @@ public function rest_setup_totp( $request ) {
 	/**
 	 * Generates a URL that can be used to create a QR code.
 	 *
-	 * @param WP_User $user The user to generate a URL for.
-	 * @param string  $key  The secret key.
+	 * @param WP_User $user       The user to generate a URL for.
+	 * @param string  $secret_key The secret key.
 	 *
 	 * @return string
 	 */
@@ -260,13 +260,13 @@ public static function generate_qr_code_url( $user, $secret_key ) {
 	 * Display TOTP options on the user settings page.
 	 *
 	 * @param WP_User $user The current user being edited.
-	 * @return false
+	 * @return void
 	 *
 	 * @codeCoverageIgnore
 	 */
 	public function user_two_factor_options( $user ) {
 		if ( ! isset( $user->ID ) ) {
-			return false;
+			return;
 		}
 
 		$key = $this->get_user_totp_key( $user->ID );

diff --git a/tests/providers/class-two-factor-totp.php b/tests/providers/class-two-factor-totp.php
@@ -61,15 +61,6 @@ public function test_get_label() {
 		$this->assertStringContainsString( 'Authenticator app', $this->provider->get_label() );
 	}
 
-	/**
-	 * Verify the options list is empty.
-	 *
-	 * @covers Two_Factor_Totp::user_two_factor_options
-	 */
-	public function test_user_two_factor_options_empty() {
-		$this->assertFalse( $this->provider->user_two_factor_options( get_current_user() ) );
-	}
-
 	/**
 	 * Verify getting user options creates a key.
 	 *