V3.5.0 (#300)

* Fix composer.json.

* Bump up version.

* Add ability to process customized MailChimp forms.

* Add the ability to process customized MailChimp forms.

* Remove unneeded arrays from load_modules.

* Add hCaptcha field to GF admin.

* Verify any type of GF hcaptcha field on front.

* Do not auto-add hCaptcha if reCaptcha is in the form.

* Disable duplication link on hCaptcha field.

* Prevent duplication of hCaptcha field by JS.

* Add hCaptcha field settings in GF.

* Set GF hCaptcha default values in JS.

* Fix init issue.

* Update GF styles.

* Styling GF with auto/injected/modern/legacy.

* Make GF injected hCaptcha label hidden by default.

* Styling GF with auto/injected/modern/legacy.

* Differ auto and insertion mode for GF.

* Fix GF tests.

* Amend GF tests.

* Fix yarn on CI.

* Fix yarn on CI.

* Make hCaptcha active when editing a GF form.

* Make hCaptcha active when editing a GF form.

* Add hCaptcha settings information on the GF edit page.

* Fix yarn on CI.

* Fix Main test.

* Fix yarn on CI.

* Fix comments.

* Update readme.txt.

* Update readme.txt.

* Fix loading of local .mo files.

* WPCS in AutoVerify.php.

* Grammar and WPCS.

* WPCS in request.php.

* Grammar and WPCS.

* Add embed setting to GF.

* Add HTML Forms integration.

* Fix NF naming.

* Do not display a size option for NF field.

* Clean and update NF code.

* Fix WPForo tests on CI.

* Clean and update NF code.

* Grammar.

* Add template in admin.

* Make hCaptcha visible in admin (no JS source + Backbone).
Fix bug in NF - template id is different for admin and front.

* Make hCaptcha active in admin.
Update hCaptcha on open/close of settings drawer.

* Update readme.txt.
Fix yarn.lock.

* Optimize NF admin mutation observer.

* Add invisible hCaptcha support for Ninja Forms.

* Fix yarn on CI.

* Fix yarn on CI.

* Fix yarn on CI.

* Upgrade js packages.

* Upgrade readme.txt.

* Reposition hCaptcha field in NF admin.

* Fix yarn on CI.

* Add icon to NF hCaptcha.

* Prevent from having multiple hCaptcha fields in NF.

* Prevent from having multiple hCaptcha fields in NF.

* Prevent from having multiple hCaptcha fields in NF.

* Update hCaptcha when adding another field.

* Update hCaptcha when adding another field.

* Place hCaptcha field before recaptcha field.

* Fix updating preloadedFormData.

* Fix fatal with WP Dark Mode plugin and HCaptcha in dev mode.

* Respect dark theme basically.

* Upgrade readme.txt.

* Respect dark theme by WP Dark Theme plugin.

* Upgrade readme.txt.

* Fix dark mode bugs.

* Add support for the Droit Dark Mode plugin.

* Upgrade readme.txt.

* Update readme.txt.

* Add Blogstream theme.

* Add WP hook system in JS.

* Fix MailPoet issues in admin.

* Lang ptBR

* Add PHP 8.3 support.

* Add PHP 8.3 support.

* Update readme.txt.

* Add pt_BR translation.

* Do not include .pot files in the distribution package.

* Add pt_BR translation.

* Add pt_BR translation.

* Update en_US.pot.

* Prevent flickering with dark mode plugins.

* Prevent flickering with dark mode plugins.

* Add ability to activate/deactivate themes from the Integrations settings page.

* Test dismissed notifications.

* Test dismissed notifications.

* Test dismissed notifications.

* Test shuffled notifications.

* Test admin_enqueue_scripts.

* Test admin_enqueue_scripts.

* Add pt_BR translation.

* Test dismiss_notification().

* Test dismiss_notification().

* Test dismiss_notification().

* Cover Notifications in 100%.

* Cover HCaptchaHandler with tests 100%.

* Cover Jetpack with tests by 100%.

* Cover Wordfence with tests by 100%.

* Cover functions with tests by 100%.

* Cover functions with tests by 100%.

* Rename dir in tests.

* Cover HCaptcha helpers with tests by 100%.

* Bump up version.

---------

Co-authored-by: Maison da Silva <maisonmdsgreen@hotmail.com>

Author: kagg-design

.distignore

@@ -21,6 +21,7 @@
 /phpcs.xml
 /webpack.config.js
 /yarn.lock
+/languages/*.pot
 
 # Directories
 /.codeception

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       matrix:
         os: [ ubuntu-latest ]
-        php-version: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+        php-version: [ '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ]
 
     env:
       wp-directory: wordpress
@@ -52,6 +52,7 @@ jobs:
         working-directory: ${{ env.wp-plugin-directory }}
         if: ${{ matrix.php-version == '8.2' }}
         run: |
+          corepack enable
           yarn set version stable
           yarn
           yarn dev
@@ -93,6 +94,11 @@ jobs:
         working-directory: ${{ env.wp-directory }}
         run: wp plugin install bbpress buddypress ultimate-member wpforms-lite wpforo
 
+      - name: Install plugins requiring 7.1
+        if: ${{ matrix.php-version >= '7.1' }}
+        working-directory: ${{ env.wp-directory }}
+        run: wp plugin install wpforo
+
       - name: Install plugins requiring 7.2
         if: ${{ matrix.php-version >= '7.2' }}
         working-directory: ${{ env.wp-directory }}

.github/workflows/create-zip.yml

@@ -20,6 +20,7 @@ jobs:
 
       - name: Install packages
         run: |
+          corepack enable
           yarn set version stable
           yarn
           yarn prod

.github/workflows/deploy-to-wp-org.yml

@@ -22,6 +22,7 @@ jobs:
 
       - name: Install packages
         run: |
+          corepack enable
           yarn set version stable
           yarn
           yarn prod

.tests/js/assets-js-files/integrations.test.js

@@ -27,7 +27,7 @@ function getDom() {
 		<tr class="hcaptcha-integrations-wp-status">
 			<th scope="row">
 				<img src="https://test.test/wp-content/plugins/hcaptcha-wordpress-plugin/assets/images/wp-core-logo.png"
-					 alt="WP Core Logo">
+					 alt="WP Core Logo" data-entity="core">
 			</th>
 			<td>
 				<fieldset>
@@ -71,7 +71,7 @@ function getDom() {
 		<tr class="hcaptcha-integrations-acfe-status">
 			<th scope="row">
 				<img src="https://test.test/wp-content/plugins/hcaptcha-wordpress-plugin/assets/images/acf-extended-logo.png"
-					 alt="ACF Extended Logo">
+					 alt="ACF Extended Logo" data-entity="plugin">
 			</th>
 			<td>
 				<fieldset disabled="disabled">

.tests/php/integration/AAAMainTest.php

@@ -161,7 +161,6 @@ static function () use ( $whitelisted ) {
 		self::assertSame( - PHP_INT_MAX, has_action( 'plugins_loaded', [ $hcaptcha, 'init_hooks' ] ) );
 
 		self::assertSame( - PHP_INT_MAX + 1, has_action( 'plugins_loaded', [ $hcaptcha, 'load_modules' ] ) );
-		self::assertSame( 10, has_action( 'plugins_loaded', [ $hcaptcha, 'load_textdomain' ] ) );
 
 		self::assertSame( 10, has_filter( 'wp_resource_hints', [ $hcaptcha, 'prefetch_hcaptcha_dns' ] ) );
 		self::assertSame( 10, has_filter( 'wp_headers', [ $hcaptcha, 'csp_headers' ] ) );
@@ -192,10 +191,6 @@ static function () use ( $whitelisted ) {
 			- PHP_INT_MAX + 1,
 			has_action( 'plugins_loaded', [ $subject, 'load_modules' ] )
 		);
-		self::assertSame(
-			10,
-			has_action( 'plugins_loaded', [ $subject, 'load_textdomain' ] )
-		);
 		self::assertSame(
 			- PHP_INT_MAX,
 			has_filter(
@@ -293,10 +288,6 @@ static function () {
 			- PHP_INT_MAX + 1,
 			has_action( 'plugins_loaded', [ $subject, 'load_modules' ] )
 		);
-		self::assertSame(
-			10,
-			has_action( 'plugins_loaded', [ $subject, 'load_textdomain' ] )
-		);
 		self::assertSame(
 			- PHP_INT_MAX,
 			has_filter(
@@ -544,12 +535,17 @@ public function test_print_inline_styles() {
 				background-position: 50% 79%;
 			}
 
-			.h-captcha[data-theme="light"]::before {
+			.h-captcha[data-theme="light"]::before,
+			body.is-light-theme .h-captcha[data-theme="auto"]::before,
+			.h-captcha[data-theme="auto"]::before {
 				background-color: #fafafa;
 				border: 1px solid #e0e0e0;
 			}
 
-			.h-captcha[data-theme="dark"]::before {
+			.h-captcha[data-theme="dark"]::before,
+			body.is-dark-theme .h-captcha[data-theme="auto"]::before,
+			html.wp-dark-mode-active .h-captcha[data-theme="auto"]::before,
+			html.drdt-dark-mode .h-captcha[data-theme="auto"]::before {
 				background-image: url(' . $div_logo_url_white . ');
 				background-repeat: no-repeat;
 				background-color: #333;
@@ -703,7 +699,8 @@ function delayedLoad() {
 			} )();
 		</script>';
 
-		$site_key       = 'some key';
+		$site_key       = 'some site key';
+		$secret_key     = 'some secret key';
 		$theme          = 'light';
 		$size           = 'normal';
 		$language       = $language ?: '';
@@ -727,6 +724,7 @@ function delayedLoad() {
 				'recaptcha_compat_off' => $compat ? [ $compat ] : [],
 				'language'             => $language,
 				'site_key'             => $site_key,
+				'secret_key'           => $secret_key,
 				'mode'                 => 'live',
 				'theme'                => $theme,
 				'size'                 => $size,
@@ -1210,9 +1208,9 @@ public function dp_test_load_modules(): array {
 				\HCaptcha\GiveWP\Form::class,
 			],
 			'Gravity Forms'                     => [
-				[ 'gravity_status', 'form' ],
+				[ 'gravity_status', null ],
 				'gravityforms/gravityforms.php',
-				\HCaptcha\GravityForms\Form::class,
+				[ \HCaptcha\GravityForms\Form::class, \HCaptcha\GravityForms\Field::class ],
 			],
 			'Jetpack'                           => [
 				[ 'jetpack_status', 'contact' ],
@@ -1468,8 +1466,6 @@ static function ( $override, $domain, $mofile ) use ( &$override_filter_params )
 			3
 		);
 
-		self::assertEquals( 10, has_action( 'plugins_loaded', [ $subject, 'load_textdomain' ] ) );
-
 		$subject->load_textdomain();
 
 		self::assertFalse( $override_filter_params[0] );