chore: core review

Author: Soare-Robert-Daniel

inc/integrations/class-form-settings-data.php

@@ -366,7 +366,7 @@ public function set_captcha( $has_captcha ) {
 	/**
 	 * Set captcha provider.
 	 *
-	 * @param string $provider Provider slug.
+	 * @param mixed $provider Provider slug, as received from the form options payload.
 	 * @return Form_Settings_Data
 	 * @since 3.1.12
 	 */

inc/render/class-form-captcha-block.php

@@ -18,7 +18,7 @@ class Form_Captcha_Block {
 	 * This method will pe passed to the render_callback parameter and it will output
 	 * the server side output of the block.
 	 *
-	 * @param array $attributes Block attrs.
+	 * @param array<string, mixed> $attributes Block attrs.
 	 * @return mixed|string
 	 */
 	public function render( $attributes ) {

inc/server/class-form-server.php

@@ -988,12 +988,12 @@ public function check_form_captcha( $form_data ) {
 				)
 			);
 
-			if ( is_wp_error( $resp ) || ! isset( $resp['body'] ) ) {
+			if ( is_wp_error( $resp ) ) {
 				$form_data->set_error( Form_Data_Response::ERROR_INVALID_CAPTCHA_TOKEN );
 				return $form_data;
 			}
 
-			$result = json_decode( $resp['body'], true );
+			$result = json_decode( wp_remote_retrieve_body( $resp ), true );
 
 			if ( ! is_array( $result ) || empty( $result['success'] ) ) {
 				$form_data->set_error( Form_Data_Response::ERROR_INVALID_CAPTCHA_TOKEN );

src/blocks/test/unit/form-captcha.test.js

@@ -3,9 +3,9 @@ import { addCaptchaOnPage } from '../../frontend/form/captcha';
 /**
  * Build a form container like the saved Form block markup.
  *
- * @param {string}  id              The form id.
- * @param {Object}  options         Options.
- * @param {boolean} options.legacy  Add the legacy `has-captcha` class.
+ * @param {string}  id               The form id.
+ * @param {Object}  options          Options.
+ * @param {boolean} options.legacy   Add the legacy `has-captcha` class.
  * @param {string}  options.provider Add a Captcha block container with the given provider.
  * @return {HTMLDivElement} The form node, attached to the document.
  */