Merge master

Author: AbdiTolesa

.eslintrc.json

@@ -19,7 +19,8 @@
 		"plugin:sonarjs/recommended",
 		"plugin:cypress/recommended",
 		"plugin:no-jquery/deprecated",
-		"plugin:compat/recommended"
+		"plugin:compat/recommended",
+		"plugin:unicorn/all"
 	],
 	"env": {
 		"browser": true,
@@ -34,7 +35,7 @@
 		"window": true,
 		"document": true
 	},
-	"plugins": ["react", "jsx-a11y", "sonarjs", "cypress", "no-jquery", "compat", "jsdoc"],
+	"plugins": ["react", "jsx-a11y", "sonarjs", "cypress", "no-jquery", "compat", "jsdoc", "unicorn"],
 	"settings": {
 		"import/resolver": {
 			"webpack": {
@@ -149,7 +150,56 @@
 		"no-jquery/no-when": "error",
 		"react/jsx-no-target-blank": "off",
 		"comma-dangle": "off",
-		"arrow-parens": ["error", "as-needed"]
+		"arrow-parens": ["error", "as-needed"],
+		"unicorn/filename-case": "off",
+		"unicorn/prefer-query-selector": "off",
+		"unicorn/no-null": "off",
+		"unicorn/prefer-module": "off",
+		"unicorn/explicit-length-check": "off",
+		"unicorn/better-regex": "off",
+		"unicorn/no-keyword-prefix": "off",
+		"unicorn/no-array-for-each": "off",
+		"unicorn/prevent-abbreviations": "off",
+		"unicorn/no-this-assignment": "off",
+		"unicorn/no-document-cookie": "off",
+		"unicorn/prefer-number-properties": "off",
+		"unicorn/prefer-spread": "off",
+		"unicorn/consistent-function-scoping": "off",
+		"unicorn/prefer-export-from": "off",
+		"unicorn/no-array-callback-reference": "off",
+		"unicorn/prefer-ternary": "off",
+		"unicorn/no-for-loop": "off",
+		"unicorn/no-array-reduce": "off",
+		"unicorn/prefer-at": "off",
+		"unicorn/consistent-destructuring": "off",
+		"unicorn/prefer-string-slice": "off",
+		"unicorn/catch-error-name": "off",
+		"unicorn/no-static-only-class": "off",
+		"unicorn/prefer-optional-catch-binding": "off",
+		"unicorn/no-lonely-if": "off",
+		"unicorn/prefer-set-has": "off",
+		"unicorn/prefer-switch": "off",
+		"unicorn/no-useless-switch-case": "off",
+		"unicorn/prefer-prototype-methods": "off",
+		// Fix this soon
+		"unicorn/prefer-dom-node-dataset": "off",
+		// Look more into this one.
+		"unicorn/numeric-separators-style": "off",
+		// Look into this
+		"unicorn/no-unsafe-regex": "off",
+		// Consider this one.
+		"unicorn/prefer-regexp-test": "off",
+		"unicorn/prefer-logical-operator-over-ternary": "off",
+		// Maybe fix
+		"unicorn/prefer-dom-node-text-content": "off",
+		"unicorn/empty-brace-spaces": "off",
+		// Probably fix
+		"unicorn/no-array-push-push": "off",
+		"unicorn/prefer-array-find": "off",
+		"unicorn/prefer-add-event-listener": "off",
+		"unicorn/text-encoding-identifier-case": "off",
+		"unicorn/prefer-string-replace-all": "off",
+		"unicorn/no-useless-promise-resolve-reject": "off"
 	},
 	"overrides": [
 		{
@@ -165,7 +215,14 @@
 				"no-jquery/no-prop": "error",
 				"no-jquery/no-filter": "error",
 				"no-jquery/no-data": "error",
-				"no-jquery/no-parents": "error"
+				"no-jquery/no-parents": "error",
+				"no-jquery/no-val": "error",
+				"no-jquery/no-serialize": "error",
+				"no-jquery/no-class": "error",
+				"no-jquery/no-closest": "error",
+				"no-jquery/no-ajax": "error",
+				"no-jquery/no-fade": "error",
+				"no-jquery/no-is": "error"
 			}
 		}
 	]

.php-cs-fixer.php

@@ -25,6 +25,7 @@
 	'no_whitespace_in_blank_line'          => true,
 	'ternary_to_null_coalescing'           => true,
 	'no_null_property_initialization'      => true,
+	'return_assignment'                    => true,
 	'blank_line_before_statement'          => array(
 		'statements' => array(
 			'try',

bin/zip-plugin.sh

@@ -51,6 +51,7 @@ zip -r $zipname $destination \
 	-x "*/.wordpress-org/*" \
 	-x "*/.wp-env.json" \
 	-x "*/.prettierrc" \
+	-x "*/.scannerwork" \
 	-x "*/.jscsrc" \
 	-x "*/.jshintrc" \
 	-x "*/.jshintignore" \

classes/controllers/FrmAddonsController.php

@@ -267,9 +267,8 @@ protected static function set_categories( &$addon ) {
 	public static function license_settings() {
 		$plugins = apply_filters( 'frm_installed_addons', array() );
 
-		if ( empty( $plugins ) ) {
+		if ( ! $plugins ) {
 			esc_html_e( 'There are no plugins on your site that require a license', 'formidable' );
-
 			return;
 		}
 
@@ -285,7 +284,7 @@ protected static function get_api_addons() {
 		$api    = new FrmFormApi();
 		$addons = $api->get_api_info();
 
-		if ( empty( $addons ) ) {
+		if ( ! $addons ) {
 			$addons = self::fallback_plugin_list();
 		} else {
 			foreach ( $addons as $k => $addon ) {
@@ -307,7 +306,6 @@ protected static function get_api_addons() {
 	 */
 	public static function get_addons_count() {
 		$addons = self::get_api_addons();
-
 		return count( $addons );
 	}
 
@@ -407,6 +405,7 @@ protected static function fallback_plugin_list() {
 			$info['slug'] = $k;
 			$list[ $k ]   = array_merge( $defaults, $info );
 		}
+
 		return $list;
 	}
 
@@ -447,14 +446,15 @@ public static function get_pro_license() {
 
 		$license = $creds['license'];
 
-		if ( empty( $license ) ) {
+		if ( ! $license ) {
 			return '';
 		}
 
-		if ( strpos( $license, '-' ) ) {
+		if ( str_contains( $license, '-' ) ) {
 			// this is a fix for licenses saved in the past
 			$license = strtoupper( $license );
 		}
+
 		return $license;
 	}
 
@@ -496,7 +496,7 @@ public static function is_license_expired() {
 
 		$expires = $version_info['error']['expires'] ?? 0;
 
-		if ( empty( $expires ) || $expires > time() ) {
+		if ( ! $expires || $expires > time() ) {
 			return false;
 		}
 
@@ -519,7 +519,7 @@ public static function is_license_expired() {
 	public static function get_primary_license_info() {
 		$installed_addons = apply_filters( 'frm_installed_addons', array() );
 
-		if ( empty( $installed_addons ) || ! isset( $installed_addons['formidable_pro'] ) ) {
+		if ( ! $installed_addons || ! isset( $installed_addons['formidable_pro'] ) ) {
 			return false;
 		}
 
@@ -549,7 +549,7 @@ public static function check_update( $transient ) {
 
 		$installed_addons = apply_filters( 'frm_installed_addons', array() );
 
-		if ( empty( $installed_addons ) ) {
+		if ( ! $installed_addons ) {
 			return $transient;
 		}
 
@@ -566,7 +566,7 @@ public static function check_update( $transient ) {
 
 			$folder = $plugin->plugin;
 
-			if ( empty( $folder ) ) {
+			if ( ! $folder ) {
 				continue;
 			}
 
@@ -641,13 +641,12 @@ protected static function fill_update_addon_info( $installed_addons ) {
 
 			$new_license = $addon->license;
 
-			if ( empty( $new_license ) || in_array( $new_license, $checked_licenses ) ) {
+			if ( ! $new_license || in_array( $new_license, $checked_licenses, true ) ) {
 				continue;
 			}
 
 			$checked_licenses[] = $new_license;
-
-			$api = new FrmFormApi( $new_license );
+			$api                = new FrmFormApi( $new_license );
 
 			if ( empty( $version_info ) ) {
 				$version_info = $api->get_api_info();
@@ -656,13 +655,13 @@ protected static function fill_update_addon_info( $installed_addons ) {
 
 			$plugin = $api->get_addon_for_license( $addon, $version_info );
 
-			if ( empty( $plugin ) ) {
+			if ( ! $plugin ) {
 				continue;
 			}
 
 			$download_id = $plugin['id'] ?? 0;
 
-			if ( ! empty( $download_id ) && ! isset( $version_info[ $download_id ]['package'] ) ) {
+			if ( $download_id && ! isset( $version_info[ $download_id ]['package'] ) ) {
 				// if this addon is using its own license, get the update url
 				$addon_info = $api->get_api_info();
 
@@ -710,7 +709,7 @@ public static function install_link( $plugin ) {
 				);
 			}
 
-			if ( ! empty( $link ) ) {
+			if ( $link ) {
 				$link['status'] = $addon['status']['type'];
 			}
 		} elseif ( current_user_can( 'activate_plugins' ) && self::is_installed( 'formidable-' . $plugin . '/formidable-' . $plugin . '.php' ) ) {
@@ -741,6 +740,7 @@ public static function get_addon( $plugin ) {
 				return $addon;
 			}
 		}
+
 		return false;
 	}
 
@@ -756,6 +756,7 @@ protected static function get_license_type() {
 		if ( isset( $addons['error'] ) && isset( $addons['error']['type'] ) ) {
 			$license_type = $addons['error']['type'];
 		}
+
 		return $license_type;
 	}
 
@@ -771,7 +772,7 @@ public static function get_addon_for_license( $addons, $license ) {
 		$download_id = $license->download_id;
 		$plugin      = array();
 
-		if ( empty( $download_id ) && ! empty( $addons ) ) {
+		if ( ! $download_id && ! empty( $addons ) ) {
 			foreach ( $addons as $addon ) {
 				if ( strtolower( $license->plugin_name ) === strtolower( $addon['title'] ) ) {
 					return $addon;
@@ -790,6 +791,9 @@ public static function get_addon_for_license( $addons, $license ) {
 	 * @return void
 	 */
 	protected static function prepare_addons( &$addons ) {
+		// Reset categories to prevent count accumulation across multiple calls.
+		self::$categories = array();
+
 		$activate_url = '';
 
 		if ( current_user_can( 'activate_plugins' ) ) {
@@ -803,10 +807,8 @@ protected static function prepare_addons( &$addons ) {
 				$slug      = str_replace( array( '-wordpress-plugin', '-wordpress' ), '', $addon['slug'] );
 				$file_name = $addon['plugin'];
 			} else {
-				$slug = $id;
-
+				$slug      = $id;
 				$base_file = $addon['file'] ?? 'formidable-' . $slug;
-
 				$file_name = $base_file . '/' . $base_file . '.php';
 
 				if ( ! isset( $addon['plugin'] ) ) {
@@ -826,7 +828,7 @@ protected static function prepare_addons( &$addons ) {
 
 			$addon['activate_url'] = '';
 
-			if ( $addon['installed'] && ! empty( $activate_url ) && ! self::is_plugin_active( $file_name, $slug ) ) {
+			if ( $addon['installed'] && $activate_url && ! self::is_plugin_active( $file_name, $slug ) ) {
 				$addon['activate_url'] = add_query_arg(
 					array(
 						'_wpnonce' => wp_create_nonce( 'activate-plugin_' . $file_name ),
@@ -984,11 +986,7 @@ protected static function uninstall_plugin( $plugin ) {
 		self::deactivate_plugin( $plugin, true );
 		$result = delete_plugins( array( $plugin ) );
 
-		if ( is_wp_error( $result ) ) {
-			return $result;
-		}
-
-		return true;
+		return is_wp_error( $result ) ? $result : true;
 	}
 
 	/**
@@ -1112,6 +1110,7 @@ protected static function install_addon() {
 				'success' => false,
 			);
 		}
+
 		return $plugin;
 	}
 
@@ -1229,6 +1228,7 @@ protected static function handle_addon_action( $installed, $action ) {
 				if ( wp_doing_ajax() ) {
 					wp_send_json_error( array( 'error' => $result->get_error_message() ) );
 				}
+
 				return array(
 					'message' => $result->get_error_message(),
 					'success' => false,
@@ -1244,8 +1244,7 @@ protected static function handle_addon_action( $installed, $action ) {
 	 */
 	private static function get_addon_activation_response() {
 		$activating_page = self::get_activating_page();
-
-		$message = $activating_page ? __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ) : __( 'Your plugin has been activated.', 'formidable' );
+		$message         = $activating_page ? __( 'Your plugin has been activated. Would you like to save and reload the page now?', 'formidable' ) : __( 'Your plugin has been activated.', 'formidable' );
 
 		return array(
 			'message'       => $message,
@@ -1266,11 +1265,7 @@ private static function get_activating_page() {
 			return 'settings';
 		}
 
-		if ( str_contains( $referer, 'frm_action=edit' ) ) {
-			return 'form_builder';
-		}
-
-		return '';
+		return str_contains( $referer, 'frm_action=edit' ) ? 'form_builder' : '';
 	}
 
 	/**
@@ -1297,7 +1292,7 @@ protected static function install_addon_permissions() {
 	public static function connect_link() {
 		$auth = get_option( 'frm_connect_token' );
 
-		if ( empty( $auth ) ) {
+		if ( ! $auth ) {
 			$auth = hash( 'sha512', wp_rand() );
 			update_option( 'frm_connect_token', $auth, 'no' );
 		}
@@ -1331,15 +1326,15 @@ public static function can_install_addon_api() {
 
 		// The download link is not required if already installed.
 		$is_installed = FrmAppHelper::pro_is_included();
-		$file_missing = ! $is_installed && empty( $post_url );
+		$file_missing = ! $is_installed && ! $post_url;
 
 		if ( ! $post_auth || $file_missing ) {
 			return false;
 		}
 
 		// Verify auth.
 		$auth = get_option( 'frm_connect_token' );
-		return ! empty( $auth ) && hash_equals( $auth, $post_auth );
+		return $auth && hash_equals( $auth, $post_auth );
 	}
 
 	/**
@@ -1550,7 +1545,6 @@ private static function allowed_external_urls() {
 
 		if ( ! is_array( $allowed_url_list ) ) {
 			_doing_it_wrong( __METHOD__, 'Only an array of URLs could be used within this filter.', '6.3.1' );
-
 			return array();
 		}