From 8316e6de275f6e92404c3c10b2fbedbef6220e43 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Fri, 9 Jan 2026 10:58:24 -0400 Subject: [PATCH 1/2] New sinplify isset falsy sniff --- classes/controllers/FrmEntriesController.php | 2 +- classes/helpers/FrmAppHelper.php | 2 +- classes/helpers/FrmXMLHelper.php | 2 +- classes/views/frm-forms/_publish_box.php | 2 +- .../SimplifyIssetFalsyCheckSniff.php | 255 ++++++++++++++++++ phpcs.xml | 1 + 6 files changed, 260 insertions(+), 4 deletions(-) create mode 100644 phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIssetFalsyCheckSniff.php diff --git a/classes/controllers/FrmEntriesController.php b/classes/controllers/FrmEntriesController.php index f5bb6a99d2..f13d0e9c50 100644 --- a/classes/controllers/FrmEntriesController.php +++ b/classes/controllers/FrmEntriesController.php @@ -374,7 +374,7 @@ public static function update_hidden_cols( $meta_id, $object_id, $meta_key, $met global $frm_vars; - if ( ! isset( $frm_vars['prev_hidden_cols'] ) || ! $frm_vars['prev_hidden_cols'] ) { + if ( empty( $frm_vars['prev_hidden_cols'] ) ) { // Don't continue if there's no previous value. return; } diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index aee17b82a1..f5fe7740ae 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -2951,7 +2951,7 @@ private static function fill_field_defaults( $field, $record, array &$values, $a FrmFieldsHelper::prepare_edit_front_field( $field_array, $field, $values['id'], $args ); - if ( ! isset( $field_array['unique'] ) || ! $field_array['unique'] ) { + if ( empty( $field_array['unique'] ) ) { $field_array['unique_msg'] = ''; } diff --git a/classes/helpers/FrmXMLHelper.php b/classes/helpers/FrmXMLHelper.php index 34f3597ce5..e954b58b79 100644 --- a/classes/helpers/FrmXMLHelper.php +++ b/classes/helpers/FrmXMLHelper.php @@ -1959,7 +1959,7 @@ public static function migrate_form_settings_to_actions( $form_options, $form_id * @param bool $switch */ private static function migrate_post_settings_to_action( $form_options, $form_id, $post_type, &$imported, $switch ) { - if ( ! isset( $form_options['create_post'] ) || ! $form_options['create_post'] ) { + if ( empty( $form_options['create_post'] ) ) { return; } diff --git a/classes/views/frm-forms/_publish_box.php b/classes/views/frm-forms/_publish_box.php index 5f580d1c0a..75963d2b1a 100644 --- a/classes/views/frm-forms/_publish_box.php +++ b/classes/views/frm-forms/_publish_box.php @@ -16,7 +16,7 @@
- +
diff --git a/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIssetFalsyCheckSniff.php b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIssetFalsyCheckSniff.php new file mode 100644 index 0000000000..065a4db353 --- /dev/null +++ b/phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIssetFalsyCheckSniff.php @@ -0,0 +1,255 @@ +getTokens(); + + // Check if isset is negated with "!". + $prevToken = $phpcsFile->findPrevious( T_WHITESPACE, $stackPtr - 1, null, true ); + + if ( false === $prevToken || $tokens[ $prevToken ]['code'] !== T_BOOLEAN_NOT ) { + return; + } + + $notToken = $prevToken; + + // Find the opening parenthesis after isset. + $issetOpenParen = $phpcsFile->findNext( T_WHITESPACE, $stackPtr + 1, null, true ); + + if ( false === $issetOpenParen || $tokens[ $issetOpenParen ]['code'] !== T_OPEN_PARENTHESIS ) { + return; + } + + if ( ! isset( $tokens[ $issetOpenParen ]['parenthesis_closer'] ) ) { + return; + } + + $issetCloseParen = $tokens[ $issetOpenParen ]['parenthesis_closer']; + + // Get the variable/expression inside isset(). + $issetContent = $this->getParenthesesContent( $phpcsFile, $issetOpenParen, $issetCloseParen ); + + if ( empty( $issetContent ) ) { + return; + } + + // Find the || operator after isset(). + $orOperator = $phpcsFile->findNext( T_WHITESPACE, $issetCloseParen + 1, null, true ); + + if ( false === $orOperator || $tokens[ $orOperator ]['code'] !== T_BOOLEAN_OR ) { + return; + } + + // Find the "!" after ||. + $secondNot = $phpcsFile->findNext( T_WHITESPACE, $orOperator + 1, null, true ); + + if ( false === $secondNot || $tokens[ $secondNot ]['code'] !== T_BOOLEAN_NOT ) { + return; + } + + // Find the variable after the second "!". + $secondVarStart = $phpcsFile->findNext( T_WHITESPACE, $secondNot + 1, null, true ); + + if ( false === $secondVarStart ) { + return; + } + + // Get the second expression and compare with the first. + $secondContent = $this->getExpressionContent( $phpcsFile, $secondVarStart ); + + if ( empty( $secondContent ) || $secondContent['content'] !== $issetContent['content'] ) { + return; + } + + // We have a match! Report the error. + $fix = $phpcsFile->addFixableError( + 'Simplify "! isset( %s ) || ! %s" to "empty( %s )"', + $stackPtr, + 'Found', + array( $issetContent['content'], $secondContent['content'], $issetContent['content'] ) + ); + + if ( true === $fix ) { + $phpcsFile->fixer->beginChangeset(); + + // Remove the "!" before isset. + $phpcsFile->fixer->replaceToken( $notToken, '' ); + + // Remove whitespace between "!" and "isset". + for ( $i = $notToken + 1; $i < $stackPtr; $i++ ) { + if ( $tokens[ $i ]['code'] === T_WHITESPACE ) { + $phpcsFile->fixer->replaceToken( $i, '' ); + } + } + + // Replace "isset" with "empty". + $phpcsFile->fixer->replaceToken( $stackPtr, 'empty' ); + + // Remove everything from after isset's closing paren to end of second expression. + $endToken = $secondContent['end']; + + for ( $i = $issetCloseParen + 1; $i <= $endToken; $i++ ) { + $phpcsFile->fixer->replaceToken( $i, '' ); + } + + $phpcsFile->fixer->endChangeset(); + } + } + + /** + * Get the content inside parentheses as a normalized string. + * + * @param File $phpcsFile The file being scanned. + * @param int $openParen The position of the opening parenthesis. + * @param int $closeParen The position of the closing parenthesis. + * + * @return array|false Array with 'content', 'start', 'end' keys, or false on failure. + */ + private function getParenthesesContent( File $phpcsFile, $openParen, $closeParen ) { + $tokens = $phpcsFile->getTokens(); + $content = ''; + $start = null; + $end = null; + + for ( $i = $openParen + 1; $i < $closeParen; $i++ ) { + if ( $tokens[ $i ]['code'] === T_WHITESPACE ) { + continue; + } + + if ( null === $start ) { + $start = $i; + } + + $end = $i; + $content .= $tokens[ $i ]['content']; + } + + if ( empty( $content ) ) { + return false; + } + + return array( + 'content' => $content, + 'start' => $start, + 'end' => $end, + ); + } + + /** + * Get an expression starting from a given token. + * + * @param File $phpcsFile The file being scanned. + * @param int $startPtr The starting position. + * + * @return array|false Array with 'content', 'start', 'end' keys, or false on failure. + */ + private function getExpressionContent( File $phpcsFile, $startPtr ) { + $tokens = $phpcsFile->getTokens(); + $content = ''; + $end = $startPtr; + + // Valid tokens in an expression like $arr['key']. + $validTokens = array( + T_VARIABLE, + T_STRING, + T_CONSTANT_ENCAPSED_STRING, + T_LNUMBER, + T_DNUMBER, + T_OPEN_SQUARE_BRACKET, + T_CLOSE_SQUARE_BRACKET, + T_OBJECT_OPERATOR, + T_NULLSAFE_OBJECT_OPERATOR, + T_DOUBLE_COLON, + ); + + $bracketDepth = 0; + + for ( $i = $startPtr; $i < count( $tokens ); $i++ ) { + $code = $tokens[ $i ]['code']; + + // Skip whitespace. + if ( $code === T_WHITESPACE ) { + continue; + } + + // Track bracket depth. + if ( $code === T_OPEN_SQUARE_BRACKET ) { + ++$bracketDepth; + $content .= $tokens[ $i ]['content']; + $end = $i; + continue; + } + + if ( $code === T_CLOSE_SQUARE_BRACKET ) { + --$bracketDepth; + $content .= $tokens[ $i ]['content']; + $end = $i; + continue; + } + + // If we're inside brackets, accept more token types. + if ( $bracketDepth > 0 ) { + $content .= $tokens[ $i ]['content']; + $end = $i; + continue; + } + + // Outside brackets, only accept valid expression tokens. + if ( ! in_array( $code, $validTokens, true ) ) { + break; + } + + $content .= $tokens[ $i ]['content']; + $end = $i; + } + + if ( empty( $content ) ) { + return false; + } + + return array( + 'content' => $content, + 'start' => $startPtr, + 'end' => $end, + ); + } +} diff --git a/phpcs.xml b/phpcs.xml index f63296a2b8..fb89be9411 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -284,4 +284,5 @@ + From 15911ca471a2aed449a5e17f884390a44ed8cce5 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Fri, 9 Jan 2026 11:06:08 -0400 Subject: [PATCH 2/2] Add an isset truthy sniff as well --- classes/controllers/FrmEntriesController.php | 4 +- .../controllers/FrmFormActionsController.php | 4 +- classes/controllers/FrmStylesController.php | 2 +- classes/factories/FrmFieldFactory.php | 2 +- classes/helpers/FrmAppHelper.php | 4 +- classes/helpers/FrmEntriesHelper.php | 2 +- classes/helpers/FrmFieldsHelper.php | 2 +- classes/helpers/FrmFormsListHelper.php | 2 +- classes/helpers/FrmXMLHelper.php | 4 +- classes/models/FrmEntryFormatter.php | 10 +- classes/models/FrmEntryShortcodeFormatter.php | 2 +- classes/models/FrmField.php | 2 +- classes/models/FrmFieldFormHtml.php | 2 +- classes/models/FrmSolution.php | 2 +- classes/models/fields/FrmFieldType.php | 2 +- classes/views/frm-entries/no_entries.php | 2 +- .../back-end/default-value-setting.php | 2 +- classes/views/frm-fields/single-option.php | 2 +- css/_single_theme.css.php | 2 +- .../SimplifyIssetTruthyCheckSniff.php | 258 ++++++++++++++++++ phpcs.xml | 1 + .../entries/test_FrmShowEntryShortcode.php | 2 +- 22 files changed, 287 insertions(+), 28 deletions(-) create mode 100644 phpcs-sniffs/Formidable/Sniffs/CodeAnalysis/SimplifyIssetTruthyCheckSniff.php diff --git a/classes/controllers/FrmEntriesController.php b/classes/controllers/FrmEntriesController.php index f13d0e9c50..9c12c6a966 100644 --- a/classes/controllers/FrmEntriesController.php +++ b/classes/controllers/FrmEntriesController.php @@ -728,7 +728,7 @@ public static function destroy() { $params = FrmForm::get_admin_params(); - if ( isset( $params['keep_post'] ) && $params['keep_post'] ) { + if ( ! empty( $params['keep_post'] ) ) { self::unlink_post( $params['id'] ); } @@ -870,7 +870,7 @@ private static function _delete_entry( $entry_id, $form ) { FrmAppHelper::unserialize_or_decode( $form->options ); - if ( isset( $form->options['no_save'] ) && $form->options['no_save'] ) { + if ( ! empty( $form->options['no_save'] ) ) { self::unlink_post( $entry_id ); FrmEntry::destroy( $entry_id ); } diff --git a/classes/controllers/FrmFormActionsController.php b/classes/controllers/FrmFormActionsController.php index 98e7f6d722..84d9fca3f1 100644 --- a/classes/controllers/FrmFormActionsController.php +++ b/classes/controllers/FrmFormActionsController.php @@ -249,7 +249,7 @@ private static function active_actions( $action_controls ) { $allowed = array(); foreach ( $action_controls as $action_control ) { - if ( isset( $action_control->action_options['active'] ) && $action_control->action_options['active'] ) { + if ( ! empty( $action_control->action_options['active'] ) ) { $allowed[] = $action_control->id_base; } } @@ -279,7 +279,7 @@ public static function show_action_icon_link( $action_control, $allowed ) { $default_position = array_search( $action_control->id_base, $default_shown, true ); $allowed_count = count( $allowed ); - if ( isset( $action_control->action_options['active'] ) && $action_control->action_options['active'] ) { + if ( ! empty( $action_control->action_options['active'] ) ) { $classes .= ' frm_active_action'; } else { $classes .= ' frm_inactive_action'; diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php index 8058de306b..5fde3fafd5 100644 --- a/classes/controllers/FrmStylesController.php +++ b/classes/controllers/FrmStylesController.php @@ -1193,7 +1193,7 @@ public static function replace_relative_url( $css ) { public static function enqueue_style() { global $frm_vars; - if ( isset( $frm_vars['css_loaded'] ) && $frm_vars['css_loaded'] ) { + if ( ! empty( $frm_vars['css_loaded'] ) ) { // The CSS has already been loaded. return; } diff --git a/classes/factories/FrmFieldFactory.php b/classes/factories/FrmFieldFactory.php index 9f56188b2c..ccf5d6991a 100644 --- a/classes/factories/FrmFieldFactory.php +++ b/classes/factories/FrmFieldFactory.php @@ -42,7 +42,7 @@ public static function create_field_value_selector( $field_id, $args ) { public static function get_field_factory( $field ) { if ( is_object( $field ) ) { $field_info = self::get_field_object( $field ); - } elseif ( isset( $field['id'] ) && $field['id'] ) { + } elseif ( ! empty( $field['id'] ) ) { $field_info = self::get_field_object( $field['id'] ); } else { $field_info = self::get_field_type( $field['type'], $field ); diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index f5fe7740ae..354ed4bc47 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -2913,7 +2913,7 @@ private static function fill_field_defaults( $field, $record, array &$values, $a if ( $args['default'] ) { $meta_value = $field->default_value; - } elseif ( $record->post_id && self::pro_is_installed() && isset( $field->field_options['post_field'] ) && $field->field_options['post_field'] ) { + } elseif ( $record->post_id && self::pro_is_installed() && ! empty( $field->field_options['post_field'] ) ) { if ( ! isset( $field->field_options['custom_field'] ) ) { $field->field_options['custom_field'] = ''; } @@ -3274,7 +3274,7 @@ public static function human_time_diff( $from, $to = '', $levels = 1 ) { } foreach ( $time_strings as $k => $v ) { - if ( isset( $diff[ $k ] ) && $diff[ $k ] ) { + if ( ! empty( $diff[ $k ] ) ) { $time_strings[ $k ] = $diff[ $k ] . ' ' . ( $diff[ $k ] > 1 ? $v[1] : $v[0] ); } elseif ( isset( $diff[ $k ] ) && count( $time_strings ) === 1 ) { // Account for 0. diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index 8917a32051..07172ae38a 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -150,7 +150,7 @@ public static function value_is_posted( $field, $args ) { $value_is_posted = false; if ( $_POST ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing - $repeating = isset( $args['repeating'] ) && $args['repeating']; + $repeating = ! empty( $args['repeating'] ); if ( $repeating ) { if ( isset( $_POST['item_meta'][ $args['parent_field_id'] ][ $args['key_pointer'] ][ $field->id ] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Missing diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php index 2a278b9119..bc4854567b 100644 --- a/classes/helpers/FrmFieldsHelper.php +++ b/classes/helpers/FrmFieldsHelper.php @@ -669,7 +669,7 @@ public static function is_placeholder_field_type( $type ) { public static function get_checkbox_id( $field, $opt_key, $type = 'checkbox' ) { $id = $field['id']; - if ( isset( $field['in_section'] ) && $field['in_section'] && ! FrmAppHelper::is_admin_page( 'formidable' ) ) { + if ( ! empty( $field['in_section'] ) && ! FrmAppHelper::is_admin_page( 'formidable' ) ) { $id .= '-' . $field['in_section']; } diff --git a/classes/helpers/FrmFormsListHelper.php b/classes/helpers/FrmFormsListHelper.php index 04c3e7e413..557c8b5c79 100644 --- a/classes/helpers/FrmFormsListHelper.php +++ b/classes/helpers/FrmFormsListHelper.php @@ -301,7 +301,7 @@ public function single_row( $item, $style = '' ) { $val = '' . $date . ''; break; case 'entries': - if ( isset( $item->options['no_save'] ) && $item->options['no_save'] ) { + if ( ! empty( $item->options['no_save'] ) ) { $val = FrmAppHelper::icon_by_class( 'frmfont frm_forbid_icon frm_bstooltip', array( diff --git a/classes/helpers/FrmXMLHelper.php b/classes/helpers/FrmXMLHelper.php index e954b58b79..5fd7dbc38c 100644 --- a/classes/helpers/FrmXMLHelper.php +++ b/classes/helpers/FrmXMLHelper.php @@ -2196,7 +2196,7 @@ private static function migrate_notifications_to_action( $form_options, $form_id // Format the email data self::format_email_data( $atts, $notification ); - if ( isset( $notification['twilio'] ) && $notification['twilio'] ) { + if ( ! empty( $notification['twilio'] ) ) { do_action( 'frm_create_twilio_action', $atts, $notification ); } @@ -2357,7 +2357,7 @@ private static function switch_email_condition_field_ids( &$post_content ) { * @return void */ private static function migrate_autoresponder_to_action( $form_options, $form_id, &$notifications ) { - if ( isset( $form_options['auto_responder'] ) && $form_options['auto_responder'] && isset( $form_options['ar_email_message'] ) && $form_options['ar_email_message'] ) { + if ( ! empty( $form_options['auto_responder'] ) && ! empty( $form_options['ar_email_message'] ) ) { // migrate autoresponder $email_field = $form_options['ar_email_to'] ?? 0; diff --git a/classes/models/FrmEntryFormatter.php b/classes/models/FrmEntryFormatter.php index 77260abe6a..1503f4e7ff 100644 --- a/classes/models/FrmEntryFormatter.php +++ b/classes/models/FrmEntryFormatter.php @@ -247,7 +247,7 @@ protected function init_array_key( $atts ) { * @return void */ protected function init_is_plain_text( $atts ) { - if ( isset( $atts['plain_text'] ) && $atts['plain_text'] ) { + if ( ! empty( $atts['plain_text'] ) ) { $this->is_plain_text = true; } elseif ( $atts['format'] !== 'text' ) { $this->is_plain_text = true; @@ -264,7 +264,7 @@ protected function init_is_plain_text( $atts ) { * @return void */ protected function init_include_blank( $atts ) { - if ( isset( $atts['include_blank'] ) && $atts['include_blank'] ) { + if ( ! empty( $atts['include_blank'] ) ) { $this->include_blank = true; } } @@ -294,7 +294,7 @@ protected function init_direction( $atts ) { * @return void */ protected function init_include_user_info( $atts ) { - if ( isset( $atts['user_info'] ) && $atts['user_info'] ) { + if ( ! empty( $atts['user_info'] ) ) { $this->include_user_info = true; } } @@ -320,7 +320,7 @@ protected function skip_fields() { * @return void */ protected function init_include_extras( $atts ) { - if ( isset( $atts['include_extras'] ) && $atts['include_extras'] ) { + if ( ! empty( $atts['include_extras'] ) ) { $this->include_extras = array_map( 'strtolower', array_map( 'trim', explode( ',', $atts['include_extras'] ) ) ); } } @@ -359,7 +359,7 @@ protected function init_table_generator( $atts ) { * @return void */ protected function init_is_clickable( $atts ) { - if ( isset( $atts['clickable'] ) && $atts['clickable'] ) { + if ( ! empty( $atts['clickable'] ) ) { $this->is_clickable = true; } } diff --git a/classes/models/FrmEntryShortcodeFormatter.php b/classes/models/FrmEntryShortcodeFormatter.php index ff291d2419..feecae1278 100644 --- a/classes/models/FrmEntryShortcodeFormatter.php +++ b/classes/models/FrmEntryShortcodeFormatter.php @@ -124,7 +124,7 @@ protected function init_fields() { * @return void */ protected function init_plain_text( $atts ) { - if ( isset( $atts['plain_text'] ) && $atts['plain_text'] ) { + if ( ! empty( $atts['plain_text'] ) ) { $this->is_plain_text = true; } } diff --git a/classes/models/FrmField.php b/classes/models/FrmField.php index 9d08d04b70..55244dd803 100644 --- a/classes/models/FrmField.php +++ b/classes/models/FrmField.php @@ -1440,7 +1440,7 @@ public static function is_option_true_in_array( $field, $option ) { * @return bool */ public static function is_option_true_in_object( $field, $option ) { - return isset( $field->field_options[ $option ] ) && $field->field_options[ $option ]; + return ! empty( $field->field_options[ $option ] ); } /** diff --git a/classes/models/FrmFieldFormHtml.php b/classes/models/FrmFieldFormHtml.php index 82dc6b8a29..ed24cd6acb 100644 --- a/classes/models/FrmFieldFormHtml.php +++ b/classes/models/FrmFieldFormHtml.php @@ -532,7 +532,7 @@ private function get_field_div_classes() { // Add label position class $settings = $this->field_obj->display_field_settings(); - if ( isset( $settings['label_position'] ) && $settings['label_position'] ) { + if ( ! empty( $settings['label_position'] ) ) { $label_position = $this->field_obj->get_field_column( 'label' ); $classes .= ' frm_' . $label_position . '_container'; diff --git a/classes/models/FrmSolution.php b/classes/models/FrmSolution.php index 7540dfea25..621a66cd65 100644 --- a/classes/models/FrmSolution.php +++ b/classes/models/FrmSolution.php @@ -463,7 +463,7 @@ protected function step_top( $step ) {