From 2934cae775ac0ff5926830e5ded7650730dabf16 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 17 Dec 2025 13:42:17 -0400 Subject: [PATCH 1/3] New rector rule to remove useless variables --- classes/controllers/FrmAddonsController.php | 4 +-- .../controllers/FrmEmailStylesController.php | 8 ++--- classes/controllers/FrmFieldsController.php | 4 +-- .../controllers/FrmFormActionsController.php | 4 +-- classes/controllers/FrmFormsController.php | 11 +++--- classes/controllers/FrmSMTPController.php | 5 ++- classes/controllers/FrmStylesController.php | 9 ++--- classes/controllers/FrmXMLController.php | 7 ++-- classes/helpers/FrmAppHelper.php | 3 +- classes/helpers/FrmCSVExportHelper.php | 12 ++----- classes/helpers/FrmEntriesHelper.php | 4 +-- classes/helpers/FrmFieldsHelper.php | 36 ++++++------------- classes/helpers/FrmFormsHelper.php | 33 ++++++----------- classes/helpers/FrmFormsListHelper.php | 3 +- classes/helpers/FrmListHelper.php | 4 +-- classes/helpers/FrmStylesHelper.php | 13 +++---- classes/helpers/FrmTipsHelper.php | 23 ++++-------- classes/helpers/FrmXMLHelper.php | 4 +-- classes/models/FrmAntiSpam.php | 3 +- classes/models/FrmDb.php | 9 ++--- classes/models/FrmEmail.php | 6 ++-- classes/models/FrmEmailSummary.php | 4 +-- classes/models/FrmEntry.php | 35 +++++------------- classes/models/FrmEntryFormatter.php | 3 +- classes/models/FrmEntryMeta.php | 4 +-- classes/models/FrmEntryShortcodeFormatter.php | 7 ++-- classes/models/FrmEntryValidate.php | 12 ++----- classes/models/FrmField.php | 8 ++--- classes/models/FrmFieldFormHtml.php | 4 +-- classes/models/FrmForm.php | 22 ++++-------- classes/models/FrmFormAction.php | 11 ++---- classes/models/FrmFormApi.php | 4 +-- classes/models/FrmFormState.php | 3 +- classes/models/FrmHoneypot.php | 5 ++- classes/models/FrmPersonalData.php | 3 +- classes/models/FrmStyleApi.php | 3 +- classes/models/fields/FrmFieldCaptcha.php | 3 +- classes/models/fields/FrmFieldCombo.php | 7 ++-- classes/models/fields/FrmFieldCreditCard.php | 3 +- classes/models/fields/FrmFieldSubmit.php | 8 ++--- classes/models/fields/FrmFieldType.php | 12 ++----- rector.php | 2 -- .../FrmSquareLiteActionsController.php | 6 ++-- .../FrmSquareLiteAppController.php | 5 ++- .../FrmStrpLiteActionsController.php | 6 ++-- .../FrmStrpLiteEventsController.php | 7 ++-- .../FrmStrpLitePaymentsController.php | 3 +- .../FrmTransLiteActionsController.php | 10 ++---- stripe/helpers/FrmStrpLiteConnectHelper.php | 11 +++--- .../helpers/FrmStrpLiteSubscriptionHelper.php | 6 ++-- stripe/helpers/FrmTransLiteAppHelper.php | 10 ++---- stripe/helpers/FrmTransLiteListHelper.php | 6 ++-- stripe/models/FrmStrpLiteAuth.php | 3 +- stripe/models/FrmTransLiteAction.php | 4 +-- stripe/models/FrmTransLitePayment.php | 3 +- stripe/models/FrmTransLiteSubscription.php | 4 +-- 56 files changed, 131 insertions(+), 321 deletions(-) diff --git a/classes/controllers/FrmAddonsController.php b/classes/controllers/FrmAddonsController.php index 7c9a3d7357..a46525f51c 100644 --- a/classes/controllers/FrmAddonsController.php +++ b/classes/controllers/FrmAddonsController.php @@ -1251,12 +1251,10 @@ private static function get_addon_activation_response() { $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' ); - $response = array( + return array( 'message' => $message, 'saveAndReload' => $activating_page, ); - - return $response; } /** diff --git a/classes/controllers/FrmEmailStylesController.php b/classes/controllers/FrmEmailStylesController.php index b99945a185..9892df9759 100644 --- a/classes/controllers/FrmEmailStylesController.php +++ b/classes/controllers/FrmEmailStylesController.php @@ -213,9 +213,7 @@ private static function get_test_rich_text_email_content( $style_key, $table_row '; } - $wrapped_content .= '' . $content . ''; - - return $wrapped_content; + return $wrapped_content . ('' . $content . ''); } /** @@ -449,9 +447,7 @@ public static function wrap_email_message( $message ) { // The message. $new_message .= self::add_inline_css( 'a', 'color:' . $style_settings['link_color'] . ';', $message ); - $new_message .= ''; - - return $new_message; + return $new_message . ''; } /** diff --git a/classes/controllers/FrmFieldsController.php b/classes/controllers/FrmFieldsController.php index 53f45a010c..36420fe4fc 100644 --- a/classes/controllers/FrmFieldsController.php +++ b/classes/controllers/FrmFieldsController.php @@ -704,9 +704,7 @@ private static function add_html_placeholder( $field, array &$add_html, array &$ * @return string */ private static function prepare_placeholder( $field ) { - $placeholder = $field['placeholder'] ?? ''; - - return $placeholder; + return $field['placeholder'] ?? ''; } /** diff --git a/classes/controllers/FrmFormActionsController.php b/classes/controllers/FrmFormActionsController.php index 127ad515ae..8a3f51d816 100644 --- a/classes/controllers/FrmFormActionsController.php +++ b/classes/controllers/FrmFormActionsController.php @@ -793,9 +793,7 @@ public static function limit_by_type( $where ) { return $where; } - $where .= $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] ); - - return $where; + return $where . $wpdb->prepare( ' AND post_excerpt = %s ', $frm_vars['action_type'] ); } /** diff --git a/classes/controllers/FrmFormsController.php b/classes/controllers/FrmFormsController.php index 37650e32ab..290203ebf1 100644 --- a/classes/controllers/FrmFormsController.php +++ b/classes/controllers/FrmFormsController.php @@ -915,15 +915,14 @@ public static function bulk_trash( $ids ) { 'type' => 'request', ) ); - $message = sprintf( + + return sprintf( /* translators: %1$s: Number of forms, %2$s: Start link HTML, %3$s: End link HTML */ _n( '%1$s form moved to the Trash. %2$sUndo%3$s', '%1$s forms moved to the Trash. %2$sUndo%3$s', $count, 'formidable' ), $count, '', '' ); - - return $message; } public static function destroy() { @@ -1808,11 +1807,10 @@ private static function get_advanced_shortcodes() { 'title' => __( 'Do not automatically add any paragraphs or line breaks', 'formidable' ), ), ); - $adv_shortcodes = apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes ); // __( 'Leave blank instead of defaulting to User Login', 'formidable' ) : blank=1 - return $adv_shortcodes; + return apply_filters( 'frm_advanced_shortcodes', $adv_shortcodes ); } /** @@ -1957,9 +1955,8 @@ public static function filter_content( $content, $form, $entry = false ) { } $shortcodes = FrmFieldsHelper::get_shortcodes( $content, $form ); - $content = apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes ); - return $content; + return apply_filters( 'frm_replace_content_shortcodes', $content, $entry, $shortcodes ); } /** diff --git a/classes/controllers/FrmSMTPController.php b/classes/controllers/FrmSMTPController.php index 039ca24923..c5774bceb9 100644 --- a/classes/controllers/FrmSMTPController.php +++ b/classes/controllers/FrmSMTPController.php @@ -81,8 +81,7 @@ public static function load_hooks() { */ public function link( $link ) { $new_link = 'formidableforms.com/go-wp-mail-smtp/?urllink=wpmailsmtp%2Ecom%2Flite%2Dupgrade&'; - $link = str_replace( 'wpmailsmtp.com/lite-upgrade/?', $new_link, $link ); - return $link; + return str_replace( 'wpmailsmtp.com/lite-upgrade/?', $new_link, $link ); } /** @@ -169,7 +168,7 @@ protected function output_section_heading() {

