Use PHP 7 new features.

hCaptcha · Jul 19, 2023 · 9b4ef71 · 9b4ef71
1 parent c7a936c
commit 9b4ef71
Show file tree

Hide file tree

Showing 55 changed files with 167 additions and 165 deletions.
diff --git a/src/php/ACFE/Form.php b/src/php/ACFE/Form.php
@@ -122,7 +122,7 @@ public function add_hcaptcha( $field ) {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function remove_recaptcha_verify( $valid, $value, $field, $input ) {
+	public function remove_recaptcha_verify( $valid, $value, $field, $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 ) {
 	 * @return bool
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $valid, $value, $field, $input ) {
+	public function verify( $valid, $value, $field, $input ): bool {
 		if ( ! $field['required'] ) {
 			return $valid;
 		}
@@ -185,7 +185,7 @@ public function enqueue_scripts() {
 	 *
 	 * @return bool
 	 */
-	private function is_recaptcha( $field ) {
+	private function is_recaptcha( $field ): bool {
 		return isset( $field['type'] ) && 'acfe_recaptcha' === $field['type'];
 	}
 }
diff --git a/src/php/Abstracts/LoginBase.php b/src/php/Abstracts/LoginBase.php
@@ -96,7 +96,7 @@ public function login_failed( $username, $error = null ) {
 	 *
 	 * @return bool
 	 */
-	protected function is_login_limit_exceeded() {
+	protected function is_login_limit_exceeded(): bool {
 		$now            = time();
 		$login_limit    = (int) hcaptcha()->settings()->get( 'login_limit' );
 		$login_interval = (int) hcaptcha()->settings()->get( 'login_interval' );

diff --git a/src/php/Asgaros/Base.php b/src/php/Asgaros/Base.php
@@ -77,7 +77,7 @@ public function add_captcha( $output, $tag, $attr, $m ) {
 	 *
 	 * @return bool
 	 */
-	public function verify( $verified ) {
+	public function verify( $verified ): bool {
 		global $asgarosforum;
 
 		$error_message = hcaptcha_get_verify_message(

diff --git 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 ) {
+	public function content_filter( $content ): string {
 		if ( ! $this->is_frontend() ) {
 			return $content;
 		}
@@ -117,7 +117,7 @@ public function verify_form() {
 	 *
 	 * @return bool
 	 */
-	private function is_frontend() {
+	private function is_frontend(): bool {
 		return ! ( $this->is_cli() || is_admin() || wp_doing_ajax() || $this->is_rest() );
 	}
 
@@ -134,7 +134,7 @@ private function is_frontend() {
 	 * @return bool
 	 * @author matzeeable
 	 */
-	private function is_rest() {
+	private function is_rest(): bool {
 		if ( ! isset( $_SERVER['REQUEST_URI'] ) ) {
 			return false;
 		}
@@ -173,7 +173,7 @@ private function is_rest() {
 	 *
 	 * @return bool
 	 */
-	private function is_cli() {
+	private function is_cli(): bool {
 		return defined( 'WP_CLI' ) && constant( 'WP_CLI' );
 	}
 
@@ -210,7 +210,7 @@ private function register_forms( $forms ) {
 	 *
 	 * @return string
 	 */
-	private function get_form_action( $form ) {
+	private function get_form_action( $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 ) {
 	 *
 	 * @return array
 	 */
-	private function get_visible_input_names( $form ) {
+	private function get_visible_input_names( $form ): array {
 		$names = [];
 
 		if ( ! preg_match_all( '#<input[\S\s]+?>#', $form, $matches ) ) {
@@ -266,7 +266,7 @@ private function get_visible_input_names( $form ) {
 	 *
 	 * @return bool
 	 */
-	private function is_input_visible( $input ) {
+	private function is_input_visible( $input ): bool {
 		return ! preg_match( '#type\s*?=\s*?["\']hidden["\']#', $input );
 	}
 
@@ -307,7 +307,7 @@ private function get_form_auto( $form ) {
 	 *
 	 * @return bool
 	 */
-	private function is_form_auto( $form ) {
+	private function is_form_auto( $form ): bool {
 		return 'true' === $this->get_form_auto( $form );
 	}
 
@@ -359,7 +359,7 @@ private function update_transient( $forms_data ) {
 	 *
 	 * @return bool
 	 */
-	private function is_form_registered( $request_uri ) {
+	private function is_form_registered( $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
@@ -61,7 +61,7 @@ public function form_after_open( $args, $params ) {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $html, $args ) {
+	public function add_hcaptcha( $html, $args ): string {
 		if ( false === strpos( $html, '<button type="submit"' ) ) {
 			return $html;
 		}

diff --git a/src/php/BBPress/Base.php b/src/php/BBPress/Base.php
@@ -53,7 +53,7 @@ public function add_captcha() {
 	 *
 	 * @return bool
 	 */
-	public function verify() {
+	public function verify(): bool {
 		$error_message = hcaptcha_get_verify_message( static::NAME, static::ACTION );
 
 		if ( null !== $error_message ) {

diff --git 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 ) {
+	protected function add_hcap_form( $out, $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
@@ -45,7 +45,7 @@ public function init_hooks() {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function add_hcaptcha( $out, $module ) {
+	public function add_hcaptcha( $out, $module ): string {
 
 		// Process contact form only.
 		if ( false === strpos( $out, '<form class="fl-contact-form"' ) ) {

diff --git 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 ) {
+	public function add_hcaptcha( $out, $module ): string {
 		if ( ! $this->is_login_limit_exceeded() ) {
 			return $out;
 		}

diff --git a/src/php/BuddyPress/CreateGroup.php b/src/php/BuddyPress/CreateGroup.php
@@ -71,7 +71,7 @@ public function add_captcha() {
 	 * @noinspection PhpUnusedParameterInspection
 	 * @noinspection PhpUndefinedFunctionInspection
 	 */
-	public function verify( $bp_group ) {
+	public function verify( $bp_group ): bool {
 		if ( ! bp_is_group_creation_step( 'group-details' ) ) {
 			return false;
 		}

diff --git a/src/php/BuddyPress/Register.php b/src/php/BuddyPress/Register.php
@@ -76,7 +76,7 @@ public function add_captcha() {
 	 * @return bool
 	 * @noinspection PhpUndefinedFieldInspection
 	 */
-	public function verify() {
+	public function verify(): bool {
 		global $bp;
 
 		$error_message = hcaptcha_get_verify_message(

diff --git 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 ) {
+	public function wpcf7_shortcode( $output, $tag, $attr, $m ): string {
 		if ( 'contact-form-7' !== $tag ) {
 			return $output;
 		}
@@ -89,7 +89,7 @@ public function wpcf7_shortcode( $output, $tag, $attr, $m ) {
 	 * @return string
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function cf7_hcaptcha_shortcode( $attr = [] ) {
+	public function cf7_hcaptcha_shortcode( $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 ) {
+	public function verify_hcaptcha( $result, $tag ): WPCF7_Validation {
 		$submission = WPCF7_Submission::get_instance();
 
 		if ( null === $submission ) {
@@ -209,7 +209,7 @@ public function verify_hcaptcha( $result, $tag ) {
 	 *
 	 * @return WPCF7_Validation
 	 */
-	private function get_invalidated_result( $result, $captcha_result = '' ) {
+	private function get_invalidated_result( $result, $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 ) {
+	private function add_form_id_to_cf7_hcap_shortcode( $output, $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/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 ) {
+	public function verify( $validation_error, $email, $username, $password, $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
@@ -48,5 +48,5 @@ public function login_head() {
 	 *
 	 * @return string
 	 */
-	abstract protected function get_style( $hcaptcha_size );
+	abstract protected function get_style( $hcaptcha_size ): string;
 }
diff --git 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 ) {
+	protected function get_style( $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {

diff --git 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 ) {
+	protected function get_style( $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {

diff --git 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 ) {
+	protected function get_style( $hcaptcha_size ): string {
 		ob_start();
 
 		switch ( $hcaptcha_size ) {

diff --git a/src/php/DelayedScript/DelayedScript.php b/src/php/DelayedScript/DelayedScript.php
@@ -20,7 +20,7 @@ class DelayedScript {
 	 *
 	 * @return string
 	 */
-	public static function create( $js, $delay = 3000 ) {
+	public static function create( $js, $delay = 3000 ): string {
 		ob_start();
 		?>
 		<!--suppress JSUnusedAssignment -->

diff --git a/src/php/Divi/Contact.php b/src/php/Divi/Contact.php
@@ -179,7 +179,7 @@ static function ( $item ) {
 	 *
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function shortcode_attributes( $props, $attrs, $slug, $_address, $content ) {
+	public function shortcode_attributes( $props, $attrs, $slug, $_address, $content ): array {
 		if ( self::TAG !== $slug ) {
 			return $props;
 		}

diff --git 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 ) {
+	public function add_captcha( $html, $single_name_field ): string {
 		$args = [
 			'action' => self::ACTION,
 			'name'   => self::NONCE,

diff --git 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 ) {
+	public function add_hcaptcha( $template, $vars ): string {
 		$form_id = 0;
 
 		if ( preg_match( '/wpdmdl=(\d+)/', $template, $m ) ) {

diff --git a/src/php/ElementorPro/HCaptchaHandler.php b/src/php/ElementorPro/HCaptchaHandler.php
@@ -108,7 +108,7 @@ public function register_action( $module ) {
 	 *
 	 * @return string
 	 */
-	protected static function get_hcaptcha_name() {
+	protected static function get_hcaptcha_name(): string {
 		return self::FIELD_ID;
 	}
 

diff --git a/src/php/FluentForm/Form.php b/src/php/FluentForm/Form.php
@@ -105,7 +105,7 @@ public function add_captcha( $submit_button, $form ) {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $data, $form, $fields ) {
+	public function verify( $errors, $data, $form, $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 ) {
+	public function fluentform_rendering_form_filter( $form ): stdClass {
 		static $has_own_captcha = false;
 
 		if ( $this->has_own_hcaptcha( $form ) ) {
@@ -192,7 +192,7 @@ public function fluentform_rendering_form_filter( $form ) {
 	 *
 	 * @return bool
 	 */
-	protected function has_own_hcaptcha( $form ) {
+	protected function has_own_hcaptcha( $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
@@ -88,7 +88,7 @@ public function get_transient( $value, $transient ) {
 	 *
 	 * @return string
 	 */
-	public function add_captcha( $html, $field, $atts ) {
+	public function add_captcha( $html, $field, $atts ): string {
 		if ( 'captcha' !== $field['type'] ) {
 			return $html;
 		}
@@ -132,7 +132,7 @@ public function add_captcha( $html, $field, $atts ) {
 	 * @return bool
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function prevent_native_validation( $is_field_hidden, $field, $post ) {
+	public function prevent_native_validation( $is_field_hidden, $field, $post ): bool {
 		if ( 'captcha' !== $field->type ) {
 			return $is_field_hidden;
 		}
@@ -159,7 +159,7 @@ public function prevent_native_validation( $is_field_hidden, $field, $post ) {
 	 * @return array
 	 * @noinspection PhpUnusedParameterInspection
 	 */
-	public function verify( $errors, $values, $validate_args ) {
+	public function verify( $errors, $values, $validate_args ): array {
 		$error_message = hcaptcha_verify_post(
 			self::NONCE,
 			self::ACTION