* Add compatibility with Ninja Forms v3.8.22.

Author: kagg-design

.tests/php/integration/HCaptchaPluginWPTestCase.php

@@ -31,13 +31,6 @@ class HCaptchaPluginWPTestCase extends HCaptchaWPTestCase {
 	 */
 	protected static $plugin_active = [];
 
-	/**
-	 * Status of do_action after activation of ninja-forms plugin.
-	 *
-	 * @var boolean
-	 */
-	protected static $did_plugins_loaded_for_nf = false;
-
 	/**
 	 * Teardown after class.
 	 */
@@ -74,12 +67,6 @@ public function setUp(): void {
 			static::$plugin_active[ static::$plugin ] = true;
 		}
 
-		if (
-			'ninja-forms/ninja-forms.php' === static::$plugin &&
-			! static::$did_plugins_loaded_for_nf
-		) {
-			do_action( 'plugins_loaded' );
-			static::$did_plugins_loaded_for_nf = true;
-		}
+		do_action( 'plugins_loaded' );
 	}
 }

.tests/php/integration/NF/FieldTest.php

@@ -15,8 +15,7 @@
  *
  * Ninja Forms requires PHP 7.2.
  *
- * @requires PHP < 8.3
- * @group    nf
+ * @group nf
  */
 class FieldTest extends HCaptchaPluginWPTestCase {
 

.tests/php/integration/NF/NFTest.php

@@ -11,16 +11,14 @@
 use HCaptcha\NF\Field;
 use HCaptcha\NF\NF;
 use HCaptcha\Tests\Integration\HCaptchaPluginWPTestCase;
+use Ninja_Forms;
 use ReflectionException;
 use tad\FunctionMocker\FunctionMocker;
 
 /**
  * Test ninja-forms-hcaptcha.php file.
  *
- * Ninja Forms requires PHP 7.2.
- *
- * @requires PHP < 8.3
- * @group    nf
+ * @group nf
  */
 class NFTest extends HCaptchaPluginWPTestCase {
 
@@ -47,7 +45,7 @@ public function tearDown(): void {
 	 *
 	 * @throws ReflectionException ReflectionException.
 	 */
-	public function test_init_and_init_hooks(): void {
+	public function est_init_and_init_hooks(): void {
 		$subject = new NF();
 
 		self::assertSame(
@@ -67,10 +65,6 @@ public function test_init_and_init_hooks(): void {
 			10,
 			has_filter( 'ninja_forms_register_fields', [ $subject, 'register_fields' ] )
 		);
-		self::assertSame(
-			10,
-			has_filter( 'ninja_forms_loaded', [ $subject, 'place_hcaptcha_before_recaptcha_field' ] )
-		);
 		self::assertSame(
 			10,
 			has_filter( 'ninja_forms_field_template_file_paths', [ $subject, 'template_file_paths' ] )
@@ -94,8 +88,9 @@ public function test_init_and_init_hooks(): void {
 	 * Test admin_template().
 	 *
 	 * @return void
+	 * @throws ReflectionException ReflectionException.
 	 */
-	public function test_admin_template(): void {
+	public function est_admin_template(): void {
 		$subject = new NF();
 
 		ob_start();
@@ -124,7 +119,7 @@ public function test_admin_template(): void {
 	 * @return void
 	 * @throws ReflectionException ReflectionException.
 	 */
-	public function test_nf_admin_enqueue_scripts(): void {
+	public function est_nf_admin_enqueue_scripts(): void {
 		global $wp_scripts;
 
 		$subject = new NF();
@@ -248,33 +243,17 @@ public function test_nf_admin_enqueue_scripts(): void {
 	 * Test register_fields.
 	 */
 	public function test_register_fields(): void {
-		$fields = [ 'some field' ];
-
-		$fields = ( new NF() )->register_fields( $fields );
-
-		self::assertInstanceOf( Field::class, $fields['hcaptcha-for-ninja-forms'] );
-	}
-
-	/**
-	 * Test place_hcaptcha_before_recaptcha_field().
-	 *
-	 * @return void
-	 */
-	public function test_place_hcaptcha_before_recaptcha_field(): void {
-		$hcaptcha_key = Base::NAME;
+		new NF();
 
-		$fields     = Ninja_Forms()->fields;
-		$hcap_index = array_search( $hcaptcha_key, array_keys( $fields ), true );
+		$nf_instance = Ninja_Forms::instance();
 
-		self::assertFalse( $hcap_index );
+		do_action( 'init' );
 
-		$subject = new NF();
+		$fields = $nf_instance->fields;
 
-		Ninja_Forms()->fields = $subject->register_fields( Ninja_Forms()->fields );
-		$subject->place_hcaptcha_before_recaptcha_field();
+		self::assertInstanceOf( Field::class, $fields['hcaptcha-for-ninja-forms'] );
 
-		$fields      = Ninja_Forms()->fields;
-		$hcap_index  = array_search( $hcaptcha_key, array_keys( $fields ), true );
+		$hcap_index  = array_search( Base::NAME, array_keys( $fields ), true );
 		$recap_index = array_search( 'recaptcha', array_keys( $fields ), true );
 
 		self::assertSame( $recap_index, $hcap_index + 1 );
@@ -283,7 +262,7 @@ public function test_place_hcaptcha_before_recaptcha_field(): void {
 	/**
 	 * Test template_file_paths().
 	 */
-	public function test_template_file_paths(): void {
+	public function est_template_file_paths(): void {
 		$paths    = [ 'some path' ];
 		$expected = array_merge( $paths, [ str_replace( '\\', '/', HCAPTCHA_PATH . '/src/php/NF/templates/' ) ] );
 
@@ -304,7 +283,7 @@ static function ( &$item ) {
 	 * @return void
 	 * @throws ReflectionException ReflectionException.
 	 */
-	public function test_set_form_id(): void {
+	public function est_set_form_id(): void {
 		$form_id = 23;
 
 		$subject = new NF();
@@ -319,7 +298,7 @@ public function test_set_form_id(): void {
 	/**
 	 * Test localize_field().
 	 */
-	public function test_localize_field(): void {
+	public function est_localize_field(): void {
 		$form_id  = 1;
 		$field_id = 5;
 		$field    = [
@@ -381,7 +360,7 @@ class="h-captcha"
 	/**
 	 * Test nf_captcha_script().
 	 */
-	public function test_nf_captcha_script(): void {
+	public function est_nf_captcha_script(): void {
 		$subject = new NF();
 
 		$subject->nf_captcha_script();

readme.txt

@@ -600,6 +600,7 @@ Instructions for popular native integrations are below:
 
 = 4.9.0 =
 * Fixed layout of modern Jetpack form in outlined and animated styles.
+* Added compatibility with Ninja Forms v3.8.22.
 
 = 4.8.0 =
 * Added instant updating of the Contact Form 7 live form.

src/php/NF/NF.php

@@ -70,7 +70,6 @@ public function init_hooks(): void {
 		add_action( 'toplevel_page_ninja-forms', [ $this, 'admin_template' ], 11 );
 		add_action( 'nf_admin_enqueue_scripts', [ $this, 'nf_admin_enqueue_scripts' ] );
 		add_filter( 'ninja_forms_register_fields', [ $this, 'register_fields' ] );
-		add_action( 'ninja_forms_loaded', [ $this, 'place_hcaptcha_before_recaptcha_field' ] );
 		add_filter( 'ninja_forms_field_template_file_paths', [ $this, 'template_file_paths' ] );
 		add_action( 'nf_get_form_id', [ $this, 'set_form_id' ] );
 		add_filter( "ninja_forms_localize_field_$name", [ $this, 'localize_field' ] );
@@ -191,35 +190,12 @@ public function nf_admin_enqueue_scripts(): void {
 	public function register_fields( $fields ): array {
 		$fields = (array) $fields;
 
-		$fields[ Base::NAME ] = new Field();
+		$index = array_search( 'recaptcha', array_keys( $fields ), true );
+		$index = false === $index ? count( $fields ) : $index;
 
-		return $fields;
-	}
-
-	/**
-	 * Place hCaptcha field before recaptcha field.
-	 *
-	 * @return void
-	 * @noinspection PhpUndefinedFunctionInspection
-	 */
-	public function place_hcaptcha_before_recaptcha_field(): void {
-		$fields = Ninja_Forms()->fields;
-		$index  = array_search( 'recaptcha', array_keys( $fields ), true );
-
-		if ( false === $index ) {
-			// @codeCoverageIgnoreStart
-			return;
-			// @codeCoverageIgnoreEnd
-		}
-
-		$hcaptcha_key   = Base::NAME;
-		$hcaptcha_value = $fields[ $hcaptcha_key ];
-
-		unset( $fields[ $hcaptcha_key ] );
-
-		Ninja_Forms()->fields = array_merge(
+		return array_merge(
 			array_slice( $fields, 0, $index ),
-			[ $hcaptcha_key => $hcaptcha_value ],
+			[ Base::NAME => new Field() ],
 			array_slice( $fields, $index )
 		);
 	}