- get_one(); - return $default_style; + return $frm_style->get_one(); } /** @@ -890,9 +889,8 @@ public static function get_custom_css( $single_style_settings = null ) { // If it does not exist, check the default style as a fallback. $frm_style = new FrmStyle(); $style = $frm_style->get_default_style(); - $custom_css = $style->post_content['custom_css']; - return $custom_css; + return $style->post_content['custom_css']; } /** @@ -1215,9 +1213,8 @@ public static function enqueue_style() { */ public static function get_style_opts() { $frm_style = new FrmStyle(); - $styles = $frm_style->get_all(); - return $styles; + return $frm_style->get_all(); } /** diff --git a/classes/controllers/FrmXMLController.php b/classes/controllers/FrmXMLController.php index 3bb9e16889..ff153a66a0 100644 --- a/classes/controllers/FrmXMLController.php +++ b/classes/controllers/FrmXMLController.php @@ -155,9 +155,7 @@ private static function get_posted_form() { if ( empty( $form ) ) { return $form; } - - $form = json_decode( $form, true ); - return $form; + return json_decode( $form, true ); } /** @@ -607,9 +605,8 @@ public static function get_parent_terms_slugs( $terms ) { } $results = FrmDb::get_results( 'terms', array( 'term_id' => $parent_term_ids ), 'term_id, slug' ); - $parent_slugs = wp_list_pluck( $results, 'slug', 'term_id' ); - return $parent_slugs; + return wp_list_pluck( $results, 'slug', 'term_id' ); } /** diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index d98e2c1c84..cb02c87169 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -3304,9 +3304,8 @@ public static function human_time_diff( $from, $to = '', $levels = 1 ) { $levels_deep = apply_filters( 'frm_time_ago_levels', $levels, compact( 'time_strings', 'from', 'to' ) ); $time_strings = array_slice( $time_strings, 0, absint( $levels_deep ) ); - $time_ago_string = implode( ' ', $time_strings ); - return $time_ago_string; + return implode( ' ', $time_strings ); } /** diff --git a/classes/helpers/FrmCSVExportHelper.php b/classes/helpers/FrmCSVExportHelper.php index 42f58b6036..11fb461d4b 100644 --- a/classes/helpers/FrmCSVExportHelper.php +++ b/classes/helpers/FrmCSVExportHelper.php @@ -119,9 +119,7 @@ public static function csv_format_options() { array_splice( $formats, 1, 0, 'UTF-8 with BOM' ); } - $formats = apply_filters( 'frm_csv_format_options', $formats ); - - return $formats; + return apply_filters( 'frm_csv_format_options', $formats ); } /** @@ -362,7 +360,7 @@ private static function field_headings( $col ) { $field_headings[ $col->id ] = strip_tags( $col->name ); } - $field_headings = apply_filters( + return apply_filters( 'frm_csv_field_columns', $field_headings, array_merge( @@ -370,8 +368,6 @@ private static function field_headings( $col ) { array( 'field' => $col ) ) ); - - return $field_headings; } /** @@ -889,8 +885,6 @@ public static function escape_csv( $value ) { $value = "'" . $value; } - $value = str_replace( '"', '""', $value ); - - return $value; + return str_replace( '"', '""', $value ); } } diff --git a/classes/helpers/FrmEntriesHelper.php b/classes/helpers/FrmEntriesHelper.php index e3913a3b5d..4e5cb1b4e2 100644 --- a/classes/helpers/FrmEntriesHelper.php +++ b/classes/helpers/FrmEntriesHelper.php @@ -953,9 +953,7 @@ public static function get_entry_statuses() { $extended_entry_status = array(); } - $existing_entry_statuses = array_replace( $default_entry_statuses, $extended_entry_status ); - - return $existing_entry_statuses; + return array_replace( $default_entry_statuses, $extended_entry_status ); } /** diff --git a/classes/helpers/FrmFieldsHelper.php b/classes/helpers/FrmFieldsHelper.php index f5b0af491e..2cdf621e7f 100644 --- a/classes/helpers/FrmFieldsHelper.php +++ b/classes/helpers/FrmFieldsHelper.php @@ -316,8 +316,7 @@ public static function default_invalid_msg() { public static function default_unique_msg() { $frm_settings = FrmAppHelper::get_settings(); $unique_message = $frm_settings->unique_msg; - $unique_message = str_replace( 'This value', '[field_name]', $unique_message ); - return $unique_message; + return str_replace( 'This value', '[field_name]', $unique_message ); } /** @@ -328,8 +327,7 @@ public static function default_unique_msg() { public static function default_blank_msg() { $frm_settings = FrmAppHelper::get_settings(); $blank_message = $frm_settings->blank_msg; - $blank_message = str_replace( 'This field', '[field_name]', $blank_message ); - return $blank_message; + return str_replace( 'This field', '[field_name]', $blank_message ); } /** @@ -376,9 +374,8 @@ public static function get_default_field_options_from_field( $field, $values = a $opts = $field_type->get_default_field_options(); $opts = apply_filters( 'frm_default_field_opts', $opts, $values, $field ); - $opts = apply_filters( 'frm_default_' . $field->type . '_field_opts', $opts, $values, $field ); - return $opts; + return apply_filters( 'frm_default_' . $field->type . '_field_opts', $opts, $values, $field ); } /** @@ -483,9 +480,7 @@ public static function get_error_msg( $field, $error ) { $msg = empty( $msg ) ? $defaults[ $error ]['part'] : $msg; $msg = do_shortcode( $msg ); - $msg = self::maybe_replace_substrings_with_field_name( $msg, $error, $field ); - - return $msg; + return self::maybe_replace_substrings_with_field_name( $msg, $error, $field ); } /** @@ -510,9 +505,7 @@ private static function maybe_replace_substrings_with_field_name( $msg, $error, $field_name = __( 'This field', 'formidable' ); } } - - $msg = str_replace( $substrings, $field_name, $msg ); - return $msg; + return str_replace( $substrings, $field_name, $msg ); } /** @@ -1031,9 +1024,8 @@ public static function basic_replace_shortcodes( $value, $form, $entry ) { } $value = apply_filters( 'frm_content', $value, $form, $entry ); - $value = do_shortcode( $value ); - return $value; + return do_shortcode( $value ); } /** @@ -1090,9 +1082,7 @@ public static function allowed_shortcodes( $fields = array() ) { $tagregexp[] = $field->field_key; } - $tagregexp = implode( '|', $tagregexp ); - - return $tagregexp; + return implode( '|', $tagregexp ); } /** @@ -1475,9 +1465,7 @@ public static function get_field_types( $type ) { $field_types[ $type ] = $field_selection[ $type ]; } - $field_types = apply_filters( 'frm_switch_field_types', $field_types, compact( 'type', 'field_selection' ) ); - - return $field_types; + return apply_filters( 'frm_switch_field_types', $field_types, compact( 'type', 'field_selection' ) ); } /** @@ -1794,9 +1782,7 @@ public static function get_other_field_html_id( $type, $html_id, $opt_key = fals $other_id .= '-' . $opt_key; } - $other_id .= '-otext'; - - return $other_id; + return $other_id . '-otext'; } /** @@ -1879,9 +1865,7 @@ private static function switch_ids_except_strings( $replace, $replace_with, $exc unset( $replace[ $index ] ); unset( $replace_with[ $index ] ); } - - $value = str_replace( $replace, $replace_with, $value ); - return $value; + return str_replace( $replace, $replace_with, $value ); } /** diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 46d48f8fb4..9b08205677 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -31,9 +31,8 @@ public static function form_error_class() { */ public static function get_direct_link( $key, $form = false ) { $target_url = esc_url( admin_url( 'admin-ajax.php?action=frm_forms_preview&form=' . $key ) ); - $target_url = apply_filters( 'frm_direct_link', $target_url, $key, $form ); - return $target_url; + return apply_filters( 'frm_direct_link', $target_url, $key, $form ); } /** @@ -83,7 +82,7 @@ public static function forms_dropdown( $field_name, $field_value = '', $args = a - - ' . $message . ''; - return $message; + return '
' . $message . '
'; } /** @@ -539,9 +537,7 @@ public static function get_default_html( $loc ) { * @return string */ public static function get_draft_link() { - $link = '[if save_draft][/if save_draft]'; - - return $link; + return '[if save_draft][/if save_draft]'; } /** @@ -1043,9 +1039,7 @@ public static function get_form_style_class( $form = false ) { $class .= ' frm_center_submit'; } - $class = apply_filters( 'frm_add_form_style_class', $class, $style, compact( 'form' ) ); - - return $class; + return apply_filters( 'frm_add_form_style_class', $class, $style, compact( 'form' ) ); } /** @@ -1148,9 +1142,7 @@ public static function get_form_style( $form ) { $form = FrmForm::getOne( $form ); } - $style = $form && is_object( $form ) && isset( $form->options['custom_style'] ) ? $form->options['custom_style'] : $style; - - return $style; + return $form && is_object( $form ) && isset( $form->options['custom_style'] ) ? $form->options['custom_style'] : $style; } /** @@ -1298,8 +1290,7 @@ public static function edit_form_link( $data ) { } $label = self::edit_form_link_label( $data ); - $link = '' . esc_html( $label ) . ''; - return $link; + return '' . esc_html( $label ) . ''; } /** @@ -1565,9 +1556,7 @@ public static function status_nice_name( $status ) { $status = 'publish'; } - $name = $nice_names[ $status ]; - - return $name; + return $nice_names[ $status ]; } /** @@ -1765,9 +1754,7 @@ public static function get_plan_required( &$item ) { if ( in_array( $category, $plans, true ) ) { unset( $item['categories'][ $k ] ); - $category = self::convert_legacy_package_names( $category ); - - return $category; + return self::convert_legacy_package_names( $category ); } } diff --git a/classes/helpers/FrmFormsListHelper.php b/classes/helpers/FrmFormsListHelper.php index 2af4e0f2ae..af9928f77e 100644 --- a/classes/helpers/FrmFormsListHelper.php +++ b/classes/helpers/FrmFormsListHelper.php @@ -355,8 +355,7 @@ protected function column_shortcode( $form ) { $val = apply_filters( 'frm_form_list_actions', $val, array( 'form' => $form ) ); // Remove the space hard coded in Landing pages. $val = str_replace( ' ', '', $val ); - $val = '
' . $val . '
'; - return $val; + return '
' . $val . '
'; } /** diff --git a/classes/helpers/FrmListHelper.php b/classes/helpers/FrmListHelper.php index d74f312e7a..10bc390558 100644 --- a/classes/helpers/FrmListHelper.php +++ b/classes/helpers/FrmListHelper.php @@ -518,9 +518,7 @@ protected function row_actions( $actions, $always_visible = false ) { $out .= ''; - $out .= ''; - - return $out; + return $out . (''); } /** diff --git a/classes/helpers/FrmStylesHelper.php b/classes/helpers/FrmStylesHelper.php index ad042e6f04..8d5b22d48d 100644 --- a/classes/helpers/FrmStylesHelper.php +++ b/classes/helpers/FrmStylesHelper.php @@ -177,9 +177,7 @@ public static function icon_key_to_class( $key, $icon = '+', $type = 'arrow' ) { $class .= $key; } - $class .= '_icon'; - - return $class; + return $class . '_icon'; } /** @@ -438,9 +436,8 @@ public static function get_color_brightness( $color ) { $c_r = hexdec( substr( $color, 0, 2 ) ); $c_g = hexdec( substr( $color, 2, 2 ) ); $c_b = hexdec( substr( $color, 4, 2 ) ); - $brightness = ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000; - return $brightness; + return ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000; } /** @@ -1030,9 +1027,8 @@ public static function get_form_count_for_style( $style_id, $is_default ) { } $conversational_style_id = FrmDb::get_var( 'posts', array( 'post_name' => 'lines-no-boxes' ), 'ID' ); - $number_of_forms += self::get_default_style_count( $style_id, $conversational_style_id ); - return $number_of_forms; + return $number_of_forms + self::get_default_style_count( $style_id, $conversational_style_id ); } /** @@ -1099,9 +1095,8 @@ public static function style_editor_get_wrapper_classname( $section_type ) { $is_quick_settings = ( 'quick-settings' === $section_type ); $classname = 'frm-style-editor-form'; $classname .= ( ! self::is_advanced_settings() xor $is_quick_settings ) ? ' frm_hidden' : ''; - $classname .= FrmAppHelper::pro_is_installed() ? ' frm-pro' : ''; - return $classname; + return $classname . (FrmAppHelper::pro_is_installed() ? ' frm-pro' : ''); } /** diff --git a/classes/helpers/FrmTipsHelper.php b/classes/helpers/FrmTipsHelper.php index 9a52aa135e..adb431534c 100644 --- a/classes/helpers/FrmTipsHelper.php +++ b/classes/helpers/FrmTipsHelper.php @@ -121,7 +121,7 @@ private static function cta_label() { * @return array */ public static function get_builder_tip() { - $tips = array( + return array( array( 'link' => array( 'content' => 'conditional-logic', @@ -171,15 +171,13 @@ public static function get_builder_tip() { 'call' => self::cta_label(), ), ); - - return $tips; } /** * @return array */ public static function get_form_settings_tip() { - $tips = array( + return array( array( 'link' => array( 'content' => 'front-edit-b', @@ -205,15 +203,13 @@ public static function get_form_settings_tip() { 'call' => self::cta_label(), ), ); - - return $tips; } /** * @return array */ public static function get_form_action_tip() { - $tips = array( + return array( array( 'link' => array( 'content' => 'email-routing', @@ -303,15 +299,13 @@ public static function get_form_action_tip() { 'call' => self::cta_label(), ), ); - - return $tips; } /** * @return array */ public static function get_styling_tip() { - $tips = array( + return array( array( 'link' => array( 'content' => 'style', @@ -337,8 +331,6 @@ public static function get_styling_tip() { 'call' => self::cta_label(), ), ); - - return $tips; } /** @@ -371,16 +363,15 @@ public static function get_entries_tip() { 'call' => self::cta_label(), ), ); - $tips = array_merge( $tips, self::get_import_tip() ); - return $tips; + return array_merge( $tips, self::get_import_tip() ); } /** * @return array */ public static function get_import_tip() { - $tips = array( + return array( array( 'link' => array( 'content' => 'import', @@ -390,8 +381,6 @@ public static function get_import_tip() { 'call' => self::cta_label(), ), ); - - return $tips; } /** diff --git a/classes/helpers/FrmXMLHelper.php b/classes/helpers/FrmXMLHelper.php index 5be528aab3..94a70715a4 100644 --- a/classes/helpers/FrmXMLHelper.php +++ b/classes/helpers/FrmXMLHelper.php @@ -397,9 +397,7 @@ private static function get_form_fields( $form_id ) { unset( $f ); } - $form_fields = $old_fields; - - return $form_fields; + return $old_fields; } /** diff --git a/classes/models/FrmAntiSpam.php b/classes/models/FrmAntiSpam.php index 045f3fd71e..87baca11cb 100644 --- a/classes/models/FrmAntiSpam.php +++ b/classes/models/FrmAntiSpam.php @@ -175,8 +175,7 @@ private function verify( $token ) { * @return string */ public function add_token_to_form( $attributes ) { - $attributes .= ' data-token="' . esc_attr( $this->get() ) . '"'; - return $attributes; + return $attributes . (' data-token="' . esc_attr( $this->get() ) . '"'); } /** diff --git a/classes/models/FrmDb.php b/classes/models/FrmDb.php index ec3148299f..0344f5c881 100644 --- a/classes/models/FrmDb.php +++ b/classes/models/FrmDb.php @@ -256,9 +256,8 @@ public static function get_var( $table, $where = array(), $field = 'id', $args = $query = self::generate_query_string_from_pieces( $field, $table, $where, $args ); $cache_key = self::generate_cache_key( $where, $args, $field, $type ); - $results = self::check_cache( $cache_key, $group, $query, 'get_' . $type ); - return $results; + return self::check_cache( $cache_key, $group, $query, 'get_' . $type ); } /** @@ -282,9 +281,8 @@ public static function generate_cache_key( $where, $args, $field, $type ) { } $cache_key .= implode( '_', $args ) . $field . '_' . $type; - $cache_key = str_replace( array( ' ', ',' ), '_', $cache_key ); - return $cache_key; + return str_replace( array( ' ', ',' ), '_', $cache_key ); } /** @@ -473,9 +471,8 @@ public static function get_associative_array_results( $columns, $table, $where ) $query = self::generate_query_string_from_pieces( $columns, $table, $where ); $cache_key = str_replace( array( ' ', ',' ), '_', trim( implode( '_', FrmAppHelper::array_flatten( $where ) ) . $columns . '_results_ARRAY_A', ' WHERE' ) ); - $results = self::check_cache( $cache_key, $group, $query, 'get_associative_results' ); - return $results; + return self::check_cache( $cache_key, $group, $query, 'get_associative_results' ); } /** diff --git a/classes/models/FrmEmail.php b/classes/models/FrmEmail.php index 6bab59ffe2..cf42d50d00 100644 --- a/classes/models/FrmEmail.php +++ b/classes/models/FrmEmail.php @@ -226,9 +226,8 @@ private function prepare_additional_recipients( $recipients, $user_id_args ) { $recipients = $this->explode_emails( $recipients ); $recipients = array_unique( (array) $recipients ); - $recipients = $this->format_recipients( $recipients ); - return $recipients; + return $this->format_recipients( $recipients ); } /** @@ -656,9 +655,8 @@ private function prepare_email_setting( $value, $user_id_args ) { // Remove brackets and add a space in case there isn't one $value = str_replace( '<', ' ', $value ); - $value = str_replace( array( '"', '>' ), '', $value ); - return $value; + return str_replace( array( '"', '>' ), '', $value ); } /** diff --git a/classes/models/FrmEmailSummary.php b/classes/models/FrmEmailSummary.php index 79b82e0399..429c4f2d58 100644 --- a/classes/models/FrmEmailSummary.php +++ b/classes/models/FrmEmailSummary.php @@ -103,9 +103,7 @@ protected function get_content() { include $this->get_include_file( $this->template ); $content = ob_get_clean(); - $content = str_replace( '%%INNER_CONTENT%%', $this->get_inner_content(), $content ); - - return $content; + return str_replace( '%%INNER_CONTENT%%', $this->get_inner_content(), $content ); } /** diff --git a/classes/models/FrmEntry.php b/classes/models/FrmEntry.php index c07e83620b..6bafaffb0b 100644 --- a/classes/models/FrmEntry.php +++ b/classes/models/FrmEntry.php @@ -20,9 +20,7 @@ class FrmEntry { * @return bool|int $entry_id */ public static function create( $values ) { - $entry_id = self::create_entry( $values, 'standard' ); - - return $entry_id; + return self::create_entry( $values, 'standard' ); } /** @@ -41,9 +39,7 @@ private static function create_entry( $values, $type ) { return false; } - $entry_id = self::continue_to_create_entry( $values, $new_values ); - - return $entry_id; + return self::continue_to_create_entry( $values, $new_values ); } /** @@ -328,9 +324,7 @@ public static function duplicate( $id ) { * @return bool|int $update_results */ public static function update( $id, $values ) { - $update_results = self::update_entry( $id, $values, 'standard' ); - - return $update_results; + return self::update_entry( $id, $values, 'standard' ); } /** @@ -377,8 +371,7 @@ public static function destroy( $id ) { $entry = self::getOne( $id, true ); if ( ! $entry ) { - $result = false; - return $result; + return false; } /** @@ -608,9 +601,7 @@ public static function exists( $id ) { global $wpdb; if ( FrmDb::check_cache( $id, 'frm_entry' ) ) { - $exists = true; - - return $exists; + return true; } if ( is_numeric( $id ) ) { @@ -806,9 +797,7 @@ private static function before_insert_entry_in_database( &$values, $type ) { $values = apply_filters( 'frm_pre_create_entry', $values ); } - $new_values = self::package_entry_data( $values ); - - return $new_values; + return self::package_entry_data( $values ); } /** @@ -1229,9 +1218,7 @@ private static function package_entry_to_update( $id, $values ) { $new_values['user_id'] = $values['frm_user_id']; } - $new_values = apply_filters( 'frm_update_entry', $new_values, $id ); - - return $new_values; + return apply_filters( 'frm_update_entry', $new_values, $id ); } /** @@ -1278,9 +1265,7 @@ private static function after_update_entry( $query_results, $id, $values, $new_v * @return bool|int $entry_id */ public static function create_entry_from_xml( $values ) { - $entry_id = self::create_entry( $values, 'xml' ); - - return $entry_id; + return self::create_entry( $values, 'xml' ); } /** @@ -1295,9 +1280,7 @@ public static function create_entry_from_xml( $values ) { * @return bool|int $updated */ public static function update_entry_from_xml( $id, $values ) { - $updated = self::update_entry( $id, $values, 'xml' ); - - return $updated; + return self::update_entry( $id, $values, 'xml' ); } /** diff --git a/classes/models/FrmEntryFormatter.php b/classes/models/FrmEntryFormatter.php index d1386684e1..1bf67f9d81 100644 --- a/classes/models/FrmEntryFormatter.php +++ b/classes/models/FrmEntryFormatter.php @@ -956,9 +956,8 @@ protected function prepare_display_value_for_html_table( $display_value, $field_ */ protected function prepare_display_value_for_plain_text_content( $display_value ) { $display_value = $this->flatten_array( $display_value ); - $display_value = $this->strip_html( $display_value ); - return $display_value; + return $this->strip_html( $display_value ); } /** diff --git a/classes/models/FrmEntryMeta.php b/classes/models/FrmEntryMeta.php index 68c399b951..004c969f17 100644 --- a/classes/models/FrmEntryMeta.php +++ b/classes/models/FrmEntryMeta.php @@ -300,9 +300,7 @@ public static function get_entry_meta_by_field( $entry_id, $field_id ) { $field_type = FrmField::get_type( $field_id ); FrmFieldsHelper::prepare_field_value( $result, $field_type ); - $result = wp_unslash( $result ); - - return $result; + return wp_unslash( $result ); } /** diff --git a/classes/models/FrmEntryShortcodeFormatter.php b/classes/models/FrmEntryShortcodeFormatter.php index 1d93c16745..fdee93717f 100644 --- a/classes/models/FrmEntryShortcodeFormatter.php +++ b/classes/models/FrmEntryShortcodeFormatter.php @@ -216,9 +216,8 @@ protected function get_plain_text() { protected function get_table() { $content = $this->table_generator->generate_table_header(); $content .= $this->generate_content_for_all_fields(); - $content .= $this->table_generator->generate_table_footer(); - return $content; + return $content . $this->table_generator->generate_table_footer(); } /** @@ -252,9 +251,7 @@ protected function generate_field_content( $field ) { return ''; } - $row = $this->generate_two_cell_shortcode_row( $field ); - - return $row; + return $this->generate_two_cell_shortcode_row( $field ); } /** diff --git a/classes/models/FrmEntryValidate.php b/classes/models/FrmEntryValidate.php index 4b7c644a93..75ed323b57 100644 --- a/classes/models/FrmEntryValidate.php +++ b/classes/models/FrmEntryValidate.php @@ -368,9 +368,7 @@ private static function options_are_dynamic_based_on_hook( $field_object, $value } else { $option_value = $option; } - - $option_value = do_shortcode( $option_value ); - return $option_value; + return do_shortcode( $option_value ); }; $values_options = array_map( $map_callback, $values['options'] ); @@ -487,9 +485,7 @@ public static function phone_format( $field ) { $pattern = self::create_regular_expression_from_format( $pattern ); } - $pattern = '/' . $pattern . '/'; - - return $pattern; + return '/' . $pattern . '/'; } /** @@ -536,9 +532,7 @@ private static function create_regular_expression_from_format( $pattern ) { } } - $pattern = '^' . $pattern . '$'; - - return $pattern; + return '^' . $pattern . '$'; } /** diff --git a/classes/models/FrmField.php b/classes/models/FrmField.php index 74509f5ae2..1bc3a695f0 100644 --- a/classes/models/FrmField.php +++ b/classes/models/FrmField.php @@ -1306,13 +1306,9 @@ public static function is_field_with_multiple_values( $field ) { $field_type = self::get_original_field_type( $field ); - $is_multi_value_field = ( - self::is_checkbox( $field ) || + return self::is_checkbox( $field ) || $field_type === 'address' || - self::is_multiple_select( $field ) - ); - - return $is_multi_value_field; + self::is_multiple_select( $field ); } /** diff --git a/classes/models/FrmFieldFormHtml.php b/classes/models/FrmFieldFormHtml.php index 03ae036d31..69c4f3e940 100644 --- a/classes/models/FrmFieldFormHtml.php +++ b/classes/models/FrmFieldFormHtml.php @@ -317,9 +317,7 @@ private static function get_error_body( $html ) { if ( false === $end ) { return false; } - - $error_body = substr( $html, $start + 10, $end - $start - 10 ); - return $error_body; + return substr( $html, $start + 10, $end - $start - 10 ); } /** diff --git a/classes/models/FrmForm.php b/classes/models/FrmForm.php index a22cdde64c..b754cabe5f 100644 --- a/classes/models/FrmForm.php +++ b/classes/models/FrmForm.php @@ -504,8 +504,7 @@ private static function sanitize_calc( $value ) { $temp = array( '< = ', ' > =' ); $value = str_replace( $allow, $temp, $value ); $value = strip_tags( $value ); - $value = str_replace( $temp, $allow, $value ); - return $value; + return str_replace( $temp, $allow, $value ); } /** @@ -803,9 +802,7 @@ public static function getName( $id ) { $form = FrmDb::check_cache( $id, 'frm_form' ); if ( $form ) { - $r = stripslashes( $form->name ); - - return $r; + return stripslashes( $form->name ); } $query_key = is_numeric( $id ) ? 'id' : 'form_key'; @@ -843,9 +840,7 @@ public static function get_key_by_id( $id ) { return $cache->form_key; } - $key = FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); - - return $key; + return FrmDb::get_var( 'frm_forms', array( 'id' => $id ), 'form_key' ); } /** @@ -988,9 +983,7 @@ public static function get_published_forms( $query = array(), $limit = 999, $inc $query['parent_form_id'] = array( null, 0 ); } - $forms = self::getAll( $query, 'name', $limit ); - - return $forms; + return self::getAll( $query, 'name', $limit ); } /** @@ -1203,9 +1196,7 @@ public static function get_current_form_id( $default_form = 'none' ) { $form = self::maybe_get_current_form(); } - $form_id = $form ? $form->id : 0; - - return $form_id; + return $form ? $form->id : 0; } /** @@ -1321,9 +1312,8 @@ public static function &is_visible_to_user( $form ) { */ public static function show_submit( $form ) { $show = ( ! $form->is_template && $form->status === 'published' && ! FrmAppHelper::is_admin() ); - $show = apply_filters( 'frm_show_submit_button', $show, $form ); - return $show; + return apply_filters( 'frm_show_submit_button', $show, $form ); } /** diff --git a/classes/models/FrmFormAction.php b/classes/models/FrmFormAction.php index e9e2d219d7..d28c61f264 100644 --- a/classes/models/FrmFormAction.php +++ b/classes/models/FrmFormAction.php @@ -257,9 +257,8 @@ protected function get_group( $action_options ) { public function get_field_name( $field_name, $post_field = 'post_content' ) { $name = $this->option_name . '[' . $this->number . ']'; $name .= ( empty( $post_field ) ? '' : '[' . $post_field . ']' ); - $name .= '[' . $field_name . ']'; - return $name; + return $name . ('[' . $field_name . ']'); } /** @@ -904,9 +903,7 @@ public function get_global_switch_fields() { $switch = $this->get_switch_fields(); $switch['conditions'] = array( 'hide_field' ); - $switch = apply_filters( 'frm_global_switch_fields', $switch ); - - return $switch; + return apply_filters( 'frm_global_switch_fields', $switch ); } /** @@ -968,9 +965,7 @@ public static function action_conditions_met( $action, $entry ) { if ( is_callable( 'FrmProFormActionsController::action_conditions_met' ) ) { return FrmProFormActionsController::action_conditions_met( $action, $entry ); } - - $stop = false; - return $stop; + return false; } /** diff --git a/classes/models/FrmFormApi.php b/classes/models/FrmFormApi.php index 13b030d57a..976aedef56 100644 --- a/classes/models/FrmFormApi.php +++ b/classes/models/FrmFormApi.php @@ -314,9 +314,7 @@ protected function get_cached() { return false; } - $values = json_decode( $cache['value'], true ); - - return $values; + return json_decode( $cache['value'], true ); } /** diff --git a/classes/models/FrmFormState.php b/classes/models/FrmFormState.php index 7719643213..f511fb3425 100644 --- a/classes/models/FrmFormState.php +++ b/classes/models/FrmFormState.php @@ -183,8 +183,7 @@ private function get_state_string() { $secret = self::get_encryption_secret(); $compressed_state = $this->compressed_state(); $json_encoded = json_encode( $compressed_state ); - $encrypted = openssl_encrypt( $json_encoded, 'AES-128-ECB', $secret ); - return $encrypted; + return openssl_encrypt( $json_encoded, 'AES-128-ECB', $secret ); } /** diff --git a/classes/models/FrmHoneypot.php b/classes/models/FrmHoneypot.php index 745a20edef..42f768fa8e 100644 --- a/classes/models/FrmHoneypot.php +++ b/classes/models/FrmHoneypot.php @@ -271,9 +271,8 @@ private function track_html_id( $html_id ) { * @return int */ private function get_honeypot_field_id() { - $class = class_exists( 'FrmProFormState' ) ? 'FrmProFormState' : 'FrmFormState'; - $honeypot_field_id = $class::get_from_request( 'honeypot_field_id', 0 ); - return $honeypot_field_id; + $class = class_exists( 'FrmProFormState' ) ? 'FrmProFormState' : 'FrmFormState'; + return $class::get_from_request( 'honeypot_field_id', 0 ); } /** diff --git a/classes/models/FrmPersonalData.php b/classes/models/FrmPersonalData.php index 310421c7a2..c0626f834e 100644 --- a/classes/models/FrmPersonalData.php +++ b/classes/models/FrmPersonalData.php @@ -160,9 +160,8 @@ private function get_user_entries( $email ) { $entries_by_user = FrmDb::get_col( 'frm_items', array( 'user_id' => $user->ID ), 'id', $query_args ); $entry_ids = array_merge( $entries_by_user, $entries_by_email ); - $entry_ids = array_unique( array_filter( $entry_ids ) ); - return $entry_ids; + return array_unique( array_filter( $entry_ids ) ); } /** diff --git a/classes/models/FrmStyleApi.php b/classes/models/FrmStyleApi.php index cdf7379e43..90b418928f 100644 --- a/classes/models/FrmStyleApi.php +++ b/classes/models/FrmStyleApi.php @@ -39,8 +39,7 @@ protected function set_cache_key() { public function get_api_info() { $api_info = parent::get_api_info(); - $api_info = $this->fill_missing_style_settings( $api_info ); - return $api_info; + return $this->fill_missing_style_settings( $api_info ); } /** diff --git a/classes/models/fields/FrmFieldCaptcha.php b/classes/models/fields/FrmFieldCaptcha.php index 752466a5c4..cb70d6c327 100644 --- a/classes/models/fields/FrmFieldCaptcha.php +++ b/classes/models/fields/FrmFieldCaptcha.php @@ -119,9 +119,8 @@ public function front_field_input( $args, $shortcode_atts ) { } $div_attributes = $settings->add_front_end_element_attributes( $div_attributes, $this->field ); - $html = '
'; - return $html; + return '
'; } /** diff --git a/classes/models/fields/FrmFieldCombo.php b/classes/models/fields/FrmFieldCombo.php index 1b4ac842f6..3c969a5914 100644 --- a/classes/models/fields/FrmFieldCombo.php +++ b/classes/models/fields/FrmFieldCombo.php @@ -225,7 +225,7 @@ protected function get_built_in_option_labels() { * @return array */ protected function field_settings_for_type() { - $settings = array( + return array( 'description' => false, 'default' => false, // Don't use the regular placeholder option. @@ -233,8 +233,6 @@ protected function field_settings_for_type() { 'logic' => true, 'visibility' => true, ); - - return $settings; } /** @@ -287,9 +285,8 @@ public function front_field_input( $args, $shortcode_atts ) { ob_start(); $this->load_field_output( $args ); - $input_html = ob_get_clean(); - return $input_html; + return ob_get_clean(); } /** diff --git a/classes/models/fields/FrmFieldCreditCard.php b/classes/models/fields/FrmFieldCreditCard.php index 7c25b410d4..6b8b04f319 100644 --- a/classes/models/fields/FrmFieldCreditCard.php +++ b/classes/models/fields/FrmFieldCreditCard.php @@ -27,13 +27,12 @@ class FrmFieldCreditCard extends FrmFieldType { * @return array */ protected function field_settings_for_type() { - $settings = array( + return array( 'clear_on_focus' => false, 'description' => false, 'default' => false, 'required' => false, ); - return $settings; } protected function include_form_builder_file() { diff --git a/classes/models/fields/FrmFieldSubmit.php b/classes/models/fields/FrmFieldSubmit.php index 4c306dbb47..629dae21fd 100644 --- a/classes/models/fields/FrmFieldSubmit.php +++ b/classes/models/fields/FrmFieldSubmit.php @@ -43,13 +43,11 @@ class FrmFieldSubmit extends FrmFieldType { * @return string */ public function default_html() { - $default_html = << [input] DEFAULT_HTML; - - return $default_html; } /** @@ -58,7 +56,7 @@ public function default_html() { * @return array */ protected function field_settings_for_type() { - $settings = array( + return array( 'required' => false, 'visibility' => false, 'label_position' => false, @@ -67,8 +65,6 @@ protected function field_settings_for_type() { 'description' => false, 'logic' => true, ); - - return $settings; } /** diff --git a/classes/models/fields/FrmFieldType.php b/classes/models/fields/FrmFieldType.php index 21b08d659d..e1e341ca5b 100644 --- a/classes/models/fields/FrmFieldType.php +++ b/classes/models/fields/FrmFieldType.php @@ -215,7 +215,7 @@ public function default_html() { $for = $this->for_label_html(); $label = $this->primary_label_element(); - $default_html = << <$label $for id="field_[key]_label" class="frm_primary_label">[field_name] @@ -225,8 +225,6 @@ public function default_html() { [if error][/if error] DEFAULT_HTML; - - return $default_html; } /** @@ -1462,9 +1460,7 @@ protected function get_select_box( $values ) { $input .= ''; } - $input .= ''; - - return $input; + return $input . ''; } /** @@ -1678,9 +1674,7 @@ private function value_has_already_been_validated_as_unique( $value ) { $frm_validated_unique_values[ $field_id ] = array(); return false; } - - $already_validated_this_value = in_array( $value, $frm_validated_unique_values[ $field_id ], true ); - return $already_validated_this_value; + return in_array( $value, $frm_validated_unique_values[ $field_id ], true ); } /** diff --git a/rector.php b/rector.php index b2297ad2c0..c90ffa0f5c 100644 --- a/rector.php +++ b/rector.php @@ -9,7 +9,6 @@ use Rector\CodeQuality\Rector\Assign\CombinedAssignRector; use Rector\CodeQuality\Rector\ClassMethod\ExplicitReturnNullRector; use Rector\CodeQuality\Rector\Empty_\SimplifyEmptyCheckOnEmptyArrayRector; -use Rector\CodeQuality\Rector\FunctionLike\SimplifyUselessVariableRector; use Rector\CodingStyle\Rector\FuncCall\CountArrayToEmptyArrayComparisonRector; use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector; use Rector\CodeQuality\Rector\If_\SimplifyIfReturnBoolRector; @@ -85,7 +84,6 @@ CombinedAssignRector::class, ExplicitReturnNullRector::class, SimplifyEmptyCheckOnEmptyArrayRector::class, - SimplifyUselessVariableRector::class, CountArrayToEmptyArrayComparisonRector::class, DisallowedEmptyRuleFixerRector::class, SimplifyIfReturnBoolRector::class, diff --git a/square/controllers/FrmSquareLiteActionsController.php b/square/controllers/FrmSquareLiteActionsController.php index b8e455cc29..8f414b88bf 100644 --- a/square/controllers/FrmSquareLiteActionsController.php +++ b/square/controllers/FrmSquareLiteActionsController.php @@ -202,8 +202,7 @@ private static function create_new_payment( $atts ) { ); $frm_payment = new FrmTransLitePayment(); - $payment_id = $frm_payment->create( $new_values ); - return $payment_id; + return $frm_payment->create( $new_values ); } /** @@ -326,9 +325,8 @@ private static function create_new_subscription( $subscription_id, $atts ) { ); $frm_payment = new FrmTransLiteSubscription(); - $payment_id = $frm_payment->create( $new_values ); - return $payment_id; + return $frm_payment->create( $new_values ); } /** diff --git a/square/controllers/FrmSquareLiteAppController.php b/square/controllers/FrmSquareLiteAppController.php index cf78f81b0d..d07a0dea1a 100644 --- a/square/controllers/FrmSquareLiteAppController.php +++ b/square/controllers/FrmSquareLiteAppController.php @@ -121,10 +121,9 @@ private static function get_amount_value_for_verification( $action ) { } // Update amount based on field shortcodes. - $entry = self::generate_false_entry(); - $amount = FrmSquareLiteActionsController::prepare_amount( $amount, compact( 'form', 'entry', 'action' ) ); + $entry = self::generate_false_entry(); - return $amount; + return FrmSquareLiteActionsController::prepare_amount( $amount, compact( 'form', 'entry', 'action' ) ); } /** diff --git a/stripe/controllers/FrmStrpLiteActionsController.php b/stripe/controllers/FrmStrpLiteActionsController.php index ea04a3d8dd..484fa68264 100644 --- a/stripe/controllers/FrmStrpLiteActionsController.php +++ b/stripe/controllers/FrmStrpLiteActionsController.php @@ -327,9 +327,8 @@ public static function before_save_settings( $settings, $action ) { // In Lite Stripe link is always used. $settings['stripe_link'] = 1; - $settings = self::create_plans( $settings ); - return $settings; + return self::create_plans( $settings ); } /** @@ -364,8 +363,7 @@ public static function create_plans( $settings ) { */ public static function create_plan_id( $settings ) { $amount = self::prepare_amount( $settings['amount'], $settings ); - $id = sanitize_title_with_dashes( $settings['description'] ) . '_' . $amount . '_' . $settings['interval_count'] . $settings['interval'] . '_' . $settings['currency']; - return $id; + return sanitize_title_with_dashes( $settings['description'] ) . '_' . $amount . '_' . $settings['interval_count'] . $settings['interval'] . '_' . $settings['currency']; } /** diff --git a/stripe/controllers/FrmStrpLiteEventsController.php b/stripe/controllers/FrmStrpLiteEventsController.php index a462a23c58..6517ae72f7 100644 --- a/stripe/controllers/FrmStrpLiteEventsController.php +++ b/stripe/controllers/FrmStrpLiteEventsController.php @@ -264,9 +264,7 @@ private function prepare_from_invoice() { $this->maybe_cancel_subscription( $sub ); $this->update_next_bill_date( $sub, $payment_values ); - - $payment = $frm_payment->get_one( $payment_id ); - return $payment; + return $frm_payment->get_one( $payment_id ); } /** @@ -336,9 +334,8 @@ private function maybe_cancel_subscription( $sub ) { private function get_payments_count( $sub_id ) { $frm_payment = new FrmTransLitePayment(); $all_payments = $frm_payment->get_all_by( $sub_id, 'sub_id' ); - $count = FrmTransLiteAppHelper::count_completed_payments( $all_payments ); - return $count; + return FrmTransLiteAppHelper::count_completed_payments( $all_payments ); } /** diff --git a/stripe/controllers/FrmStrpLitePaymentsController.php b/stripe/controllers/FrmStrpLitePaymentsController.php index 50fcae1163..8e62e08f34 100644 --- a/stripe/controllers/FrmStrpLitePaymentsController.php +++ b/stripe/controllers/FrmStrpLitePaymentsController.php @@ -27,7 +27,6 @@ public static function get_receipt_link( $receipt ) { $link = ''; $link .= esc_html( $receipt ); - $link .= ''; - return $link; + return $link . ''; } } diff --git a/stripe/controllers/FrmTransLiteActionsController.php b/stripe/controllers/FrmTransLiteActionsController.php index 5ec5a489dc..586affdcb7 100755 --- a/stripe/controllers/FrmTransLiteActionsController.php +++ b/stripe/controllers/FrmTransLiteActionsController.php @@ -163,9 +163,7 @@ public static function replace_success_message() { $message = __( 'There was an error processing your payment.', 'formidable' ); } - $message = '
' . $message . '
'; - - return $message; + return '
' . $message . '
'; } /** @@ -361,8 +359,7 @@ private static function get_amount_from_string( $amount ) { $amount = html_entity_decode( $amount ); $amount = trim( $amount ); preg_match_all( '/[0-9,.]*\.?\,?[0-9]+/', $amount, $matches ); - $amount = $matches ? end( $matches[0] ) : 0; - return $amount; + return $matches ? end( $matches[0] ) : 0; } /** @@ -652,7 +649,6 @@ protected static function add_a_gateway_field( $form_id ) { protected static function add_a_field( $form_id, $field_type, $field_name ) { $new_values = FrmFieldsHelper::setup_new_vars( $field_type, $form_id ); $new_values['name'] = $field_name; - $field_id = FrmField::create( $new_values ); - return $field_id; + return FrmField::create( $new_values ); } } diff --git a/stripe/helpers/FrmStrpLiteConnectHelper.php b/stripe/helpers/FrmStrpLiteConnectHelper.php index 1fd34ca2b5..d5eec33c22 100644 --- a/stripe/helpers/FrmStrpLiteConnectHelper.php +++ b/stripe/helpers/FrmStrpLiteConnectHelper.php @@ -769,9 +769,8 @@ public static function create_intent( $new_charge ) { * @return bool */ public static function refund_payment( $payment_id ) { - $data = self::post_with_authenticated_body( 'refund_payment', compact( 'payment_id' ) ); - $refunded = is_object( $data ); - return $refunded; + $data = self::post_with_authenticated_body( 'refund_payment', compact( 'payment_id' ) ); + return is_object( $data ); } /** @@ -802,8 +801,7 @@ public static function create_subscription( $new_charge ) { public static function cancel_subscription( $sub_id, $customer_id = false ) { $cancel_at_period_end = FrmStrpLiteSubscriptionHelper::should_cancel_at_period_end(); $data = self::post_with_authenticated_body( 'cancel_subscription', compact( 'sub_id', 'customer_id', 'cancel_at_period_end' ) ); - $canceled = false !== $data; - return $canceled; + return false !== $data; } /** @@ -893,8 +891,7 @@ public static function create_plan( $plan ) { */ public static function update_intent( $intent_id, $data ) { $data = self::post_with_authenticated_body( 'update_intent', compact( 'intent_id', 'data' ) ); - $success = false !== $data; - return $success; + return false !== $data; } /** diff --git a/stripe/helpers/FrmStrpLiteSubscriptionHelper.php b/stripe/helpers/FrmStrpLiteSubscriptionHelper.php index 8e250621d7..9f4159587f 100644 --- a/stripe/helpers/FrmStrpLiteSubscriptionHelper.php +++ b/stripe/helpers/FrmStrpLiteSubscriptionHelper.php @@ -71,8 +71,7 @@ public static function create_new_subscription( $atts ) { } $frm_sub = new FrmTransLiteSubscription(); - $sub_id = $frm_sub->create( $new_values ); - return $sub_id; + return $frm_sub->create( $new_values ); } /** @@ -194,8 +193,7 @@ public static function maybe_create_missing_plan_and_create_subscription( $subsc // The full error message looks like "No such plan: '_399_1month_usd". $action->post_content['plan_id'] = ''; $charge_data['plan'] = self::get_plan_from_atts( compact( 'action', 'amount' ) ); - $subscription = FrmStrpLiteAppHelper::call_stripe_helper_class( 'create_subscription', $charge_data ); - return $subscription; + return FrmStrpLiteAppHelper::call_stripe_helper_class( 'create_subscription', $charge_data ); } /** diff --git a/stripe/helpers/FrmTransLiteAppHelper.php b/stripe/helpers/FrmTransLiteAppHelper.php index 635b9cffa8..fc42766c0d 100755 --- a/stripe/helpers/FrmTransLiteAppHelper.php +++ b/stripe/helpers/FrmTransLiteAppHelper.php @@ -159,8 +159,7 @@ public static function add_meta_to_payment( $meta_value, $note ) { */ public static function get_action_setting( $option, $atts ) { $settings = self::get_action_settings( $atts ); - $value = $settings[ $option ] ?? ''; - return $value; + return $settings[ $option ] ?? ''; } /** @@ -213,9 +212,7 @@ public static function process_shortcodes( $atts ) { $value = apply_filters( 'frm_content', $value, $atts['form'], $atts['entry'] ); } - - $value = do_shortcode( $value ); - return $value; + return do_shortcode( $value ); } /** @@ -555,8 +552,7 @@ public static function count_completed_payments( $payments ) { * @return array */ public static function get_gateways() { - $gateways = apply_filters( 'frm_payment_gateways', array() ); - return $gateways; + return apply_filters( 'frm_payment_gateways', array() ); } /** diff --git a/stripe/helpers/FrmTransLiteListHelper.php b/stripe/helpers/FrmTransLiteListHelper.php index cb4b06ea38..5b285f842c 100755 --- a/stripe/helpers/FrmTransLiteListHelper.php +++ b/stripe/helpers/FrmTransLiteListHelper.php @@ -433,8 +433,7 @@ private function get_item_id_column( $item ) { */ private function get_form_id_column( $item, $atts ) { if ( isset( $atts['form_ids'][ $item->item_id ] ) ) { - $form_link = FrmFormsHelper::edit_form_link( $atts['form_ids'][ $item->item_id ]->form_id ); - return $form_link; + return FrmFormsHelper::edit_form_link( $atts['form_ids'][ $item->item_id ]->form_id ); } return ''; @@ -464,8 +463,7 @@ private function get_created_at_column( $item, $atts ) { $date = FrmAppHelper::get_localized_date( $atts['date_format'], $item->created_at ); $date_title = FrmAppHelper::get_localized_date( $atts['date_format'] . ' g:i:s A', $item->created_at ); - $val = '' . $date . ''; - return $val; + return '' . $date . ''; } /** diff --git a/stripe/models/FrmStrpLiteAuth.php b/stripe/models/FrmStrpLiteAuth.php index 1c034c6e0d..212f274c93 100644 --- a/stripe/models/FrmStrpLiteAuth.php +++ b/stripe/models/FrmStrpLiteAuth.php @@ -63,8 +63,7 @@ public static function maybe_show_message( $html ) { // Append an additional processing message to the end of the success message. $filter = function ( $message ) { $stripe_settings = FrmStrpLiteAppHelper::get_settings(); - $message .= '

' . esc_html( $stripe_settings->settings->processing_message ) . '

'; - return $message; + return $message . ('

' . esc_html( $stripe_settings->settings->processing_message ) . '

'); }; add_filter( 'frm_content', $filter ); } diff --git a/stripe/models/FrmTransLiteAction.php b/stripe/models/FrmTransLiteAction.php index 50accb394f..ca91ede161 100755 --- a/stripe/models/FrmTransLiteAction.php +++ b/stripe/models/FrmTransLiteAction.php @@ -127,15 +127,13 @@ public function get_field_options( $form_id ) { */ $form_ids = apply_filters( 'frm_trans_action_get_field_options_form_id', $form_ids, $form_id ); - $form_fields = FrmField::getAll( + return FrmField::getAll( array( 'fi.form_id' => $form_ids, 'fi.type not' => array( 'divider', 'end_divider', 'html', 'break', 'captcha', 'rte', 'form' ), ), 'field_order' ); - - return $form_fields; } /** diff --git a/stripe/models/FrmTransLitePayment.php b/stripe/models/FrmTransLitePayment.php index e274a024f9..a759c78213 100755 --- a/stripe/models/FrmTransLitePayment.php +++ b/stripe/models/FrmTransLitePayment.php @@ -12,7 +12,7 @@ class FrmTransLitePayment extends FrmTransLiteDb { * @return array */ public function get_defaults() { - $values = array( + return array( 'receipt_id' => array( 'sanitize' => 'sanitize_text_field', 'default' => '', @@ -66,7 +66,6 @@ public function get_defaults() { 'default' => null, ), ); - return $values; } /** diff --git a/stripe/models/FrmTransLiteSubscription.php b/stripe/models/FrmTransLiteSubscription.php index 815f33f8e1..375ad3ad62 100755 --- a/stripe/models/FrmTransLiteSubscription.php +++ b/stripe/models/FrmTransLiteSubscription.php @@ -12,7 +12,7 @@ class FrmTransLiteSubscription extends FrmTransLiteDb { * @return array */ public function get_defaults() { - $values = array( + return array( 'sub_id' => array( 'sanitize' => 'sanitize_text_field', 'default' => '', @@ -74,8 +74,6 @@ public function get_defaults() { 'default' => null, ), ); - - return $values; } /** From 0782b0d4eee11ce453ec5d6a47cbb4cc4f85200d Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 17 Dec 2025 13:43:24 -0400 Subject: [PATCH 2/3] Run phpcbf --- classes/controllers/FrmEmailStylesController.php | 2 +- classes/controllers/FrmSMTPController.php | 2 +- classes/controllers/FrmStylesController.php | 4 ++-- classes/helpers/FrmAppHelper.php | 4 ++-- classes/helpers/FrmFormsHelper.php | 4 ++-- classes/helpers/FrmListHelper.php | 2 +- classes/helpers/FrmStylesHelper.php | 8 ++++---- classes/models/FrmAntiSpam.php | 2 +- classes/models/FrmFormAction.php | 2 +- stripe/models/FrmStrpLiteAuth.php | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/classes/controllers/FrmEmailStylesController.php b/classes/controllers/FrmEmailStylesController.php index 9892df9759..57629f9b99 100644 --- a/classes/controllers/FrmEmailStylesController.php +++ b/classes/controllers/FrmEmailStylesController.php @@ -213,7 +213,7 @@ private static function get_test_rich_text_email_content( $style_key, $table_row '; } - return $wrapped_content . ('' . $content . ''); + return $wrapped_content . ( '' . $content . '' ); } /** diff --git a/classes/controllers/FrmSMTPController.php b/classes/controllers/FrmSMTPController.php index c5774bceb9..60dfa5a3c8 100644 --- a/classes/controllers/FrmSMTPController.php +++ b/classes/controllers/FrmSMTPController.php @@ -168,7 +168,7 @@ protected function output_section_heading() {

-get_default_style(); + $frm_style = new FrmStyle(); + $style = $frm_style->get_default_style(); return $style->post_content['custom_css']; } diff --git a/classes/helpers/FrmAppHelper.php b/classes/helpers/FrmAppHelper.php index cb02c87169..365a7c2ed7 100644 --- a/classes/helpers/FrmAppHelper.php +++ b/classes/helpers/FrmAppHelper.php @@ -3302,8 +3302,8 @@ public static function human_time_diff( $from, $to = '', $levels = 1 ) { } } - $levels_deep = apply_filters( 'frm_time_ago_levels', $levels, compact( 'time_strings', 'from', 'to' ) ); - $time_strings = array_slice( $time_strings, 0, absint( $levels_deep ) ); + $levels_deep = apply_filters( 'frm_time_ago_levels', $levels, compact( 'time_strings', 'from', 'to' ) ); + $time_strings = array_slice( $time_strings, 0, absint( $levels_deep ) ); return implode( ' ', $time_strings ); } diff --git a/classes/helpers/FrmFormsHelper.php b/classes/helpers/FrmFormsHelper.php index 9b08205677..2350cc4a8f 100644 --- a/classes/helpers/FrmFormsHelper.php +++ b/classes/helpers/FrmFormsHelper.php @@ -82,7 +82,7 @@ public static function forms_dropdown( $field_name, $field_value = '', $args = a - -'; - return $out . (''); + return $out . ( '' ); } /** diff --git a/classes/helpers/FrmStylesHelper.php b/classes/helpers/FrmStylesHelper.php index 8d5b22d48d..8e0752faa1 100644 --- a/classes/helpers/FrmStylesHelper.php +++ b/classes/helpers/FrmStylesHelper.php @@ -433,9 +433,9 @@ public static function get_color_brightness( $color ) { self::fill_hex( $color ); - $c_r = hexdec( substr( $color, 0, 2 ) ); - $c_g = hexdec( substr( $color, 2, 2 ) ); - $c_b = hexdec( substr( $color, 4, 2 ) ); + $c_r = hexdec( substr( $color, 0, 2 ) ); + $c_g = hexdec( substr( $color, 2, 2 ) ); + $c_b = hexdec( substr( $color, 4, 2 ) ); return ( ( $c_r * 299 ) + ( $c_g * 587 ) + ( $c_b * 114 ) ) / 1000; } @@ -1096,7 +1096,7 @@ public static function style_editor_get_wrapper_classname( $section_type ) { $classname = 'frm-style-editor-form'; $classname .= ( ! self::is_advanced_settings() xor $is_quick_settings ) ? ' frm_hidden' : ''; - return $classname . (FrmAppHelper::pro_is_installed() ? ' frm-pro' : ''); + return $classname . ( FrmAppHelper::pro_is_installed() ? ' frm-pro' : '' ); } /** diff --git a/classes/models/FrmAntiSpam.php b/classes/models/FrmAntiSpam.php index 87baca11cb..64bad48afd 100644 --- a/classes/models/FrmAntiSpam.php +++ b/classes/models/FrmAntiSpam.php @@ -175,7 +175,7 @@ private function verify( $token ) { * @return string */ public function add_token_to_form( $attributes ) { - return $attributes . (' data-token="' . esc_attr( $this->get() ) . '"'); + return $attributes . ( ' data-token="' . esc_attr( $this->get() ) . '"' ); } /** diff --git a/classes/models/FrmFormAction.php b/classes/models/FrmFormAction.php index d28c61f264..7343d189e5 100644 --- a/classes/models/FrmFormAction.php +++ b/classes/models/FrmFormAction.php @@ -258,7 +258,7 @@ public function get_field_name( $field_name, $post_field = 'post_content' ) { $name = $this->option_name . '[' . $this->number . ']'; $name .= ( empty( $post_field ) ? '' : '[' . $post_field . ']' ); - return $name . ('[' . $field_name . ']'); + return $name . ( '[' . $field_name . ']' ); } /** diff --git a/stripe/models/FrmStrpLiteAuth.php b/stripe/models/FrmStrpLiteAuth.php index 212f274c93..8735d969e4 100644 --- a/stripe/models/FrmStrpLiteAuth.php +++ b/stripe/models/FrmStrpLiteAuth.php @@ -63,7 +63,7 @@ public static function maybe_show_message( $html ) { // Append an additional processing message to the end of the success message. $filter = function ( $message ) { $stripe_settings = FrmStrpLiteAppHelper::get_settings(); - return $message . ('

' . esc_html( $stripe_settings->settings->processing_message ) . '

'); + return $message . ( '

' . esc_html( $stripe_settings->settings->processing_message ) . '

' ); }; add_filter( 'frm_content', $filter ); } From 4c7836023431d42f85f7084382186f1331b855f1 Mon Sep 17 00:00:00 2001 From: Mike Letellier Date: Wed, 17 Dec 2025 14:03:02 -0400 Subject: [PATCH 3/3] Spacing fix, escape translation --- classes/controllers/FrmStylesController.php | 2 +- classes/helpers/FrmListHelper.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/controllers/FrmStylesController.php b/classes/controllers/FrmStylesController.php index a1850b4c29..5ebe0f8857 100644 --- a/classes/controllers/FrmStylesController.php +++ b/classes/controllers/FrmStylesController.php @@ -474,7 +474,7 @@ function ( $classes ) { * @return WP_Post */ private static function get_default_style() { - $frm_style = new FrmStyle( 'default' ); + $frm_style = new FrmStyle( 'default' ); return $frm_style->get_one(); } diff --git a/classes/helpers/FrmListHelper.php b/classes/helpers/FrmListHelper.php index c92cf25353..68ec069ac2 100644 --- a/classes/helpers/FrmListHelper.php +++ b/classes/helpers/FrmListHelper.php @@ -518,7 +518,7 @@ protected function row_actions( $actions, $always_visible = false ) { $out .= ''; - return $out . ( '' ); + return $out . ( '' ); } /**