From 2c2065f151e740feaeb32582aa3d8827d17f4e9f Mon Sep 17 00:00:00 2001
From: kagg-design <info@kagg.eu>
Date: Wed, 19 Jul 2023 23:32:01 +0300
Subject: [PATCH] Use PHP 7 new features.

---
 src/php/ACFE/Form.php                         | 12 ++++-----
 src/php/Abstracts/LoginBase.php               |  4 +--
 src/php/Abstracts/LostPasswordBase.php        |  2 +-
 src/php/Asgaros/Base.php                      |  4 +--
 src/php/AutoVerify/AutoVerify.php             | 20 +++++++-------
 src/php/Avada/Form.php                        |  6 ++---
 src/php/BackInStockNotifier/Form.php          |  6 ++---
 src/php/BeaverBuilder/Base.php                |  2 +-
 src/php/BeaverBuilder/Contact.php             |  4 +--
 src/php/BeaverBuilder/Login.php               |  4 +--
 src/php/Brizy/Base.php                        |  2 +-
 src/php/CF7/CF7.php                           | 10 +++----
 src/php/ClassifiedListing/Contact.php         |  6 ++---
 src/php/ClassifiedListing/Login.php           |  2 +-
 src/php/ClassifiedListing/Register.php        |  2 +-
 src/php/ColorlibCustomizer/Base.php           |  2 +-
 src/php/ColorlibCustomizer/Login.php          |  2 +-
 src/php/ColorlibCustomizer/LostPassword.php   |  2 +-
 src/php/ColorlibCustomizer/Register.php       |  2 +-
 src/php/DelayedScript/DelayedScript.php       |  6 +++--
 src/php/Divi/Comment.php                      |  2 +-
 src/php/Divi/EmailOptin.php                   |  2 +-
 src/php/Divi/Fix.php                          |  2 +-
 src/php/Divi/Login.php                        |  4 +--
 src/php/DownloadManager/DownloadManager.php   |  3 ++-
 src/php/ElementorPro/HCaptchaHandler.php      | 27 ++++++++++---------
 src/php/FluentForm/Form.php                   |  8 +++---
 src/php/FormidableForms/Form.php              |  8 +++---
 src/php/Forminator/Form.php                   |  6 ++---
 src/php/GiveWP/Base.php                       |  2 +-
 src/php/GravityForms/Form.php                 |  5 ++--
 src/php/Helpers/HCaptcha.php                  |  6 ++---
 src/php/Jetpack/JetpackBase.php               |  6 ++---
 src/php/Jetpack/JetpackForm.php               |  6 ++---
 src/php/Kadence/Form.php                      |  6 ++---
 src/php/Mailchimp/Form.php                    |  6 ++---
 src/php/Main.php                              | 10 +++----
 src/php/MemberPress/Login.php                 |  2 +-
 src/php/MemberPress/Register.php              |  2 +-
 src/php/Migrations/Migrations.php             |  4 +--
 src/php/NF/Fields.php                         |  4 ++-
 src/php/NF/NF.php                             |  8 +++---
 src/php/PaidMembershipsPro/Login.php          |  4 +--
 src/php/Quform/Quform.php                     |  5 ++--
 src/php/Sendinblue/Sendinblue.php             |  5 ++--
 src/php/Settings/Abstracts/SettingsBase.php   | 24 +++++++++--------
 .../Settings/Abstracts/SettingsInterface.php  |  2 +-
 src/php/Settings/General.php                  |  4 +--
 src/php/Settings/Integrations.php             |  8 +++---
 src/php/Settings/PluginSettingsBase.php       |  6 ++---
 src/php/Settings/Settings.php                 | 12 ++++-----
 src/php/Settings/SystemInfo.php               | 12 ++++-----
 src/php/Subscriber/Form.php                   |  4 +--
 src/php/UM/Base.php                           | 11 +++++---
 src/php/UM/Login.php                          |  6 ++---
 src/php/UM/LostPassword.php                   |  2 +-
 src/php/WC/Checkout.php                       |  2 ++
 src/php/WC/Login.php                          |  2 +-
 src/php/WC/OrderTracking.php                  |  2 +-
 src/php/WC/Register.php                       |  2 +-
 src/php/WP/Comment.php                        |  8 +++---
 src/php/WP/Login.php                          |  2 +-
 src/php/WP/PasswordProtected.php              |  3 ++-
 src/php/WP/Register.php                       |  2 +-
 src/php/WPDiscuz/Comment.php                  |  4 +--
 src/php/WPForms/Form.php                      |  5 ++--
 src/php/includes/functions.php                |  4 +--
 src/php/includes/request.php                  | 11 ++++----
 68 files changed, 201 insertions(+), 180 deletions(-)

diff --git a/src/php/ACFE/Form.php b/src/php/ACFE/Form.php
index 6883b50b..a13d9c63 100644
--- a/src/php/ACFE/Form.php
+++ b/src/php/ACFE/Form.php
@@ -59,7 +59,7 @@ public function init_hooks() {
 	 *
 	 * @return void
 	 */
-	public function before_fields( $args ) {
+	public function before_fields( array $args ) {
 		$this->form_id = $args['ID'];
 	}
 
@@ -71,7 +71,7 @@ public function before_fields( $args ) {
 	 * @return void
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function remove_recaptcha_render( $field ) {
+	public function remove_recaptcha_render( array $field ) {
 		if ( ! $this->is_recaptcha( $field ) ) {
 			return;
 		}
@@ -88,7 +88,7 @@ public function remove_recaptcha_render( $field ) {
 	 *
 	 * @return void
 	 */
-	public function add_hcaptcha( $field ) {
+	public function add_hcaptcha( array $field ) {
 		if ( ! $this->is_recaptcha( $field ) ) {
 			return;
 		}
@@ -122,7 +122,7 @@ public function add_hcaptcha( $field ) {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function remove_recaptcha_verify( $valid, $value, $field, $input ): bool {
+	public function remove_recaptcha_verify( bool $valid, string $value, array $field, string $input ): bool {
 		$recaptcha = acf_get_field_type( 'acfe_recaptcha' );
 
 		remove_filter( self::VALIDATION_HOOK, [ $recaptcha, 'validate_value' ] );
@@ -141,7 +141,7 @@ public function remove_recaptcha_verify( $valid, $value, $field, $input ): bool
 	 * @return bool
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $valid, $value, $field, $input ): bool {
+	public function verify( bool $valid, string $value, array $field, string $input ): bool {
 		if ( ! $field['required'] ) {
 			return $valid;
 		}
@@ -185,7 +185,7 @@ public function enqueue_scripts() {
 	 *
 	 * @return bool
 	 */
-	private function is_recaptcha( $field ): bool {
+	private function is_recaptcha( array $field ): bool {
 		return isset( $field['type'] ) && 'acfe_recaptcha' === $field['type'];
 	}
 }
diff --git a/src/php/Abstracts/LoginBase.php b/src/php/Abstracts/LoginBase.php
index f6bbab8f..d6dabe4e 100644
--- a/src/php/Abstracts/LoginBase.php
+++ b/src/php/Abstracts/LoginBase.php
@@ -70,7 +70,7 @@ protected function init_hooks() {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function login( $user_login, $user ) {
+	public function login( string $user_login, WP_User $user ) {
 		unset( $this->login_data[ $this->ip ] );
 
 		update_option( self::LOGIN_DATA, $this->login_data );
@@ -85,7 +85,7 @@ public function login( $user_login, $user ) {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function login_failed( $username, $error = null ) {
+	public function login_failed( string $username, WP_Error $error = null ) {
 		$this->login_data[ $this->ip ][] = time();
 
 		update_option( self::LOGIN_DATA, $this->login_data );
diff --git a/src/php/Abstracts/LostPasswordBase.php b/src/php/Abstracts/LostPasswordBase.php
index 40e4032b..82daf40a 100644
--- a/src/php/Abstracts/LostPasswordBase.php
+++ b/src/php/Abstracts/LostPasswordBase.php
@@ -53,7 +53,7 @@ public function add_captcha() {
 	 *
 	 * @return void
 	 */
-	public function verify( $error ) {
+	public function verify( WP_Error $error ) {
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
 		$post_value = isset( $_POST[ static::POST_KEY ] ) ?
 			sanitize_text_field( wp_unslash( $_POST[ static::POST_KEY ] ) ) :
diff --git a/src/php/Asgaros/Base.php b/src/php/Asgaros/Base.php
index 5f6733ad..0e9fb874 100644
--- a/src/php/Asgaros/Base.php
+++ b/src/php/Asgaros/Base.php
@@ -42,7 +42,7 @@ private function init_hooks() {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection RegExpUnnecessaryNonCapturingGroup
 	 */
-	public function add_captcha( $output, $tag, $attr, $m ) {
+	public function add_captcha( string $output, string $tag, $attr, array $m ) {
 		if ( 'forum' !== $tag ) {
 			return $output;
 		}
@@ -77,7 +77,7 @@ public function add_captcha( $output, $tag, $attr, $m ) {
 	 *
 	 * @return bool
 	 */
-	public function verify( $verified ): bool {
+	public function verify( bool $verified ): bool {
 		global $asgarosforum;
 
 		$error_message = hcaptcha_get_verify_message(
diff --git a/src/php/AutoVerify/AutoVerify.php b/src/php/AutoVerify/AutoVerify.php
index 6bab99e2..db9af50c 100644
--- a/src/php/AutoVerify/AutoVerify.php
+++ b/src/php/AutoVerify/AutoVerify.php
@@ -41,7 +41,7 @@ private function init_hooks() {
 	 *
 	 * @return string
 	 */
-	public function content_filter( $content ): string {
+	public function content_filter( string $content ): string {
 		if ( ! $this->is_frontend() ) {
 			return $content;
 		}
@@ -182,7 +182,7 @@ private function is_cli(): bool {
 	 *
 	 * @param array $forms Forms found in the content.
 	 */
-	private function register_forms( $forms ) {
+	private function register_forms( array $forms ) {
 		$forms_data = [];
 
 		foreach ( $forms as $form ) {
@@ -210,7 +210,7 @@ private function register_forms( $forms ) {
 	 *
 	 * @return string
 	 */
-	private function get_form_action( $form ): string {
+	private function get_form_action( string $form ): string {
 		$form_action = '';
 
 		if ( preg_match( '#<form [\S\s]*?action="(.*?)"[\S\s]*?>#', $form, $m ) ) {
@@ -235,7 +235,7 @@ private function get_form_action( $form ): string {
 	 *
 	 * @return array
 	 */
-	private function get_visible_input_names( $form ): array {
+	private function get_visible_input_names( string $form ): array {
 		$names = [];
 
 		if ( ! preg_match_all( '#<input[\S\s]+?>#', $form, $matches ) ) {
@@ -266,7 +266,7 @@ private function get_visible_input_names( $form ): array {
 	 *
 	 * @return bool
 	 */
-	private function is_input_visible( $input ): bool {
+	private function is_input_visible( string $input ): bool {
 		return ! preg_match( '#type\s*?=\s*?["\']hidden["\']#', $input );
 	}
 
@@ -277,7 +277,7 @@ private function is_input_visible( $input ): bool {
 	 *
 	 * @return string|null
 	 */
-	private function get_input_name( $input ) {
+	private function get_input_name( string $input ) {
 		if ( preg_match( '#name\s*?=\s*?["\'](.+?)["\']#', $input, $matches ) ) {
 			return $matches[1];
 		}
@@ -292,7 +292,7 @@ private function get_input_name( $input ) {
 	 *
 	 * @return string|null
 	 */
-	private function get_form_auto( $form ) {
+	private function get_form_auto( string $form ) {
 		if ( preg_match( '#class="h-captcha"[\S\s]+?data-auto="(.*)"[\S\s]*?>#', $form, $matches ) ) {
 			return $matches[1];
 		}
@@ -307,7 +307,7 @@ private function get_form_auto( $form ) {
 	 *
 	 * @return bool
 	 */
-	private function is_form_auto( $form ): bool {
+	private function is_form_auto( string $form ): bool {
 		return 'true' === $this->get_form_auto( $form );
 	}
 
@@ -316,7 +316,7 @@ private function is_form_auto( $form ): bool {
 	 *
 	 * @param array $forms_data Forms data to update in transient.
 	 */
-	private function update_transient( $forms_data ) {
+	private function update_transient( array $forms_data ) {
 		$transient        = get_transient( self::TRANSIENT );
 		$registered_forms = $transient ?: [];
 
@@ -359,7 +359,7 @@ private function update_transient( $forms_data ) {
 	 *
 	 * @return bool
 	 */
-	private function is_form_registered( $request_uri ): bool {
+	private function is_form_registered( string $request_uri ): bool {
 		$registered_forms = get_transient( self::TRANSIENT );
 
 		if ( empty( $registered_forms ) ) {
diff --git a/src/php/Avada/Form.php b/src/php/Avada/Form.php
index 25a0ae87..f711c9a6 100644
--- a/src/php/Avada/Form.php
+++ b/src/php/Avada/Form.php
@@ -48,7 +48,7 @@ public function init_hooks() {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function form_after_open( $args, $params ) {
+	public function form_after_open( array $args, array $params ) {
 		$this->form_id = isset( $params['id'] ) ? (int) $params['id'] : 0;
 	}
 
@@ -61,7 +61,7 @@ public function form_after_open( $args, $params ) {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $html, $args ): string {
+	public function add_hcaptcha( string $html, array $args ): string {
 		if ( false === strpos( $html, '<button type="submit"' ) ) {
 			return $html;
 		}
@@ -83,7 +83,7 @@ public function add_hcaptcha( $html, $args ): string {
 	 *
 	 * @return bool|void
 	 */
-	public function verify( $demo_mode ) {
+	public function verify( bool $demo_mode ) {
 
 		// Nonce is checked by Avada.
 		// phpcs:disable WordPress.Security.NonceVerification.Missing, WordPress.Security.NonceVerification.Missing
diff --git a/src/php/BackInStockNotifier/Form.php b/src/php/BackInStockNotifier/Form.php
index 0f551f8e..c54583e8 100644
--- a/src/php/BackInStockNotifier/Form.php
+++ b/src/php/BackInStockNotifier/Form.php
@@ -65,7 +65,7 @@ public function init_hooks() {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function after_email_field( $product_id, $variation_id ) {
+	public function after_email_field( int $product_id, int $variation_id ) {
 		$this->form_id = $product_id;
 
 		ob_start();
@@ -80,7 +80,7 @@ public function after_email_field( $product_id, $variation_id ) {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function after_submit_button( $product_id, $variation_id ) {
+	public function after_submit_button( int $product_id, int $variation_id ) {
 		$output = ob_get_clean();
 
 		$args = [
@@ -108,7 +108,7 @@ public function after_submit_button( $product_id, $variation_id ) {
 	 *
 	 * @return void
 	 */
-	public function verify( $post_data, $rest_api ) {
+	public function verify( array $post_data, bool $rest_api ) {
 
 		$hcaptcha_response = $post_data['h-captcha-response'] ?? '';
 
diff --git a/src/php/BeaverBuilder/Base.php b/src/php/BeaverBuilder/Base.php
index 64dff613..4b37e94b 100644
--- a/src/php/BeaverBuilder/Base.php
+++ b/src/php/BeaverBuilder/Base.php
@@ -41,7 +41,7 @@ protected function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	protected function add_hcap_form( $out, $module ): string {
+	protected function add_hcap_form( string $out, FLButtonModule $module ): string {
 		$form_id = false !== strpos( static::ACTION, 'login' ) ? 'login' : 'contact';
 		$args    = [
 			'action' => static::ACTION,
diff --git a/src/php/BeaverBuilder/Contact.php b/src/php/BeaverBuilder/Contact.php
index 7d574008..c70da54a 100644
--- a/src/php/BeaverBuilder/Contact.php
+++ b/src/php/BeaverBuilder/Contact.php
@@ -45,7 +45,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $out, $module ): string {
+	public function add_hcaptcha( string $out, FLButtonModule $module ): string {
 
 		// Process contact form only.
 		if ( false === strpos( $out, '<form class="fl-contact-form"' ) ) {
@@ -67,7 +67,7 @@ public function add_hcaptcha( $out, $module ): string {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $mailto, $subject, $template, $headers, $settings ) {
+	public function verify( string $mailto, string $subject, string $template, array $headers, stdClass $settings ) {
 
 		$result = hcaptcha_verify_post( self::NONCE, self::ACTION );
 
diff --git a/src/php/BeaverBuilder/Login.php b/src/php/BeaverBuilder/Login.php
index 6b4c935e..f41985f6 100644
--- a/src/php/BeaverBuilder/Login.php
+++ b/src/php/BeaverBuilder/Login.php
@@ -45,7 +45,7 @@ protected function init_hooks() {
 	 *
 	 * @return string
 	 */
-	public function add_hcaptcha( $out, $module ): string {
+	public function add_hcaptcha( string $out, FLButtonModule $module ): string {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $out;
 		}
@@ -73,7 +73,7 @@ public function add_hcaptcha( $out, $module ): string {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		// phpcs:ignore WordPress.Security.NonceVerification.Missing
 		$action = isset( $_POST['action'] ) ? sanitize_text_field( wp_unslash( $_POST['action'] ) ) : '';
 
diff --git a/src/php/Brizy/Base.php b/src/php/Brizy/Base.php
index 90f133ea..d1a43396 100644
--- a/src/php/Brizy/Base.php
+++ b/src/php/Brizy/Base.php
@@ -45,7 +45,7 @@ private function init_hooks() {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $content, $project, $post, $type = '' ) {
+	public function add_captcha( string $content, Brizy_Editor_Project $project, WP_Post $post, string $type = '' ) {
 		if ( 'body' !== $type ) {
 			return $content;
 		}
diff --git a/src/php/CF7/CF7.php b/src/php/CF7/CF7.php
index 78e6d5dc..e3b446d4 100644
--- a/src/php/CF7/CF7.php
+++ b/src/php/CF7/CF7.php
@@ -50,7 +50,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function wpcf7_shortcode( $output, $tag, $attr, $m ): string {
+	public function wpcf7_shortcode( string $output, string $tag, $attr, array $m ): string {
 		if ( 'contact-form-7' !== $tag ) {
 			return $output;
 		}
@@ -89,7 +89,7 @@ public function wpcf7_shortcode( $output, $tag, $attr, $m ): string {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function cf7_hcaptcha_shortcode( $attr = [] ): string {
+	public function cf7_hcaptcha_shortcode( array $attr = [] ): string {
 		$settings          = hcaptcha()->settings();
 		$hcaptcha_site_key = $settings->get_site_key();
 		$hcaptcha_theme    = $settings->get( 'theme' );
@@ -183,7 +183,7 @@ class="<?php echo esc_attr( HCaptcha::HCAPTCHA_WIDGET_ID ); ?>"
 	 * @return WPCF7_Validation
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify_hcaptcha( $result, $tag ): WPCF7_Validation {
+	public function verify_hcaptcha( WPCF7_Validation $result, WPCF7_FormTag $tag ): WPCF7_Validation {
 		$submission = WPCF7_Submission::get_instance();
 
 		if ( null === $submission ) {
@@ -209,7 +209,7 @@ public function verify_hcaptcha( $result, $tag ): WPCF7_Validation {
 	 *
 	 * @return WPCF7_Validation
 	 */
-	private function get_invalidated_result( $result, $captcha_result = '' ): WPCF7_Validation {
+	private function get_invalidated_result( WPCF7_Validation $result, string $captcha_result = '' ): WPCF7_Validation {
 		if ( '' === $captcha_result ) {
 			$captcha_result = hcap_get_error_messages()['empty'];
 		}
@@ -253,7 +253,7 @@ public function enqueue_scripts() {
 	 *
 	 * @return string
 	 */
-	private function add_form_id_to_cf7_hcap_shortcode( $output, $form_id ): string {
+	private function add_form_id_to_cf7_hcap_shortcode( string $output, int $form_id ): string {
 		$cf7_hcap_sc_regex = get_shortcode_regex( [ self::SHORTCODE ] );
 
 		if ( ! preg_match( "/$cf7_hcap_sc_regex/", $output, $matches ) ) {
diff --git a/src/php/ClassifiedListing/Contact.php b/src/php/ClassifiedListing/Contact.php
index 5526f158..4b07066b 100644
--- a/src/php/ClassifiedListing/Contact.php
+++ b/src/php/ClassifiedListing/Contact.php
@@ -53,7 +53,7 @@ private function init_hooks() {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function before_template_part( $template_name, $located, $template_args ) {
+	public function before_template_part( string $template_name, string $located, array $template_args ) {
 		if ( 'listing/email-to-seller-form' !== $template_name ) {
 			return;
 		}
@@ -71,7 +71,7 @@ public function before_template_part( $template_name, $located, $template_args )
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function after_template_part( $template_name, $located, $template_args ) {
+	public function after_template_part( string $template_name, string $located, array $template_args ) {
 		if ( 'listing/email-to-seller-form' !== $template_name ) {
 			return;
 		}
@@ -104,7 +104,7 @@ public function after_template_part( $template_name, $located, $template_args )
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $error, $data ) {
+	public function verify( WP_Error $error, array $data ) {
 		$error_message = hcaptcha_verify_post(
 			static::NONCE,
 			static::ACTION
diff --git a/src/php/ClassifiedListing/Login.php b/src/php/ClassifiedListing/Login.php
index 1690f3cd..e4a241ae 100644
--- a/src/php/ClassifiedListing/Login.php
+++ b/src/php/ClassifiedListing/Login.php
@@ -69,7 +69,7 @@ public function add_captcha() {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
 		$rtcl_login = isset( $_POST['rtcl-login'] ) ?
 			sanitize_text_field( wp_unslash( $_POST['rtcl-login'] ) ) :
diff --git a/src/php/ClassifiedListing/Register.php b/src/php/ClassifiedListing/Register.php
index d8f8de17..e510992e 100644
--- a/src/php/ClassifiedListing/Register.php
+++ b/src/php/ClassifiedListing/Register.php
@@ -70,7 +70,7 @@ public function add_captcha() {
 	 * @return WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $validation_error, $email, $username, $password, $post ): WP_Error {
+	public function verify( WP_Error $validation_error, string $email, string $username, string $password, array $post ): WP_Error {
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
 		$rtcl_register = isset( $_POST['rtcl-register'] ) ?
 			sanitize_text_field( wp_unslash( $_POST['rtcl-register'] ) ) :
diff --git a/src/php/ColorlibCustomizer/Base.php b/src/php/ColorlibCustomizer/Base.php
index 9002df37..605769d6 100644
--- a/src/php/ColorlibCustomizer/Base.php
+++ b/src/php/ColorlibCustomizer/Base.php
@@ -48,5 +48,5 @@ public function login_head() {
 	 *
 	 * @return string
 	 */
-	abstract protected function get_style( $hcaptcha_size ): string;
+	abstract protected function get_style( string $hcaptcha_size ): string;
 }
diff --git a/src/php/ColorlibCustomizer/Login.php b/src/php/ColorlibCustomizer/Login.php
index 96eaa0de..9df07b70 100644
--- a/src/php/ColorlibCustomizer/Login.php
+++ b/src/php/ColorlibCustomizer/Login.php
@@ -19,7 +19,7 @@ class Login extends Base {
 	 *
 	 * @return string
 	 */
-	protected function get_style( $hcaptcha_size ): string {
+	protected function get_style( string $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {
diff --git a/src/php/ColorlibCustomizer/LostPassword.php b/src/php/ColorlibCustomizer/LostPassword.php
index 9541d44b..be72d914 100644
--- a/src/php/ColorlibCustomizer/LostPassword.php
+++ b/src/php/ColorlibCustomizer/LostPassword.php
@@ -19,7 +19,7 @@ class LostPassword extends Base {
 	 *
 	 * @return string
 	 */
-	protected function get_style( $hcaptcha_size ): string {
+	protected function get_style( string $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {
diff --git a/src/php/ColorlibCustomizer/Register.php b/src/php/ColorlibCustomizer/Register.php
index d3366faa..8704b3f7 100644
--- a/src/php/ColorlibCustomizer/Register.php
+++ b/src/php/ColorlibCustomizer/Register.php
@@ -19,7 +19,7 @@ class Register extends Base {
 	 *
 	 * @return string
 	 */
-	protected function get_style( $hcaptcha_size ): string {
+	protected function get_style( string $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {
diff --git a/src/php/DelayedScript/DelayedScript.php b/src/php/DelayedScript/DelayedScript.php
index 4f74c72b..fd78855b 100644
--- a/src/php/DelayedScript/DelayedScript.php
+++ b/src/php/DelayedScript/DelayedScript.php
@@ -19,8 +19,10 @@ class DelayedScript {
 	 * @param int    $delay Delay in ms.
 	 *
 	 * @return string
+	 * @noinspection PhpCastIsUnnecessaryInspection
+	 * @noinspection UnnecessaryCastingInspection
 	 */
-	public static function create( $js, $delay = 3000 ): string {
+	public static function create( string $js, int $delay = 3000 ): string {
 		ob_start();
 		?>
 		<!--suppress JSUnusedAssignment -->
@@ -93,7 +95,7 @@ function delayedLoad() {
 	 * @param array $args  Arguments.
 	 * @param int   $delay Delay in ms.
 	 */
-	public static function launch( array $args, $delay = 3000 ) {
+	public static function launch( array $args, int $delay = 3000 ) {
 		ob_start();
 
 		?>
diff --git a/src/php/Divi/Comment.php b/src/php/Divi/Comment.php
index 05953baf..4effdb79 100644
--- a/src/php/Divi/Comment.php
+++ b/src/php/Divi/Comment.php
@@ -53,7 +53,7 @@ private function init_hooks() {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function add_captcha( $output, $module_slug ) {
+	public function add_captcha( $output, string $module_slug ) {
 		if ( et_core_is_fb_enabled() || false !== strpos( $output, 'h-captcha' ) ) {
 			// Do not add captcha in frontend builder or if it already added by \HCaptcha\WP\Comment class.
 
diff --git a/src/php/Divi/EmailOptin.php b/src/php/Divi/EmailOptin.php
index 3553ceaa..1b33bc9c 100644
--- a/src/php/Divi/EmailOptin.php
+++ b/src/php/Divi/EmailOptin.php
@@ -55,7 +55,7 @@ protected function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $html, $single_name_field ): string {
+	public function add_captcha( string $html, string $single_name_field ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NONCE,
diff --git a/src/php/Divi/Fix.php b/src/php/Divi/Fix.php
index 2320f439..cc2b1297 100644
--- a/src/php/Divi/Fix.php
+++ b/src/php/Divi/Fix.php
@@ -45,7 +45,7 @@ public function register_autoload() {
 	 *
 	 * @return true|null
 	 */
-	public function prevent_loading_of_wp_test_case( $classname ) {
+	public function prevent_loading_of_wp_test_case( string $classname ) {
 		if ( 'Codeception\TestCase\WPTestCase' === $classname ) {
 			require 'WPTestCaseStub.php';
 
diff --git a/src/php/Divi/Login.php b/src/php/Divi/Login.php
index fb9668e2..65eaf7f3 100644
--- a/src/php/Divi/Login.php
+++ b/src/php/Divi/Login.php
@@ -52,7 +52,7 @@ protected function init_hooks() {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function add_captcha( $output, $module_slug ) {
+	public function add_captcha( $output, string $module_slug ) {
 		if ( et_core_is_fb_enabled() ) {
 			// Do not add captcha in frontend builder.
 
@@ -89,7 +89,7 @@ public function add_captcha( $output, $module_slug ) {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $user;
 		}
diff --git a/src/php/DownloadManager/DownloadManager.php b/src/php/DownloadManager/DownloadManager.php
index 6bda5a50..12aaef07 100644
--- a/src/php/DownloadManager/DownloadManager.php
+++ b/src/php/DownloadManager/DownloadManager.php
@@ -51,7 +51,7 @@ public function init_hooks() {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection HtmlUnknownAttribute
 	 */
-	public function add_hcaptcha( $template, $vars ): string {
+	public function add_hcaptcha( string $template, array $vars ): string {
 		$form_id = 0;
 
 		if ( preg_match( '/wpdmdl=(\d+)/', $template, $m ) ) {
@@ -89,6 +89,7 @@ public function add_hcaptcha( $template, $vars ): string {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection ForgottenDebugOutputInspection
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public function verify( $package ) {
 
diff --git a/src/php/ElementorPro/HCaptchaHandler.php b/src/php/ElementorPro/HCaptchaHandler.php
index acd6703e..891047b2 100644
--- a/src/php/ElementorPro/HCaptchaHandler.php
+++ b/src/php/ElementorPro/HCaptchaHandler.php
@@ -5,8 +5,11 @@
  * @package hcaptcha-wp
  */
 
-// phpcs:ignore Generic.Commenting.DocComment.MissingShort
+// phpcs:disable Generic.Commenting.DocComment.MissingShort
+/** @noinspection PhpUndefinedNamespaceInspection */
+/** @noinspection PhpUndefinedClassInspection */
 /** @noinspection PhpUndefinedMethodInspection */
+// phpcs:enable Generic.Commenting.DocComment.MissingShort
 
 namespace HCaptcha\ElementorPro;
 
@@ -99,7 +102,7 @@ public function init() {
 	 *
 	 * @param Module $module Module.
 	 */
-	public function register_action( $module ) {
+	public function register_action( Module $module ) {
 		$module->add_component( self::FIELD_ID, $this );
 	}
 
@@ -153,7 +156,7 @@ public static function get_hcaptcha_size() {
 	 *
 	 * @return string
 	 */
-	public static function get_setup_message() {
+	public static function get_setup_message(): string {
 		return __( 'To use hCaptcha, you need to add the Site and Secret keys.', 'hcaptcha-for-forms-and-more' );
 	}
 
@@ -162,7 +165,7 @@ public static function get_setup_message() {
 	 *
 	 * @return bool
 	 */
-	public static function is_enabled() {
+	public static function is_enabled(): bool {
 		return static::get_site_key() && static::get_secret_key();
 	}
 
@@ -173,7 +176,7 @@ public static function is_enabled() {
 	 *
 	 * @return array
 	 */
-	public function localize_settings( $settings ) {
+	public function localize_settings( array $settings ): array {
 		return array_replace_recursive(
 			$settings,
 			[
@@ -195,7 +198,7 @@ public function localize_settings( $settings ) {
 	 *
 	 * @return string
 	 */
-	protected static function get_script_handle() {
+	protected static function get_script_handle(): string {
 		return 'elementor-' . static::get_hcaptcha_name() . '-api';
 	}
 
@@ -247,7 +250,7 @@ public function enqueue_scripts() {
 	 * @param Form_Record  $record       Record.
 	 * @param Ajax_Handler $ajax_handler Ajax handler.
 	 */
-	public function validation( $record, $ajax_handler ) {
+	public function validation( Form_Record $record, Ajax_Handler $ajax_handler ) {
 		$fields = $record->get_field( [ 'type' => static::get_hcaptcha_name() ] );
 
 		if ( empty( $fields ) ) {
@@ -281,7 +284,7 @@ public function validation( $record, $ajax_handler ) {
 	 * @param int         $item_index Item index.
 	 * @param Widget_Base $widget     Widget.
 	 */
-	public function render_field( $item, $item_index, $widget ) {
+	public function render_field( array $item, int $item_index, Widget_Base $widget ) {
 		$hcaptcha_html = '<div class="elementor-field" id="form-field-' . $item['custom_id'] . '">';
 
 		$this->add_render_attributes( $item, $item_index, $widget );
@@ -316,7 +319,7 @@ public function render_field( $item, $item_index, $widget ) {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	protected function add_render_attributes( $item, $item_index, $widget ) {
+	protected function add_render_attributes( array $item, int $item_index, Widget_Base $widget ) {
 		$widget->add_render_attribute(
 			[
 				static::get_hcaptcha_name() . $item_index => [
@@ -336,7 +339,7 @@ protected function add_render_attributes( $item, $item_index, $widget ) {
 	 *
 	 * @return array
 	 */
-	public function add_field_type( $field_types ) {
+	public function add_field_type( array $field_types ): array {
 		$field_types[ self::FIELD_ID ] = __( 'hCaptcha', 'elementor-pro' );
 
 		return $field_types;
@@ -355,7 +358,7 @@ public function add_field_type( $field_types ) {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function modify_controls( $controls_stack, $args ) {
+	public function modify_controls( Controls_Stack $controls_stack, array $args ) {
 		$control_id   = 'form_fields';
 		$control_data = Plugin::$instance->controls_manager->get_control_from_stack(
 			$controls_stack->get_unique_name(),
@@ -386,7 +389,7 @@ public function modify_controls( $controls_stack, $args ) {
 	 *
 	 * @return array
 	 */
-	public function filter_field_item( $item ) {
+	public function filter_field_item( array $item ): array {
 		if ( static::get_hcaptcha_name() === $item['field_type'] ) {
 			$item['field_label'] = false;
 		}
diff --git a/src/php/FluentForm/Form.php b/src/php/FluentForm/Form.php
index 762820cf..d804b067 100644
--- a/src/php/FluentForm/Form.php
+++ b/src/php/FluentForm/Form.php
@@ -68,7 +68,7 @@ private function init_hooks() {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $submit_button, $form ) {
+	public function add_captcha( array $submit_button, stdClass $form ) {
 		// Do not add if form has its own hcaptcha.
 		if ( $this->has_own_hcaptcha( $form ) ) {
 			return;
@@ -105,7 +105,7 @@ public function add_captcha( $submit_button, $form ) {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $data, $form, $fields ): array {
+	public function verify( array $errors, array $data, stdClass $form, array $fields ): array {
 		// Do not verify if form has its own hcaptcha.
 		if ( $this->has_own_hcaptcha( $form ) ) {
 			return $errors;
@@ -171,7 +171,7 @@ public function enqueue_scripts() {
 	 *
 	 * @return stdClass
 	 */
-	public function fluentform_rendering_form_filter( $form ): stdClass {
+	public function fluentform_rendering_form_filter( stdClass $form ): stdClass {
 		static $has_own_captcha = false;
 
 		if ( $this->has_own_hcaptcha( $form ) ) {
@@ -192,7 +192,7 @@ public function fluentform_rendering_form_filter( $form ): stdClass {
 	 *
 	 * @return bool
 	 */
-	protected function has_own_hcaptcha( $form ): bool {
+	protected function has_own_hcaptcha( stdClass $form ): bool {
 		$auto_include = apply_filters( 'ff_has_auto_hcaptcha', false );
 
 		if ( $auto_include ) {
diff --git a/src/php/FormidableForms/Form.php b/src/php/FormidableForms/Form.php
index 15e9487d..f8e195d0 100644
--- a/src/php/FormidableForms/Form.php
+++ b/src/php/FormidableForms/Form.php
@@ -64,7 +64,7 @@ public function init_hooks() {
 	 * @return mixed
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function get_transient( $value, $transient ) {
+	public function get_transient( $value, string $transient ) {
 		if (
 			! $value ||
 			( isset( $value->active_captcha ) && 'hcaptcha' !== $value->active_captcha )
@@ -88,7 +88,7 @@ public function get_transient( $value, $transient ) {
 	 *
 	 * @return string
 	 */
-	public function add_captcha( $html, $field, $atts ): string {
+	public function add_captcha( string $html, array $field, array $atts ): string {
 		if ( 'captcha' !== $field['type'] ) {
 			return $html;
 		}
@@ -132,7 +132,7 @@ public function add_captcha( $html, $field, $atts ): string {
 	 * @return bool
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function prevent_native_validation( $is_field_hidden, $field, $post ): bool {
+	public function prevent_native_validation( bool $is_field_hidden, stdClass $field, array $post ): bool {
 		if ( 'captcha' !== $field->type ) {
 			return $is_field_hidden;
 		}
@@ -159,7 +159,7 @@ public function prevent_native_validation( $is_field_hidden, $field, $post ): bo
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $values, $validate_args ): array {
+	public function verify( array $errors, array $values, array $validate_args ): array {
 		$error_message = hcaptcha_verify_post(
 			self::NONCE,
 			self::ACTION
diff --git a/src/php/Forminator/Form.php b/src/php/Forminator/Form.php
index 0719477e..2d2694ee 100644
--- a/src/php/Forminator/Form.php
+++ b/src/php/Forminator/Form.php
@@ -66,7 +66,7 @@ public function init_hooks() {
 	 * @return int
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function before_form_render( $id, $form_type, $post_id, $form_fields, $form_settings ): int {
+	public function before_form_render( int $id, string $form_type, int $post_id, array $form_fields, array $form_settings ): int {
 		$this->form_id = $id;
 
 		return $id;
@@ -81,7 +81,7 @@ public function before_form_render( $id, $form_type, $post_id, $form_fields, $fo
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $html, $button ): string {
+	public function add_hcaptcha( string $html, string $button ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NONCE,
@@ -106,7 +106,7 @@ public function add_hcaptcha( $html, $button ): string {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $can_show, $id, $form_settings ): array {
+	public function verify( array $can_show, int $id, array $form_settings ): array {
 		$error_message = hcaptcha_get_verify_message( self::NONCE, self::ACTION );
 
 		if ( null !== $error_message ) {
diff --git a/src/php/GiveWP/Base.php b/src/php/GiveWP/Base.php
index b8623064..442beefe 100644
--- a/src/php/GiveWP/Base.php
+++ b/src/php/GiveWP/Base.php
@@ -36,7 +36,7 @@ private function init_hooks() {
 	 *
 	 * @param int $form_id Form id.
 	 */
-	public function add_captcha( $form_id ) {
+	public function add_captcha( int $form_id ) {
 		$args = [
 			'action' => static::ACTION,
 			'name'   => static::NAME,
diff --git a/src/php/GravityForms/Form.php b/src/php/GravityForms/Form.php
index bf6505df..b37a421f 100644
--- a/src/php/GravityForms/Form.php
+++ b/src/php/GravityForms/Form.php
@@ -37,7 +37,7 @@ private function init_hooks() {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $button_input, $form ): string {
+	public function add_captcha( string $button_input, array $form ): string {
 		$args = [
 			'action' => HCAPTCHA_ACTION,
 			'name'   => HCAPTCHA_NONCE,
@@ -59,8 +59,9 @@ public function add_captcha( $button_input, $form ): string {
 	 *
 	 * @return string|null
 	 * @noinspection PhpUnusedParameterInspection
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
-	public function verify_request( $result, $error_codes ) {
+	public function verify_request( $result, array $error_codes ) {
 		// Nonce is checked in the hcaptcha_verify_post().
 
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
diff --git a/src/php/Helpers/HCaptcha.php b/src/php/Helpers/HCaptcha.php
index 63da642c..bd06a197 100644
--- a/src/php/Helpers/HCaptcha.php
+++ b/src/php/Helpers/HCaptcha.php
@@ -30,7 +30,7 @@ class HCaptcha {
 	 *
 	 * @return string
 	 */
-	public static function form( $args = [] ): string {
+	public static function form( array $args = [] ): string {
 		ob_start();
 		self::form_display( $args );
 
@@ -42,7 +42,7 @@ public static function form( $args = [] ): string {
 	 *
 	 * @param array $args Arguments.
 	 */
-	public static function form_display( $args = [] ) {
+	public static function form_display( array $args = [] ) {
 		$settings          = hcaptcha()->settings();
 		$hcaptcha_site_key = $settings->get_site_key();
 		$hcaptcha_theme    = $settings->get( 'theme' );
@@ -192,7 +192,7 @@ public static function get_widget_id(): array {
 	 *
 	 * @return array
 	 */
-	public static function get_class_source( $class ): array {
+	public static function get_class_source( string $class ): array {
 		foreach ( hcaptcha()->modules as $module ) {
 			if ( in_array( $class, (array) $module[2], true ) ) {
 				$source = $module[1];
diff --git a/src/php/Jetpack/JetpackBase.php b/src/php/Jetpack/JetpackBase.php
index ef07e4d9..502a15be 100644
--- a/src/php/Jetpack/JetpackBase.php
+++ b/src/php/Jetpack/JetpackBase.php
@@ -58,7 +58,7 @@ private function init_hooks() {
 	 *
 	 * @return string|string[]|null
 	 */
-	abstract public function add_captcha( $content );
+	abstract public function add_captcha( string $content );
 
 	/**
 	 * Verify hCaptcha answer from the Jetpack Contact Form.
@@ -67,7 +67,7 @@ abstract public function add_captcha( $content );
 	 *
 	 * @return bool|WP_Error
 	 */
-	public function verify( $is_spam = false ) {
+	public function verify( bool $is_spam = false ) {
 		$this->error_message = hcaptcha_get_verify_message(
 			static::NAME,
 			static::ACTION
@@ -91,7 +91,7 @@ public function verify( $is_spam = false ) {
 	 *
 	 * @return string
 	 */
-	public function error_message( $hcaptcha_content = '' ): string {
+	public function error_message( string $hcaptcha_content = '' ): string {
 		if ( null === $this->error_message ) {
 			return $hcaptcha_content;
 		}
diff --git a/src/php/Jetpack/JetpackForm.php b/src/php/Jetpack/JetpackForm.php
index 51b57ed8..d4a7e736 100644
--- a/src/php/Jetpack/JetpackForm.php
+++ b/src/php/Jetpack/JetpackForm.php
@@ -21,7 +21,7 @@ class JetpackForm extends JetpackBase {
 	 *
 	 * @return string|string[]|null
 	 */
-	public function add_captcha( $content ) {
+	public function add_captcha( string $content ) {
 		// Jetpack classic form.
 		$content = preg_replace_callback(
 			'~(\[contact-form[\s\S]*?][\s\S]*?)(\[/contact-form])~',
@@ -44,7 +44,7 @@ public function add_captcha( $content ) {
 	 *
 	 * @return string
 	 */
-	public function classic_callback( $matches ): string {
+	public function classic_callback( array $matches ): string {
 		if ( has_shortcode( $matches[0], 'hcaptcha' ) ) {
 			return $matches[0];
 		}
@@ -68,7 +68,7 @@ public function classic_callback( $matches ): string {
 	 *
 	 * @return string
 	 */
-	public function block_callback( $matches ): string {
+	public function block_callback( array $matches ): string {
 		if ( has_shortcode( $matches[0], 'hcaptcha' ) ) {
 			return $matches[0];
 		}
diff --git a/src/php/Kadence/Form.php b/src/php/Kadence/Form.php
index 131af9da..6a8ce27f 100644
--- a/src/php/Kadence/Form.php
+++ b/src/php/Kadence/Form.php
@@ -48,7 +48,7 @@ static function () {
 	 *
 	 * @return array
 	 */
-	public function remove_recaptcha_from_block( $block ) {
+	public function remove_recaptcha_from_block( array $block ): array {
 		if ( 'kadence/form' !== $block['blockName'] ) {
 			return $block;
 		}
@@ -67,7 +67,7 @@ public function remove_recaptcha_from_block( $block ) {
 	 *
 	 * @return array
 	 */
-	public function remove_recaptcha_from_attributes( $attributes ) {
+	public function remove_recaptcha_from_attributes( array $attributes ): array {
 		if ( isset( $attributes['recaptcha'] ) ) {
 			$attributes['recaptcha'] = false;
 		}
@@ -85,7 +85,7 @@ public function remove_recaptcha_from_attributes( $attributes ) {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function render_block( $block_content, $block, $instance ) {
+	public function render_block( string $block_content, array $block, WP_Block $instance ): string {
 		if ( 'kadence/form' !== $block['blockName'] ) {
 			return $block_content;
 		}
diff --git a/src/php/Mailchimp/Form.php b/src/php/Mailchimp/Form.php
index 7ca36718..42e29a5e 100644
--- a/src/php/Mailchimp/Form.php
+++ b/src/php/Mailchimp/Form.php
@@ -54,7 +54,7 @@ private function init_hooks() {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcap_error_messages( $messages, $form ): array {
+	public function add_hcap_error_messages( array $messages, MC4WP_Form $form ): array {
 		foreach ( hcap_get_error_messages() as $error_code => $error_message ) {
 			$messages[ $error_code ] = [
 				'type' => 'error',
@@ -75,7 +75,7 @@ public function add_hcap_error_messages( $messages, $form ): array {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $content, $form, $element ): string {
+	public function add_captcha( string $content, MC4WP_Form $form, MC4WP_Form_Element $element ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NAME,
@@ -102,7 +102,7 @@ public function add_captcha( $content, $form, $element ): string {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $form ): array {
+	public function verify( array $errors, MC4WP_Form $form ): array {
 		$error_message = hcaptcha_verify_post( self::NAME, self::ACTION );
 
 		if ( null !== $error_message ) {
diff --git a/src/php/Main.php b/src/php/Main.php
index 7ce7ff8c..e4ddf3f9 100644
--- a/src/php/Main.php
+++ b/src/php/Main.php
@@ -177,7 +177,7 @@ public function init_hooks() {
 	 *
 	 * @return object|null
 	 */
-	public function get( $class ) {
+	public function get( string $class ) {
 
 		return $this->loaded_classes[ $class ] ?? null;
 	}
@@ -264,7 +264,7 @@ private function is_elementor_pro_edit_page(): bool {
 	 *
 	 * @return array
 	 */
-	public function prefetch_hcaptcha_dns( $urls, $relation_type ): array {
+	public function prefetch_hcaptcha_dns( array $urls, string $relation_type ): array {
 		if ( 'dns-prefetch' === $relation_type ) {
 			$urls[] = 'https://hcaptcha.com';
 		}
@@ -279,7 +279,7 @@ public function prefetch_hcaptcha_dns( $urls, $relation_type ): array {
 	 *
 	 * @return array
 	 */
-	public function csp_headers( $headers ): array {
+	public function csp_headers( array $headers ): array {
 		$hcap_csp = "'self' https://hcaptcha.com https://*.hcaptcha.com";
 
 		$headers['X-Content-Security-Policy'] =
@@ -563,7 +563,7 @@ public function wpforo_template_filter( $template ) {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function support_candy_shortcode_tag( $output, $tag, $attr, $m ): string {
+	public function support_candy_shortcode_tag( string $output, string $tag, $attr, array $m ): string {
 		if ( 'supportcandy' === $tag ) {
 			$this->did_support_candy_shortcode_tag_filter = true;
 		}
@@ -580,7 +580,7 @@ public function support_candy_shortcode_tag( $output, $tag, $attr, $m ): string
 	 *
 	 * @return bool
 	 */
-	public function whitelist_ip( $whitelisted, $client_ip ): bool {
+	public function whitelist_ip( bool $whitelisted, string $client_ip ): bool {
 
 		$ips = explode(
 			"\n",
diff --git a/src/php/MemberPress/Login.php b/src/php/MemberPress/Login.php
index d66af8fa..009cfc9e 100644
--- a/src/php/MemberPress/Login.php
+++ b/src/php/MemberPress/Login.php
@@ -66,7 +66,7 @@ public function add_captcha() {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $user;
 		}
diff --git a/src/php/MemberPress/Register.php b/src/php/MemberPress/Register.php
index d76acb80..07086118 100644
--- a/src/php/MemberPress/Register.php
+++ b/src/php/MemberPress/Register.php
@@ -61,7 +61,7 @@ public function add_captcha() {
 	 *
 	 * @return array
 	 */
-	public function verify( $errors ): array {
+	public function verify( array $errors ): array {
 		$error_message = hcaptcha_get_verify_message(
 			self::NONCE,
 			self::ACTION
diff --git a/src/php/Migrations/Migrations.php b/src/php/Migrations/Migrations.php
index 87eb5c8d..3dfb463c 100644
--- a/src/php/Migrations/Migrations.php
+++ b/src/php/Migrations/Migrations.php
@@ -128,7 +128,7 @@ private function is_allowed(): bool {
 	 *
 	 * @return string
 	 */
-	private function get_upgrade_version( $method ): string {
+	private function get_upgrade_version( string $method ): string {
 		// Find only the digits to get version number.
 		if ( ! preg_match( '/\d+/', $method, $matches ) ) {
 			return '';
@@ -147,7 +147,7 @@ private function get_upgrade_version( $method ): string {
 	 * @noinspection ForgottenDebugOutputInspection
 	 * @noinspection PhpSameParameterValueInspection
 	 */
-	private function log( $message, $item = null ) {
+	private function log( string $message, $item = null ) {
 		if ( ! ( defined( 'WP_DEBUG' ) && WP_DEBUG ) ) {
 			return;
 		}
diff --git a/src/php/NF/Fields.php b/src/php/NF/Fields.php
index 2f53d560..d465b749 100644
--- a/src/php/NF/Fields.php
+++ b/src/php/NF/Fields.php
@@ -7,6 +7,7 @@
 
 // phpcs:disable Generic.Commenting.DocComment.MissingShort
 /** @noinspection PhpUndefinedClassInspection */
+/** @noinspection PhpUnused */
 // phpcs:enable Generic.Commenting.DocComment.MissingShort
 
 namespace HCaptcha\NF;
@@ -66,8 +67,9 @@ public function __construct() {
 	 * @param mixed $data  Data.
 	 *
 	 * @return null|string
+	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function validate( $field, $data ) {
+	public function validate( array $field, $data ) {
 		$value = $field['value'] ?? '';
 
 		return hcaptcha_request_verify( $value );
diff --git a/src/php/NF/NF.php b/src/php/NF/NF.php
index 8d4efafe..2e38e5f6 100644
--- a/src/php/NF/NF.php
+++ b/src/php/NF/NF.php
@@ -46,7 +46,7 @@ public function init_hooks() {
 	 *
 	 * @return array
 	 */
-	public function register_fields( $fields ): array {
+	public function register_fields( array $fields ): array {
 		$fields['hcaptcha-for-ninja-forms'] = new Fields();
 
 		return $fields;
@@ -59,7 +59,7 @@ public function register_fields( $fields ): array {
 	 *
 	 * @return array
 	 */
-	public function template_file_paths( $paths ): array {
+	public function template_file_paths( array $paths ): array {
 		$paths[] = __DIR__ . '/templates/';
 
 		return $paths;
@@ -72,7 +72,7 @@ public function template_file_paths( $paths ): array {
 	 *
 	 * @return void
 	 */
-	public function set_form_id( $form_id ) {
+	public function set_form_id( int $form_id ) {
 		$this->form_id = $form_id;
 	}
 
@@ -83,7 +83,7 @@ public function set_form_id( $form_id ) {
 	 *
 	 * @return array
 	 */
-	public function localize_field( $field ): array {
+	public function localize_field( array $field ): array {
 
 		$settings                         = hcaptcha()->settings();
 		$hcaptcha_id                      = uniqid( 'hcaptcha-nf-', true );
diff --git a/src/php/PaidMembershipsPro/Login.php b/src/php/PaidMembershipsPro/Login.php
index 446cfba9..bbcaf606 100644
--- a/src/php/PaidMembershipsPro/Login.php
+++ b/src/php/PaidMembershipsPro/Login.php
@@ -44,7 +44,7 @@ protected function init_hooks() {
 	 *
 	 * @param string $content Content of the PMPro login page.
 	 */
-	public function add_captcha( $content ) {
+	public function add_captcha( string $content ) {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $content;
 		}
@@ -88,7 +88,7 @@ public function add_captcha( $content ) {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
 		$pmpro_login_form_used = isset( $_POST['pmpro_login_form_used'] ) ?
 			sanitize_text_field( wp_unslash( $_POST['pmpro_login_form_used'] ) ) :
diff --git a/src/php/Quform/Quform.php b/src/php/Quform/Quform.php
index 95e41dc9..499e4ef0 100644
--- a/src/php/Quform/Quform.php
+++ b/src/php/Quform/Quform.php
@@ -61,7 +61,7 @@ public function init_hooks() {
 	 *
 	 * @return string
 	 */
-	public function add_hcaptcha( $output, $tag, $attr, $m ): string {
+	public function add_hcaptcha( string $output, string $tag, $attr, array $m ): string {
 		if ( 'quform' !== $tag ) {
 			return $output;
 		}
@@ -110,7 +110,7 @@ public function add_hcaptcha( $output, $tag, $attr, $m ): string {
 	 *
 	 * @return array
 	 */
-	public function verify( $result, $form ): array {
+	public function verify( array $result, Quform_Form $form ): array {
 		$page           = $form->getCurrentPage();
 		$page_id        = $page ? $page->getId() : 0;
 		$hcaptcha_name  = $this->get_max_element_id( $page );
@@ -146,6 +146,7 @@ public function verify( $result, $form ): array {
 	 * @param Quform_Element_Page|null $page Current page.
 	 *
 	 * @return string
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	private function get_max_element_id( $page ): string {
 		$max_id = self::MAX_ID;
diff --git a/src/php/Sendinblue/Sendinblue.php b/src/php/Sendinblue/Sendinblue.php
index ad325ae3..d1920e5c 100644
--- a/src/php/Sendinblue/Sendinblue.php
+++ b/src/php/Sendinblue/Sendinblue.php
@@ -42,7 +42,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $output, $tag, $attr, $m ): string {
+	public function add_hcaptcha( string $output, string $tag, $attr, array $m ): string {
 		if ( 'sibwp_form' !== $tag ) {
 			return $output;
 		}
@@ -70,8 +70,9 @@ public function add_hcaptcha( $output, $tag, $attr, $m ): string {
 	 *
 	 * @return string|null
 	 * @noinspection PhpUnusedParameterInspection
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
-	public function verify_request( $result, $error_codes ) {
+	public function verify_request( $result, array $error_codes ) {
 		// Nonce is checked in the hcaptcha_verify_post().
 
 		// phpcs:disable WordPress.Security.NonceVerification.Missing
diff --git a/src/php/Settings/Abstracts/SettingsBase.php b/src/php/Settings/Abstracts/SettingsBase.php
index fe5b8294..c5c9917f 100644
--- a/src/php/Settings/Abstracts/SettingsBase.php
+++ b/src/php/Settings/Abstracts/SettingsBase.php
@@ -148,7 +148,7 @@ abstract protected function section_title(): string;
 	 *
 	 * @param array $arguments Arguments.
 	 */
-	abstract public function section_callback( $arguments );
+	abstract public function section_callback( array $arguments );
 
 	/**
 	 * Get text domain.
@@ -160,7 +160,9 @@ abstract protected function text_domain(): string;
 	/**
 	 * SettingsBase constructor.
 	 *
-	 * @param array $tabs Tabs of this settings page.
+	 * @param array|null $tabs Tabs of this settings page.
+	 *
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public function __construct( $tabs = [] ) {
 		$this->tabs = $tabs;
@@ -368,7 +370,7 @@ protected function form_fields(): array {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	protected function set_defaults( &$field, $id ) {
+	protected function set_defaults( array &$field, string $id ) {
 		$field = wp_parse_args(
 			$field,
 			[
@@ -515,7 +517,7 @@ public function tabs_callback() {
 	 *
 	 * @param SettingsBase $tab Tabs of the current settings page.
 	 */
-	private function tab_link( $tab ) {
+	private function tab_link( SettingsBase $tab ) {
 		$url    = menu_page_url( $this->option_page(), false );
 		$url    = add_query_arg( 'tab', strtolower( $tab->get_class_name() ), $url );
 		$active = $this->is_tab_active( $tab ) ? ' active' : '';
@@ -534,7 +536,7 @@ private function tab_link( $tab ) {
 	 *
 	 * @return bool
 	 */
-	protected function is_tab_active( $tab ): bool {
+	protected function is_tab_active( SettingsBase $tab ): bool {
 		$current_page_name = filter_input( INPUT_GET, 'page', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
 		$current_tab_name  = filter_input( INPUT_GET, 'tab', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
 
@@ -585,7 +587,7 @@ protected function get_names_from_referer(): array {
 	 *
 	 * @return array
 	 */
-	protected function wp_parse_str( $input_string ): array {
+	protected function wp_parse_str( string $input_string ): array {
 		wp_parse_str( $input_string, $result );
 
 		return $result;
@@ -1069,7 +1071,7 @@ public function field_callback( array $arguments ) {
 	 *
 	 * @return string|array The value specified for the option or a default value for the option.
 	 */
-	public function get( $key, $empty_value = null ) {
+	public function get( string $key, $empty_value = null ) {
 		if ( empty( $this->settings ) ) {
 			$this->init_settings();
 		}
@@ -1107,7 +1109,7 @@ protected function field_default( array $field ): string {
 	 *
 	 * @return bool True if done.
 	 */
-	public function set_field( $key, $field_key, $value ): bool {
+	public function set_field( string $key, string $field_key, $value ): bool {
 		if ( ! array_key_exists( $key, $this->form_fields ) ) {
 			return false;
 		}
@@ -1123,7 +1125,7 @@ public function set_field( $key, $field_key, $value ): bool {
 	 * @param string $key   Setting name.
 	 * @param mixed  $value Setting value.
 	 */
-	public function update_option( $key, $value ) {
+	public function update_option( string $key, $value ) {
 		if ( empty( $this->settings ) ) {
 			$this->init_settings();
 		}
@@ -1217,7 +1219,7 @@ protected function is_options_screen(): bool {
 	 *
 	 * @return void
 	 */
-	private function print_helper( $helper ) {
+	private function print_helper( string $helper ) {
 		if ( ! $helper ) {
 			return;
 		}
@@ -1235,7 +1237,7 @@ private function print_helper( $helper ) {
 	 *
 	 * @return void
 	 */
-	private function print_supplemental( $supplemental ) {
+	private function print_supplemental( string $supplemental ) {
 		if ( ! $supplemental ) {
 			return;
 		}
diff --git a/src/php/Settings/Abstracts/SettingsInterface.php b/src/php/Settings/Abstracts/SettingsInterface.php
index b62ea228..c10d0943 100644
--- a/src/php/Settings/Abstracts/SettingsInterface.php
+++ b/src/php/Settings/Abstracts/SettingsInterface.php
@@ -19,5 +19,5 @@ interface SettingsInterface {
 	 *
 	 * @return string|array The value specified for the option or a default value for the option.
 	 */
-	public function get( $key, $empty_value = null );
+	public function get( string $key, $empty_value = null );
 }
diff --git a/src/php/Settings/General.php b/src/php/Settings/General.php
index d1821ef5..30d6fab1 100644
--- a/src/php/Settings/General.php
+++ b/src/php/Settings/General.php
@@ -374,7 +374,7 @@ public function setup_fields() {
 	 *
 	 * @param array $arguments Section arguments.
 	 */
-	public function section_callback( $arguments ) {
+	public function section_callback( array $arguments ) {
 		switch ( $arguments['id'] ) {
 			case self::SECTION_KEYS:
 				?>
@@ -416,7 +416,7 @@ public function section_callback( $arguments ) {
 	 *
 	 * @return void
 	 */
-	private function print_section_header( $id, $title ) {
+	private function print_section_header( string $id, string $title ) {
 		?>
 		<h3 class="hcaptcha-section-<?php echo esc_attr( $id ); ?>"><?php echo esc_html( $title ); ?></h3>
 		<?php
diff --git a/src/php/Settings/Integrations.php b/src/php/Settings/Integrations.php
index 3c389245..b5e4be54 100644
--- a/src/php/Settings/Integrations.php
+++ b/src/php/Settings/Integrations.php
@@ -368,7 +368,7 @@ public function init_form_fields() {
 	 *
 	 * @return string
 	 */
-	private function logo( $label ): string {
+	private function logo( string $label ): string {
 		$logo_file = sanitize_file_name( strtolower( $label ) . '-logo.png' );
 
 		return sprintf(
@@ -412,7 +412,7 @@ public function setup_fields() {
 	 *
 	 * @return array
 	 */
-	public function sort_fields( $fields ): array {
+	public function sort_fields( array $fields ): array {
 		uasort(
 			$fields,
 			static function ( $a, $b ) {
@@ -442,7 +442,7 @@ static function ( $a, $b ) {
 	 *
 	 * @param array $arguments Section arguments.
 	 */
-	public function section_callback( $arguments ) {
+	public function section_callback( array $arguments ) {
 		if ( self::SECTION_DISABLED === $arguments['id'] ) {
 			?>
 			<hr class="hcaptcha-disabled-section">
@@ -600,7 +600,7 @@ public function activate() {
 	 *
 	 * @return bool
 	 */
-	private function activate_plugins( $plugins ): bool {
+	private function activate_plugins( array $plugins ): bool {
 		foreach ( $plugins as $plugin ) {
 			ob_start();
 
diff --git a/src/php/Settings/PluginSettingsBase.php b/src/php/Settings/PluginSettingsBase.php
index 90066af6..0c2017be 100644
--- a/src/php/Settings/PluginSettingsBase.php
+++ b/src/php/Settings/PluginSettingsBase.php
@@ -19,7 +19,7 @@ abstract class PluginSettingsBase extends SettingsBase {
 	/**
 	 * Constructor.
 	 *
-	 * @param array $tabs Tabs of this settings page.
+	 * @param array|null $tabs Tabs of this settings page.
 	 */
 	public function __construct( $tabs = [] ) {
 		add_filter( 'admin_footer_text', [ $this, 'admin_footer_text' ] );
@@ -177,7 +177,7 @@ class="hcaptcha-<?php echo esc_attr( $this->section_title() ); ?>"
 	 *
 	 * @return string
 	 */
-	public function admin_footer_text( $text ): string {
+	public function admin_footer_text( string $text ): string {
 		if ( ! $this->is_options_screen() ) {
 			return $text;
 		}
@@ -215,7 +215,7 @@ public function admin_footer_text( $text ): string {
 	 *
 	 * @return string
 	 */
-	public function update_footer( $content ): string {
+	public function update_footer( string $content ): string {
 		if ( ! $this->is_options_screen() ) {
 			return $content;
 		}
diff --git a/src/php/Settings/Settings.php b/src/php/Settings/Settings.php
index fa08834d..5ccb7426 100644
--- a/src/php/Settings/Settings.php
+++ b/src/php/Settings/Settings.php
@@ -36,9 +36,9 @@ class Settings implements SettingsInterface {
 	 *
 	 * @param array $menu_pages_classes Menu pages.
 	 */
-	public function __construct( $menu_pages_classes = [] ) {
+	public function __construct( array $menu_pages_classes = [] ) {
 		// Allow to specify $menu_pages_classes item as one class, not an array.
-		$this->menu_pages_classes = (array) $menu_pages_classes;
+		$this->menu_pages_classes = $menu_pages_classes;
 
 		$this->init();
 	}
@@ -96,7 +96,7 @@ public function get_tabs(): array {
 	 *
 	 * @return string|array The value specified for the option or a default value for the option.
 	 */
-	public function get( $key, $empty_value = null ) {
+	public function get( string $key, $empty_value = null ) {
 		$value = '';
 
 		foreach ( $this->tabs as $tab ) {
@@ -127,7 +127,7 @@ public function get( $key, $empty_value = null ) {
 	 *
 	 * @return bool
 	 */
-	public function is( $key, $compare ): bool {
+	public function is( string $key, string $compare ): bool {
 		$value = $this->get( $key );
 
 		if ( is_array( $value ) ) {
@@ -144,7 +144,7 @@ public function is( $key, $compare ): bool {
 	 *
 	 * @return bool
 	 */
-	public function is_on( $key ): bool {
+	public function is_on( string $key ): bool {
 		return ! empty( $this->get( $key ) );
 	}
 
@@ -215,7 +215,7 @@ public function get_secret_key(): string {
 	 *
 	 * @return void
 	 */
-	public function set_field( $key, $field_key, $value ) {
+	public function set_field( string $key, string $field_key, $value ) {
 		foreach ( $this->tabs as $tab ) {
 			/**
 			 * Page / Tab.
diff --git a/src/php/Settings/SystemInfo.php b/src/php/Settings/SystemInfo.php
index e2994edc..13601fb4 100644
--- a/src/php/Settings/SystemInfo.php
+++ b/src/php/Settings/SystemInfo.php
@@ -82,7 +82,7 @@ public function admin_enqueue_scripts() {
 	 *
 	 * @param array $arguments Section arguments.
 	 */
-	public function section_callback( $arguments ) {
+	public function section_callback( array $arguments ) {
 		?>
 		<h2>
 			<?php echo esc_html__( 'System Information', 'hcaptcha-for-forms-and-more' ); ?>
@@ -454,7 +454,7 @@ private function server_info(): string {
 	 *
 	 * @return string
 	 */
-	private function header( $header ): string {
+	private function header( string $header ): string {
 		return "\n" . $header . "\n\n";
 	}
 
@@ -467,7 +467,7 @@ private function header( $header ): string {
 	 *
 	 * @return string
 	 */
-	private function data( $key, $value, $max_key_length = 0 ): string {
+	private function data( string $key, string $value, int $max_key_length = 0 ): string {
 		$length = $max_key_length ? max( $max_key_length, self::DATA_KEY_LENGTH ) : self::DATA_KEY_LENGTH;
 
 		$length += 2;
@@ -483,7 +483,7 @@ private function data( $key, $value, $max_key_length = 0 ): string {
 	 *
 	 * @return int
 	 */
-	private function get_max_key_length( $array, $key ): int {
+	private function get_max_key_length( array $array, string $key ): int {
 		return array_reduce(
 			$array,
 			static function ( $carry, $item ) use ( $key ) {
@@ -505,7 +505,7 @@ static function ( $carry, $item ) use ( $key ) {
 	 * @return string
 	 * @noinspection PhpSameParameterValueInspection
 	 */
-	private function mb_str_pad( $string, $length, $pad_string = ' ' ): string {
+	private function mb_str_pad( string $string, int $length, string $pad_string = ' ' ): string {
 		$pad_string = mb_substr( $pad_string, 0, 1 );
 		$times      = max( 0, $length - mb_strlen( $string ) );
 
@@ -530,7 +530,7 @@ private function is_empty( $data ): string {
 	 *
 	 * @return string
 	 */
-	private function is_on( $key ): string {
+	private function is_on( string $key ): string {
 		return hcaptcha()->settings()->is_on( $key ) ? 'On' : 'Off';
 	}
 }
diff --git a/src/php/Subscriber/Form.php b/src/php/Subscriber/Form.php
index 1b616b14..d364c8bf 100644
--- a/src/php/Subscriber/Form.php
+++ b/src/php/Subscriber/Form.php
@@ -48,7 +48,7 @@ private function init_hooks() {
 	 *
 	 * @return string
 	 */
-	public function add_captcha( $content ): string {
+	public function add_captcha( string $content ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NAME,
@@ -69,7 +69,7 @@ public function add_captcha( $content ): string {
 	 * @return bool|string
 	 * @noinspection NullCoalescingOperatorCanBeUsedInspection
 	 */
-	public function verify( $check_result ) {
+	public function verify( bool $check_result ) {
 		$error_message = hcaptcha_get_verify_message( self::NAME, self::ACTION );
 
 		if ( null !== $error_message ) {
diff --git a/src/php/UM/Base.php b/src/php/UM/Base.php
index fbc9bd9d..e5acdb54 100644
--- a/src/php/UM/Base.php
+++ b/src/php/UM/Base.php
@@ -96,7 +96,7 @@ protected function init_hooks() {
 	 *
 	 * @return void
 	 */
-	public function set_form_id( $args ) {
+	public function set_form_id( array $args ) {
 		$this->form_id = isset( $args['form_id'] ) ? (int) $args['form_id'] : 0;
 	}
 
@@ -107,8 +107,9 @@ public function set_form_id( $args ) {
 	 *
 	 * @return array
 	 * @noinspection ReturnTypeCanBeDeclaredInspection
+	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function add_captcha( $fields ) {
+	public function add_captcha( array $fields ) {
 		$um = UM();
 
 		if ( ! $um ) {
@@ -168,8 +169,9 @@ public function add_captcha( $fields ) {
 	 * @param string $mode   Mode.
 	 *
 	 * @return string
+	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function display_captcha( $output, $mode ): string {
+	public function display_captcha( string $output, string $mode ): string {
 		if ( $this->um_mode !== $mode || '' !== $output ) {
 			return $output;
 		}
@@ -210,8 +212,9 @@ public function display_captcha( $output, $mode ): string {
 	 * @param array $form_data      Form data.
 	 *
 	 * @return void
+	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function verify( $submitted_data, $form_data = [] ) {
+	public function verify( array $submitted_data, array $form_data = [] ) {
 		$um = UM();
 
 		if (
diff --git a/src/php/UM/Login.php b/src/php/UM/Login.php
index 7d0dd24f..3073ae0c 100644
--- a/src/php/UM/Login.php
+++ b/src/php/UM/Login.php
@@ -39,7 +39,7 @@ protected function init_hooks() {
 	 *
 	 * @return string
 	 */
-	public function mute_login_hcaptcha_notice( $message, $error_key = '' ): string {
+	public function mute_login_hcaptcha_notice( string $message, string $error_key = '' ): string {
 		if ( self::KEY !== $error_key ) {
 			return $message;
 		}
@@ -55,7 +55,7 @@ public function mute_login_hcaptcha_notice( $message, $error_key = '' ): string
 	 * @return array
 	 * @noinspection ReturnTypeCanBeDeclaredInspection
 	 */
-	public function add_captcha( $fields ) {
+	public function add_captcha( array $fields ) {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $fields;
 		}
@@ -71,7 +71,7 @@ public function add_captcha( $fields ) {
 	 *
 	 * @return void
 	 */
-	public function verify( $submitted_data, $form_data = [] ) {
+	public function verify( array $submitted_data, array $form_data = [] ) {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return;
 		}
diff --git a/src/php/UM/LostPassword.php b/src/php/UM/LostPassword.php
index d130b921..bfac5aa3 100644
--- a/src/php/UM/LostPassword.php
+++ b/src/php/UM/LostPassword.php
@@ -39,7 +39,7 @@ protected function init_hooks() {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function um_after_password_reset_fields( $args ) {
+	public function um_after_password_reset_fields( array $args ) {
 		// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 		echo $this->display_captcha( '', self::UM_MODE );
 	}
diff --git a/src/php/WC/Checkout.php b/src/php/WC/Checkout.php
index 2e202318..ee6e6182 100644
--- a/src/php/WC/Checkout.php
+++ b/src/php/WC/Checkout.php
@@ -57,6 +57,8 @@ public function add_captcha() {
 
 	/**
 	 * Verify checkout form.
+	 *
+	 * @noinspection PhpUndefinedFunctionInspection
 	 */
 	public function verify() {
 		$error_message = hcaptcha_get_verify_message(
diff --git a/src/php/WC/Login.php b/src/php/WC/Login.php
index 23763c56..2c50d3b3 100644
--- a/src/php/WC/Login.php
+++ b/src/php/WC/Login.php
@@ -61,7 +61,7 @@ public function add_captcha() {
 	 *
 	 * @return WP_Error
 	 */
-	public function verify( $validation_error ): WP_Error {
+	public function verify( WP_Error $validation_error ): WP_Error {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $validation_error;
 		}
diff --git a/src/php/WC/OrderTracking.php b/src/php/WC/OrderTracking.php
index d628ec7e..450a8640 100644
--- a/src/php/WC/OrderTracking.php
+++ b/src/php/WC/OrderTracking.php
@@ -39,7 +39,7 @@ private function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function do_shortcode_tag( $output, $tag, $attr, $m ): string {
+	public function do_shortcode_tag( string $output, string $tag, $attr, array $m ): string {
 		if ( 'woocommerce_order_tracking' !== $tag ) {
 			return $output;
 		}
diff --git a/src/php/WC/Register.php b/src/php/WC/Register.php
index 0a1aad1c..681756fc 100644
--- a/src/php/WC/Register.php
+++ b/src/php/WC/Register.php
@@ -62,7 +62,7 @@ public function add_captcha() {
 	 *
 	 * @return WP_Error
 	 */
-	public function verify( $validation_error ): WP_Error {
+	public function verify( WP_Error $validation_error ): WP_Error {
 		$error_message = hcaptcha_get_verify_message(
 			self::NONCE,
 			self::ACTION
diff --git a/src/php/WP/Comment.php b/src/php/WP/Comment.php
index 04da4d79..87e075e5 100644
--- a/src/php/WP/Comment.php
+++ b/src/php/WP/Comment.php
@@ -53,11 +53,11 @@ private function init_hooks() {
 	 * Add captcha.
 	 *
 	 * @param string $submit_field HTML markup for the submit field.
-	 * @param array  $comment_args  Arguments passed to comment_form().
+	 * @param array  $comment_args Arguments passed to comment_form().
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $submit_field, $comment_args ): string {
+	public function add_captcha( string $submit_field, array $comment_args ): string {
 		$post_id = 0;
 
 		if (
@@ -101,7 +101,7 @@ public function add_captcha( $submit_field, $comment_args ): string {
 	 * @return int|string|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $approved, $commentdata ) {
+	public function verify( $approved, array $commentdata ) {
 		if ( is_admin() ) {
 			return $approved;
 		}
@@ -123,7 +123,7 @@ public function verify( $approved, $commentdata ) {
 	 *
 	 * @return WP_Error
 	 */
-	private function invalid_captcha_error( $approved, $error_message = '' ) {
+	private function invalid_captcha_error( $approved, string $error_message = '' ) {
 		$error_message = $error_message ?: __( 'Invalid Captcha', 'hcaptcha-for-forms-and-more' );
 		$approved      = is_wp_error( $approved ) ? $approved : new WP_Error();
 
diff --git a/src/php/WP/Login.php b/src/php/WP/Login.php
index 18926ead..e3c1f82e 100644
--- a/src/php/WP/Login.php
+++ b/src/php/WP/Login.php
@@ -80,7 +80,7 @@ public function add_captcha() {
 	 * @return WP_User|WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $user, $password ) {
+	public function verify( $user, string $password ) {
 		if ( false === strpos( wp_get_raw_referer(), '/wp-login.php' ) ) {
 			return $user;
 		}
diff --git a/src/php/WP/PasswordProtected.php b/src/php/WP/PasswordProtected.php
index ccf954e4..10de558f 100644
--- a/src/php/WP/PasswordProtected.php
+++ b/src/php/WP/PasswordProtected.php
@@ -51,7 +51,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $output, $post ): string {
+	public function add_hcaptcha( string $output, WP_Post $post ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NONCE,
@@ -74,6 +74,7 @@ public function add_hcaptcha( $output, $post ): string {
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection ForgottenDebugOutputInspection
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	public function verify( $package ) {
 
diff --git a/src/php/WP/Register.php b/src/php/WP/Register.php
index 02a6c0a0..03d45805 100644
--- a/src/php/WP/Register.php
+++ b/src/php/WP/Register.php
@@ -65,7 +65,7 @@ public function add_captcha() {
 	 * @return WP_Error
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $sanitized_user_login, $user_email ): WP_Error {
+	public function verify( WP_Error $errors, string $sanitized_user_login, string $user_email ): WP_Error {
 		$error_message = hcaptcha_get_verify_message_html(
 			self::NONCE,
 			self::ACTION
diff --git a/src/php/WPDiscuz/Comment.php b/src/php/WPDiscuz/Comment.php
index e1dd8751..e54447bb 100644
--- a/src/php/WPDiscuz/Comment.php
+++ b/src/php/WPDiscuz/Comment.php
@@ -37,7 +37,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $output, $comments_count, $current_user ): string {
+	public function add_hcaptcha( string $output, $comments_count, $current_user ): string {
 		global $post;
 
 		$args = [
@@ -71,7 +71,7 @@ public function add_hcaptcha( $output, $comments_count, $current_user ): string
 	 * @noinspection PhpUndefinedFunctionInspection
 	 * @noinspection ForgottenDebugOutputInspection
 	 */
-	public function verify( $comment_data ) {
+	public function verify( array $comment_data ) {
 		$wp_discuz = wpDiscuz();
 
 		remove_filter( 'preprocess_comment', [ $wp_discuz, 'validateRecaptcha' ], 10 );
diff --git a/src/php/WPForms/Form.php b/src/php/WPForms/Form.php
index a72557e1..19bd3040 100644
--- a/src/php/WPForms/Form.php
+++ b/src/php/WPForms/Form.php
@@ -50,7 +50,7 @@ private function init_hooks() {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_captcha( $form_data ) {
+	public function add_captcha( array $form_data ) {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NAME,
@@ -74,8 +74,9 @@ public function add_captcha( $form_data ) {
 	 *
 	 * @return void
 	 * @noinspection PhpUnusedParameterInspection
+	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function verify( $fields, $entry, $form_data ) {
+	public function verify( array $fields, array $entry, array $form_data ) {
 		$error_message = hcaptcha_get_verify_message(
 			self::NAME,
 			self::ACTION
diff --git a/src/php/includes/functions.php b/src/php/includes/functions.php
index db61e84d..d64511cf 100644
--- a/src/php/includes/functions.php
+++ b/src/php/includes/functions.php
@@ -17,7 +17,7 @@
  * @return string
  * @deprecated 2.7.0 Use \HCaptcha\Helpers\HCaptcha::form()
  */
-function hcap_form( $action = '', $name = '', $auto = false ) {
+function hcap_form( string $action = '', string $name = '', bool $auto = false ) {
 	// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	_deprecated_function( __FUNCTION__, '2.7.0', HCaptcha::class . '::form()' );
 
@@ -39,7 +39,7 @@ function hcap_form( $action = '', $name = '', $auto = false ) {
  *
  * @deprecated 2.7.0 Use \HCaptcha\Helpers\HCaptcha::form_display()
  */
-function hcap_form_display( $action = '', $name = '', $auto = false ) {
+function hcap_form_display( string $action = '', string $name = '', bool $auto = false ) {
 	// phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
 	_deprecated_function( __FUNCTION__, '2.7.0', HCaptcha::class . '::form_display()' );
 
diff --git a/src/php/includes/request.php b/src/php/includes/request.php
index 59a835ce..2a31dce2 100644
--- a/src/php/includes/request.php
+++ b/src/php/includes/request.php
@@ -116,6 +116,7 @@ function hcap_get_error_message( $error_codes ) {
 	 * @param string|null $hcaptcha_response hCaptcha response.
 	 *
 	 * @return null|string Null on success, error message on failure.
+	 * @noinspection PhpMissingParamTypeInspection
 	 */
 	function hcaptcha_request_verify( $hcaptcha_response ) {
 		static $result;
@@ -206,7 +207,7 @@ function hcaptcha_request_verify( $hcaptcha_response ) {
 	 *
 	 * @return null|string Null on success, error message on failure.
 	 */
-	function hcaptcha_verify_post( $nonce_field_name = HCAPTCHA_NONCE, $nonce_action_name = HCAPTCHA_ACTION ) {
+	function hcaptcha_verify_post( string $nonce_field_name = HCAPTCHA_NONCE, string $nonce_action_name = HCAPTCHA_ACTION ) {
 
 		$hcaptcha_response = isset( $_POST['h-captcha-response'] ) ?
 			filter_var( wp_unslash( $_POST['h-captcha-response'] ), FILTER_SANITIZE_FULL_SPECIAL_CHARS ) :
@@ -243,7 +244,7 @@ function hcaptcha_verify_post( $nonce_field_name = HCAPTCHA_NONCE, $nonce_action
 	 *
 	 * @return null|string Null on success, error message on failure.
 	 */
-	function hcaptcha_get_verify_output( $empty_message, $fail_message, $nonce_field_name, $nonce_action_name ) {
+	function hcaptcha_get_verify_output( string $empty_message, string $fail_message, string $nonce_field_name, string $nonce_action_name ) {
 		if ( ! empty( $empty_message ) || ! empty( $fail_message ) ) {
 			_deprecated_argument( __FUNCTION__, '2.1.0' );
 		}
@@ -261,7 +262,7 @@ function hcaptcha_get_verify_output( $empty_message, $fail_message, $nonce_field
 	 *
 	 * @return null|string Null on success, error message on failure.
 	 */
-	function hcaptcha_get_verify_message( $nonce_field_name, $nonce_action_name ) {
+	function hcaptcha_get_verify_message( string $nonce_field_name, string $nonce_action_name ) {
 		return hcaptcha_get_verify_output( '', '', $nonce_field_name, $nonce_action_name );
 	}
 }
@@ -275,7 +276,7 @@ function hcaptcha_get_verify_message( $nonce_field_name, $nonce_action_name ) {
 	 *
 	 * @return null|string Null on success, error message on failure.
 	 */
-	function hcaptcha_get_verify_message_html( $nonce_field_name, $nonce_action_name ) {
+	function hcaptcha_get_verify_message_html( string $nonce_field_name, string $nonce_action_name ) {
 		$message = hcaptcha_get_verify_output( '', '', $nonce_field_name, $nonce_action_name );
 
 		if ( null === $message ) {
@@ -301,7 +302,7 @@ function hcaptcha_get_verify_message_html( $nonce_field_name, $nonce_action_name
 	 *
 	 * @return string
 	 */
-	function hcap_hcaptcha_error_message( $hcaptcha_content = '' ) {
+	function hcap_hcaptcha_error_message( string $hcaptcha_content = '' ) {
 		_deprecated_function( __FUNCTION__, '2.1.0' );
 
 		$message = sprintf(